From 87289878abca34eb70601c491965516e820f9b90 Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Wed, 25 Jul 2012 13:03:14 +0200
Subject: [PATCH] Revert "[bordeaux] revert previous bordeaux commit #4421"

This reverts commit 85d8b561346382c8d7142c5995f967926d796bf7.
---
 data/grid5000/sites/bordeaux.json               | 17 -----------------
 .../clusters/bordeplage/nodes/bordeplage-1.json |  4 ++++
 .../bordeplage/nodes/bordeplage-10.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-11.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-12.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-13.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-14.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-15.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-16.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-17.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-18.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-19.json         |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-2.json |  4 ++++
 .../bordeplage/nodes/bordeplage-20.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-21.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-22.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-23.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-24.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-25.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-26.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-27.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-28.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-29.json         |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-3.json |  4 ++++
 .../bordeplage/nodes/bordeplage-30.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-31.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-32.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-33.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-34.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-35.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-36.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-37.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-38.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-39.json         |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-4.json |  4 ++++
 .../bordeplage/nodes/bordeplage-40.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-41.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-42.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-43.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-44.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-45.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-46.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-47.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-48.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-49.json         |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-5.json |  4 ++++
 .../bordeplage/nodes/bordeplage-50.json         |  4 ++++
 .../bordeplage/nodes/bordeplage-51.json         |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-6.json |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-7.json |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-8.json |  4 ++++
 .../clusters/bordeplage/nodes/bordeplage-9.json |  4 ++++
 .../clusters/bordereau/nodes/bordereau-1.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-10.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-11.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-12.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-13.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-14.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-15.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-16.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-17.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-18.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-19.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-2.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-20.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-21.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-22.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-23.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-24.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-25.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-26.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-27.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-28.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-29.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-3.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-30.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-31.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-32.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-33.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-34.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-35.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-36.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-37.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-38.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-39.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-4.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-40.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-41.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-42.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-43.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-44.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-45.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-46.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-47.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-48.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-49.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-5.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-50.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-51.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-52.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-53.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-54.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-55.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-56.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-57.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-58.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-59.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-6.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-60.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-61.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-62.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-63.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-64.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-65.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-66.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-67.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-68.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-69.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-7.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-70.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-71.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-72.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-73.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-74.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-75.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-76.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-77.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-78.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-79.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-8.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-80.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-81.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-82.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-83.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-84.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-85.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-86.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-87.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-88.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-89.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-9.json   |  4 ++++
 .../clusters/bordereau/nodes/bordereau-90.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-91.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-92.json  |  4 ++++
 .../clusters/bordereau/nodes/bordereau-93.json  |  4 ++++
 .../clusters/borderline/nodes/borderline-1.json |  4 ++++
 .../borderline/nodes/borderline-10.json         |  4 ++++
 .../clusters/borderline/nodes/borderline-2.json |  4 ++++
 .../clusters/borderline/nodes/borderline-3.json |  4 ++++
 .../clusters/borderline/nodes/borderline-4.json |  4 ++++
 .../clusters/borderline/nodes/borderline-5.json |  4 ++++
 .../clusters/borderline/nodes/borderline-6.json |  4 ++++
 .../clusters/borderline/nodes/borderline-7.json |  4 ++++
 .../clusters/borderline/nodes/borderline-8.json |  4 ++++
 .../clusters/borderline/nodes/borderline-9.json |  4 ++++
 generators/input/sites/bordeaux/bordeaux.rb     |  3 +--
 .../input/sites/bordeaux/clusters/bordeplage.rb |  6 ++++++
 .../input/sites/bordeaux/clusters/bordereau.rb  |  8 ++++++++
 .../input/sites/bordeaux/clusters/borderline.rb |  6 ++++++
 159 files changed, 637 insertions(+), 19 deletions(-)
 delete mode 100644 data/grid5000/sites/bordeaux.json

diff --git a/data/grid5000/sites/bordeaux.json b/data/grid5000/sites/bordeaux.json
deleted file mode 100644
index 0a4adad5619..00000000000
--- a/data/grid5000/sites/bordeaux.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "compilation_server": false,
-  "description": "Grid5000 Bordeaux site",
-  "email_contact": "bordeaux-staff@lists.grid5000.fr",
-  "kavlan_plage": "10.0.0.0/14",
-  "latitude": 44.833333,
-  "location": "Bordeaux, France",
-  "longitude": -0.566667,
-  "name": "Bordeaux",
-  "security_contact": "bordeaux-staff@lists.grid5000.fr",
-  "sys_admin_contact": "bordeaux-staff@lists.grid5000.fr",
-  "type": "site",
-  "uid": "bordeaux",
-  "user_support_contact": "bordeaux-staff@lists.grid5000.fr",
-  "virt_plage": "10.128.0.0/14",
-  "web": "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index 7f73e79ca76..e1360ddfd3e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index 789a93a848f..7634e8fbffe 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index 94fbffa6077..4d886d9ac45 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index d17bcd60b1e..26eabd04d32 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index 5d8e0ec15db..1c260fe58f0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index e3d69537f78..bdbd85155a1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index ae9026e0667..aefc1585793 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index 5c15c3a23bd..7783310802c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index b03c2b99683..3ab67d3f643 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index c25b8a216c6..7c3b2e45ee6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index 2f13ae2df2c..a6345d17d06 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index cc88a6f34ff..4c67ab89b0e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index 9c5acf1c0a2..dc3c8c22f22 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index 93e08277d9b..96cf7c1aa6d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index 12f312726fe..f202ff29610 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index a18e7b76c1e..b772a73c3d6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index f44ca7f2b9c..780afe85693 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index 11f515b9246..326e2145251 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index a89e9814308..1dc66ac73aa 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index 9c1640401ca..363592f06d0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index b31eb10da80..750df13dc8c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index d7eac90ee1f..8d481892a55 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index 1333a39e167..787745f1820 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index 3385cd01b3d..d5c82290337 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index 816567fedef..3b3f95c6488 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index 0540279bec5..20adfd78357 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index 2096c744acc..2759014e252 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index 86b452b8927..24bad737416 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index 548031984cd..433d5ebd2af 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index d033489c88a..9080e813ce4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index 553e2abd792..d988eeecb90 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index e3d4c1c95eb..fe07f390ac4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index 0e24d547c36..bbb4fc92414 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index 3c0741819cf..fa20e18cdac 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index 53444e0a299..93ae499436c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index d73d7423595..8d1f987a187 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index 9b1455348b2..d986f8874cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index cc2b0f1af5d..dbb079850df 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index f9a25551330..f78de2c97ac 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index 0cb2d3ac1d8..df8c350650f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index fc5de773ae2..1f5d6649172 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index 745cfcdca4c..bd5502134d7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index 86d9659e2ac..367a347fb73 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index fd3c455824e..2696d7dbb97 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index 94dd2304381..fddd707c999 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index fb0fa81afeb..dfa88ee3fc8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index 1150298517e..631bff32f7d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index 137d166eadb..db4aaa4c2fd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index 0e062b72285..9c38152bcf1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index d546e745c21..91916b973b1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index 2d0ca5255e4..8e795955c28 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index f342ff94d1f..1aae800c667 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index 3d2bde91aaa..b5d2a0b0d65 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index 8a5fc105562..8658cfb3977 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index e903652ea4d..dca591777c4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index b19da2fdc6f..bbce6d4727f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index 4c51afbb1e4..125d5a3d0ee 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index a73cd020ebb..81db55d6247 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index f9ba8c2efb0..aee3155506e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index d7cc7d67e1d..c3a769c17bd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index a24fe052a8d..b394d7c298a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index 0ba301c3a25..a34e9328f70 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index d39b571f090..4710b776804 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index 508502dd3c7..93735bd02f9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index cfef861add8..1fe48b767c5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index 3c30239c3cc..4105c1aba33 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index 447a61f24c9..2e551cd4005 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index 4566e504321..2ebb17f2b2f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index c1be88d4352..6cd789ce0a1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index b252c88a139..869655ab2ad 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index 56c940ed591..4c8e5a462ea 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index 7b09bc983df..d24830c62ad 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index bc14464559d..1aa2f430aff 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index 06dcf838645..05b1adc1cd6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index 5768ac9b438..6df9098a3f2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index d6c45fe74a1..12518d5235a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index 5228a05fa73..40a52afbc9a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index bedbaff01e0..541dc8b4df1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index 2075634f4f5..2ca51badd40 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index cf4728e4572..b882ee81c25 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index 5c7c96f5b33..c55edd17e36 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index 8168ec41d23..ea210e06cd7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index e17619ddd93..b23e49a3fdd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index 69ab0c6ef78..f6d2345317e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index ef06a428527..8916794ca93 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index 8c693abdbe0..57d075171d4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index 79a31900a81..484a4c33a6a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index ed8ddd781b0..addb361f474 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index 2d72f34bd01..a3d92d27674 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index f0f53073577..a449049a679 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index cb560abe671..0bd967bbd0c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index f844fae39ab..fd17ec762dc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index aa3c4eb08d2..6f68dccf8c3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index 179642dc987..389b9d7c558 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index b476b95d059..5e5cc2051e9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index 7961939a43d..b2d136021dd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index 74370a34de7..5332a87af61 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index 6f5d180e9fe..70b3ee96444 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index da51e4243f0..cc4394ea7af 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 482cbfc3313..a075e0022c1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index 49d86695329..cbacafe5478 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index 0a4f6f7d351..4696e4b30cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index 993b4dda529..1ef39291e74 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index 04df25f8703..e66faa94433 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index f015f7215ba..f30ee2dedde 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index e3f9e13571c..05230a98ee9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index 072c218d5f1..075faf60dad 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index edaf5e273c1..2f5e1f25c06 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index ffdbe053b02..4d108736bf5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index 1950297ee7f..69662434539 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index 633eaa66712..769d7174d3a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index cfba3f1beb2..2314d820aa1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 613b6986d38..860c3793302 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index dad9da2edf5..6a6c6816718 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index bf5468bec24..1f9e69713db 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index 4e52b971a02..da8bb4e5802 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index 9cf88c1906f..58ba11d6b93 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index 86e4dffdf41..82727a027fc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index 5f2260dbc8a..e155bac83ff 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index a920b0d3ef1..f970d8e69b0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index e9fd3d4954c..e53578362af 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index 96cbb8077b1..43570b3568c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index b3ae9cbb89f..1c5b0d9cb43 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index f71493949d8..1250ce55d79 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index a7945bb5cbe..da2a58f347c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index 6ff96f1c37a..9abdb1aaed1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index ab87f2ef8c0..fc0b8b6a623 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index 3cc0c762aa1..1a423049ced 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index 698f4485c4b..1db8b23398b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index 46722054984..abbe4ec4a8f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index 910b37561d9..96c9d50de0a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index 63c9e0dc86b..818cbd4c8b5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index 046a4e08741..1e6bdeedfd3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index 63840a1ed22..d2f7f38d07f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index 6bd35792140..269b073b656 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index b7d3cd24f1b..778d053fced 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index de13c812a4a..c9d18fae240 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index 0d831ea99ad..76b024e80d0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index 6a1346c7da6..0b744c359d6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index 5344ce617ec..cbaf4a938d1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index 4a62e7b18a2..3176b369813 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index 085f6b59894..0eadfb870dd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index fab8c4e7d14..6d88f5b2d18 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index c1fb5b22ea4..280148b6345 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index f9d43e7dca3..393b253e25b 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index 704a60b1a5a..d0f7f46aa6c 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index 97b466cf0ee..23f6cd2ee65 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index dc9664b2064..2e7221af468 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index 3bbe775a135..e6fad20263a 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index ffbdba7f735..3be99a3fdbc 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index 46066489e3b..8751b142e62 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index 9a406d13b29..018be9b444a 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index 003b0bcac01..80766881135 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index 6f1b5347505..b135a57ccd9 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -1,4 +1,8 @@
 {
+  "addressing_plan": {
+    "kavlan": "10.0.0.0/14",
+    "virt": "10.128.0.0/14"
+  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 4,
diff --git a/generators/input/sites/bordeaux/bordeaux.rb b/generators/input/sites/bordeaux/bordeaux.rb
index f70dfd139cd..e69e86821b9 100644
--- a/generators/input/sites/bordeaux/bordeaux.rb
+++ b/generators/input/sites/bordeaux/bordeaux.rb
@@ -10,6 +10,5 @@ site :bordeaux do |site_uid|
   security_contact "bordeaux-staff@lists.grid5000.fr"
   user_support_contact "bordeaux-staff@lists.grid5000.fr"
   compilation_server false
-  kavlan_plage "10.0.0.0/14"
-  virt_plage "10.128.0.0/14"
+
 end
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage.rb b/generators/input/sites/bordeaux/clusters/bordeplage.rb
index 6efb773d52d..03fab6498c8 100644
--- a/generators/input/sites/bordeaux/clusters/bordeplage.rb
+++ b/generators/input/sites/bordeaux/clusters/bordeplage.rb
@@ -110,6 +110,12 @@ site :bordeaux do |site_uid|
 	  :management 	=> true,
 	  :device 	=> "bmc"
 	}]
+addressing_plan({
+    :kavlan => "10.0.0.0/14",
+    :virt   => "10.128.0.0/14"
+    })
+
+
 	bios({
 	  :version	=> lookup('bordeplage', node_uid, 'bios', 'version'),
 	  :vendor	=> lookup('bordeplage', node_uid, 'bios', 'vendor'),
diff --git a/generators/input/sites/bordeaux/clusters/bordereau.rb b/generators/input/sites/bordeaux/clusters/bordereau.rb
index a4905d8c063..ad7f3a161c6 100644
--- a/generators/input/sites/bordeaux/clusters/bordereau.rb
+++ b/generators/input/sites/bordeaux/clusters/bordereau.rb
@@ -87,6 +87,14 @@ site :bordeaux do |site_uid|
                             :management 		=> true,
                             :device 		=> "bmc"
                           }]
+   addressing_plan({
+                  :kavlan => "10.0.0.0/14",
+                  :virt   => "10.128.0.0/14"
+                  })
+
+
+
+
 	bios({
                :version              => lookup('bordereau', node_uid, 'bios', 'version'),
                :vendor               => lookup('bordereau', node_uid, 'bios', 'vendor'),
diff --git a/generators/input/sites/bordeaux/clusters/borderline.rb b/generators/input/sites/bordeaux/clusters/borderline.rb
index b3a2f45e02b..5b212efc137 100644
--- a/generators/input/sites/bordeaux/clusters/borderline.rb
+++ b/generators/input/sites/bordeaux/clusters/borderline.rb
@@ -125,6 +125,12 @@ site :bordeaux do |site_uid|
 	  :management 		=> true,
 	  :device 		=> "bmc"
 	}]
+addressing_plan({
+            :kavlan => "10.0.0.0/14",
+            :virt   => "10.128.0.0/14"
+             })
+
+
         bios({
           :version      	=> lookup('borderline', node_uid, 'bios', 'version'),
           :vendor       	=> lookup('borderline', node_uid, 'bios', 'vendor'),
-- 
GitLab