From 8d10bc848c30bd6dfb74b13fde8a7e36f25ff79e Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Wed, 25 Jul 2012 12:51:53 +0200
Subject: [PATCH] [toulouse] Resert previous toulouse commit,  #4421

---
 data/grid5000/sites/toulouse.json               | 17 +++++++++++++++++
 .../clusters/pastel/nodes/pastel-1.json         |  4 ----
 .../clusters/pastel/nodes/pastel-10.json        |  4 ----
 .../clusters/pastel/nodes/pastel-100.json       |  4 ----
 .../clusters/pastel/nodes/pastel-101.json       |  4 ----
 .../clusters/pastel/nodes/pastel-102.json       |  4 ----
 .../clusters/pastel/nodes/pastel-103.json       |  4 ----
 .../clusters/pastel/nodes/pastel-104.json       |  4 ----
 .../clusters/pastel/nodes/pastel-105.json       |  4 ----
 .../clusters/pastel/nodes/pastel-106.json       |  4 ----
 .../clusters/pastel/nodes/pastel-107.json       |  4 ----
 .../clusters/pastel/nodes/pastel-108.json       |  4 ----
 .../clusters/pastel/nodes/pastel-109.json       |  4 ----
 .../clusters/pastel/nodes/pastel-11.json        |  4 ----
 .../clusters/pastel/nodes/pastel-110.json       |  4 ----
 .../clusters/pastel/nodes/pastel-111.json       |  4 ----
 .../clusters/pastel/nodes/pastel-112.json       |  4 ----
 .../clusters/pastel/nodes/pastel-113.json       |  4 ----
 .../clusters/pastel/nodes/pastel-114.json       |  4 ----
 .../clusters/pastel/nodes/pastel-115.json       |  4 ----
 .../clusters/pastel/nodes/pastel-116.json       |  4 ----
 .../clusters/pastel/nodes/pastel-117.json       |  4 ----
 .../clusters/pastel/nodes/pastel-118.json       |  4 ----
 .../clusters/pastel/nodes/pastel-119.json       |  4 ----
 .../clusters/pastel/nodes/pastel-12.json        |  4 ----
 .../clusters/pastel/nodes/pastel-120.json       |  4 ----
 .../clusters/pastel/nodes/pastel-121.json       |  4 ----
 .../clusters/pastel/nodes/pastel-122.json       |  4 ----
 .../clusters/pastel/nodes/pastel-123.json       |  4 ----
 .../clusters/pastel/nodes/pastel-124.json       |  4 ----
 .../clusters/pastel/nodes/pastel-125.json       |  4 ----
 .../clusters/pastel/nodes/pastel-126.json       |  4 ----
 .../clusters/pastel/nodes/pastel-127.json       |  4 ----
 .../clusters/pastel/nodes/pastel-128.json       |  4 ----
 .../clusters/pastel/nodes/pastel-129.json       |  4 ----
 .../clusters/pastel/nodes/pastel-13.json        |  4 ----
 .../clusters/pastel/nodes/pastel-130.json       |  4 ----
 .../clusters/pastel/nodes/pastel-131.json       |  4 ----
 .../clusters/pastel/nodes/pastel-132.json       |  4 ----
 .../clusters/pastel/nodes/pastel-133.json       |  4 ----
 .../clusters/pastel/nodes/pastel-134.json       |  4 ----
 .../clusters/pastel/nodes/pastel-135.json       |  4 ----
 .../clusters/pastel/nodes/pastel-136.json       |  4 ----
 .../clusters/pastel/nodes/pastel-137.json       |  4 ----
 .../clusters/pastel/nodes/pastel-138.json       |  4 ----
 .../clusters/pastel/nodes/pastel-139.json       |  4 ----
 .../clusters/pastel/nodes/pastel-14.json        |  4 ----
 .../clusters/pastel/nodes/pastel-140.json       |  4 ----
 .../clusters/pastel/nodes/pastel-15.json        |  4 ----
 .../clusters/pastel/nodes/pastel-16.json        |  4 ----
 .../clusters/pastel/nodes/pastel-17.json        |  4 ----
 .../clusters/pastel/nodes/pastel-18.json        |  4 ----
 .../clusters/pastel/nodes/pastel-19.json        |  4 ----
 .../clusters/pastel/nodes/pastel-2.json         |  4 ----
 .../clusters/pastel/nodes/pastel-20.json        |  4 ----
 .../clusters/pastel/nodes/pastel-21.json        |  4 ----
 .../clusters/pastel/nodes/pastel-22.json        |  4 ----
 .../clusters/pastel/nodes/pastel-23.json        |  4 ----
 .../clusters/pastel/nodes/pastel-24.json        |  4 ----
 .../clusters/pastel/nodes/pastel-25.json        |  4 ----
 .../clusters/pastel/nodes/pastel-26.json        |  4 ----
 .../clusters/pastel/nodes/pastel-27.json        |  4 ----
 .../clusters/pastel/nodes/pastel-28.json        |  4 ----
 .../clusters/pastel/nodes/pastel-29.json        |  4 ----
 .../clusters/pastel/nodes/pastel-3.json         |  4 ----
 .../clusters/pastel/nodes/pastel-30.json        |  4 ----
 .../clusters/pastel/nodes/pastel-31.json        |  4 ----
 .../clusters/pastel/nodes/pastel-32.json        |  4 ----
 .../clusters/pastel/nodes/pastel-33.json        |  4 ----
 .../clusters/pastel/nodes/pastel-34.json        |  4 ----
 .../clusters/pastel/nodes/pastel-35.json        |  4 ----
 .../clusters/pastel/nodes/pastel-36.json        |  4 ----
 .../clusters/pastel/nodes/pastel-37.json        |  4 ----
 .../clusters/pastel/nodes/pastel-38.json        |  4 ----
 .../clusters/pastel/nodes/pastel-39.json        |  4 ----
 .../clusters/pastel/nodes/pastel-4.json         |  4 ----
 .../clusters/pastel/nodes/pastel-40.json        |  4 ----
 .../clusters/pastel/nodes/pastel-41.json        |  4 ----
 .../clusters/pastel/nodes/pastel-42.json        |  4 ----
 .../clusters/pastel/nodes/pastel-43.json        |  4 ----
 .../clusters/pastel/nodes/pastel-44.json        |  4 ----
 .../clusters/pastel/nodes/pastel-45.json        |  4 ----
 .../clusters/pastel/nodes/pastel-46.json        |  4 ----
 .../clusters/pastel/nodes/pastel-47.json        |  4 ----
 .../clusters/pastel/nodes/pastel-48.json        |  4 ----
 .../clusters/pastel/nodes/pastel-49.json        |  4 ----
 .../clusters/pastel/nodes/pastel-5.json         |  4 ----
 .../clusters/pastel/nodes/pastel-50.json        |  4 ----
 .../clusters/pastel/nodes/pastel-51.json        |  4 ----
 .../clusters/pastel/nodes/pastel-52.json        |  4 ----
 .../clusters/pastel/nodes/pastel-53.json        |  4 ----
 .../clusters/pastel/nodes/pastel-54.json        |  4 ----
 .../clusters/pastel/nodes/pastel-55.json        |  4 ----
 .../clusters/pastel/nodes/pastel-56.json        |  4 ----
 .../clusters/pastel/nodes/pastel-57.json        |  4 ----
 .../clusters/pastel/nodes/pastel-58.json        |  4 ----
 .../clusters/pastel/nodes/pastel-59.json        |  4 ----
 .../clusters/pastel/nodes/pastel-6.json         |  4 ----
 .../clusters/pastel/nodes/pastel-60.json        |  4 ----
 .../clusters/pastel/nodes/pastel-61.json        |  4 ----
 .../clusters/pastel/nodes/pastel-62.json        |  4 ----
 .../clusters/pastel/nodes/pastel-63.json        |  4 ----
 .../clusters/pastel/nodes/pastel-64.json        |  4 ----
 .../clusters/pastel/nodes/pastel-65.json        |  4 ----
 .../clusters/pastel/nodes/pastel-66.json        |  4 ----
 .../clusters/pastel/nodes/pastel-67.json        |  4 ----
 .../clusters/pastel/nodes/pastel-68.json        |  4 ----
 .../clusters/pastel/nodes/pastel-69.json        |  4 ----
 .../clusters/pastel/nodes/pastel-7.json         |  4 ----
 .../clusters/pastel/nodes/pastel-70.json        |  4 ----
 .../clusters/pastel/nodes/pastel-71.json        |  4 ----
 .../clusters/pastel/nodes/pastel-72.json        |  4 ----
 .../clusters/pastel/nodes/pastel-73.json        |  4 ----
 .../clusters/pastel/nodes/pastel-74.json        |  4 ----
 .../clusters/pastel/nodes/pastel-75.json        |  4 ----
 .../clusters/pastel/nodes/pastel-76.json        |  4 ----
 .../clusters/pastel/nodes/pastel-77.json        |  4 ----
 .../clusters/pastel/nodes/pastel-78.json        |  4 ----
 .../clusters/pastel/nodes/pastel-79.json        |  4 ----
 .../clusters/pastel/nodes/pastel-8.json         |  4 ----
 .../clusters/pastel/nodes/pastel-80.json        |  4 ----
 .../clusters/pastel/nodes/pastel-81.json        |  4 ----
 .../clusters/pastel/nodes/pastel-82.json        |  4 ----
 .../clusters/pastel/nodes/pastel-83.json        |  4 ----
 .../clusters/pastel/nodes/pastel-84.json        |  4 ----
 .../clusters/pastel/nodes/pastel-85.json        |  4 ----
 .../clusters/pastel/nodes/pastel-86.json        |  4 ----
 .../clusters/pastel/nodes/pastel-87.json        |  4 ----
 .../clusters/pastel/nodes/pastel-88.json        |  4 ----
 .../clusters/pastel/nodes/pastel-89.json        |  4 ----
 .../clusters/pastel/nodes/pastel-9.json         |  4 ----
 .../clusters/pastel/nodes/pastel-90.json        |  4 ----
 .../clusters/pastel/nodes/pastel-91.json        |  4 ----
 .../clusters/pastel/nodes/pastel-92.json        |  4 ----
 .../clusters/pastel/nodes/pastel-93.json        |  4 ----
 .../clusters/pastel/nodes/pastel-94.json        |  4 ----
 .../clusters/pastel/nodes/pastel-95.json        |  4 ----
 .../clusters/pastel/nodes/pastel-96.json        |  4 ----
 .../clusters/pastel/nodes/pastel-97.json        |  4 ----
 .../clusters/pastel/nodes/pastel-98.json        |  4 ----
 .../clusters/pastel/nodes/pastel-99.json        |  4 ----
 .../input/sites/toulouse/clusters/pastel.rb     |  5 -----
 generators/input/sites/toulouse/toulouse.rb     |  3 ++-
 143 files changed, 19 insertions(+), 566 deletions(-)
 create mode 100644 data/grid5000/sites/toulouse.json

diff --git a/data/grid5000/sites/toulouse.json b/data/grid5000/sites/toulouse.json
new file mode 100644
index 00000000000..fd5144e3144
--- /dev/null
+++ b/data/grid5000/sites/toulouse.json
@@ -0,0 +1,17 @@
+{
+  "compilation_server": false,
+  "description": "Toulouse Grid'5000 Site",
+  "email_contact": "toulouse-staff@lists.grid5000.fr",
+  "kavlan_plage": "10.28.0.0/14",
+  "latitude": 43.6167,
+  "location": "Toulouse, France",
+  "longitude": 1.4333,
+  "name": "Toulouse",
+  "security_contact": "toulouse-staff@lists.grid5000.fr",
+  "sys_admin_contact": "toulouse-staff@lists.grid5000.fr",
+  "type": "site",
+  "uid": "toulouse",
+  "user_support_contact": "toulouse-staff@lists.grid5000.fr",
+  "virt_plage": "10.160.0.0/14",
+  "web": "https://www.grid5000.fr/mediawiki/index.php/Toulouse:Home"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
index 08b7b16ecd6..256260e00b9 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
index 01a23ada42e..ef52a99c5be 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
index 12bd537f548..0d556b20beb 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
index 34f1bd88ea8..bb795680b33 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
index 7b87cee9e30..82641e6416c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
index c3cc7b6f9d0..87b0dea8875 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
index 9b43c6cd1cc..1c212da3f98 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
index fbca471c465..9ac20f50b74 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
index 130f20d5174..c13a0f5dd78 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
index 0c361c980f3..d35ae1b373f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
index 814f22a8c05..592fe9f8b4d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
index dd204f7f996..92ff922802f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
index ba50c12dcd7..48f194f6a0e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
index 4bfe452d7d8..77ac35c74d4 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
index c06a16ccc4f..bc8c630dced 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
index 4c1489bfbd9..72cbb004f46 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
index 9894827a043..5610ee22dd6 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
index 0d08dacd389..b416746b5a2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
index ebca8b403d4..95ef1427593 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
index 91615797d03..7a624fb2603 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
index b5589d6164b..c505759acb1 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
index e1468fbab15..2bd9ad28261 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
index af6745a67be..d5f3f0e75e1 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
index a41a917e649..5931913dc21 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
index ce5b666f250..3196d8be19d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
index 6977b5c399f..41e01685f05 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
index 282331aa74c..8f6329f999d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
index 0197f24e68e..a2aac260841 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
index 6b393fd2f69..4f32506749f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
index 8ab7dce0254..0f9dec12016 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
index 17e844a0903..e0b9fb5aa6d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
index 97e510d2c2f..4f9910f9dc4 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
index 4668d5baa8c..fd2136b3fa1 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
index 6906e1baefd..80f56088e14 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
index a9637ad33ff..d03a3f0fde5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
index 350dc03ce7b..fdaad07359c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
index 5166f9dc46e..0f78f07670c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
index 0524579dd15..fbaad225b3a 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
index 9b1dd926bc5..d32c53a7f43 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
index 425b46e8d1d..b15bcaa8fea 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
index ff6798d0a87..d943c7ccaa9 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
index 72b64bf5df5..413b6513b41 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
index 449ccfde7f9..20b66eda06d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
index 0f68d808696..400468aab64 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
index b4b7aa69763..eccb122f142 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
index fbde1a30b62..4085053ff00 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
index 8e1748f4911..a489ab4ce0e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
index 8459ad3aa16..aee6cdc5fac 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
index 35182b3e3d1..82c941acc3e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
index 15ed2e0cd2d..a3fd111b374 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
index bf96c6d9320..29a4a56c77c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
index 59df1bbe1fd..5df4f017a89 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
index ec29c8edf50..075d51bdce6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
index 9be367c7acd..78c2f1a490c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
index 4fea21d88bd..d6aa1426502 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
index a3eba1866e4..2337e0f6cc2 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
index 3bb1444be6e..04de3acfb85 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
index c5e1335930a..d6fc308b08b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
index ea725e236fb..168d14803ec 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
index bad7232a5eb..ac643c25232 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
index 40661826d92..b7cb8b17ffc 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
index e2dc75582d5..abb249e6cfb 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
index 30729194a4d..65eeb4306a4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
index fe6851e6bd3..80f9a7fd1a3 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
index abf99ec44f4..6ae13998133 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
index e0f3a355993..6dc931a630e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
index ed42e1cecef..13f7c1fc121 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
index c77d6597846..a986f093d38 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
index 11c5623a47d..94c8bd4cf8d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
index 356797e1b06..ffcfad25760 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
index 2ac68b9a037..17ac27be7ac 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
index 2890b3a70a7..9ae24e7ab10 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
index 33382bf7070..b9ee7050241 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
index e967b8e55b5..e2d8e20f5f2 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
index 91d236545bd..dc1c15b81d7 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
index 24dd182c29e..70e19ed4594 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
index 5a5f7371777..e7e25644c53 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
index 1457224f59d..5dbbaf00f6e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
index 71c942c0f7b..a61247cad7e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
index d1c52da6e66..fac6986fef1 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
index 0ccb9015b02..aa4b4a19839 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
index 9e3f9ffbe2e..c332a558027 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
index fc588544de1..b955d4f0634 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
index 457e9bd0f1b..ed560cf315d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
index ab933846a9d..85f09b002b6 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
index ab0e58407f8..4fe964aa6c4 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
index 95d197b8034..b44b312a296 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
index 846c793f008..5137344f6ed 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
index da3aa62f925..e6b5691d86e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
index 58b88fca397..bedc6f9e2e9 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
index e8663c6708e..65d70eff2db 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
index 84fb041cd97..ace055193ec 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
index ec37208ea80..9194a91e463 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
index e60f97beae6..17fdc11f067 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
index a9330a6f392..3d3373ff5a5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
index 9403b101f81..5263ad636f8 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
index d645490de6a..3500b316e7b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
index dcb173eb175..c04d61cd99d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
index c342ceb2ee1..99a50c29d6b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
index ca9542bb213..c6cf946d307 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
index 04de4ee90d6..e6a9076a749 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
index acec7fbbc39..b762ef9522d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
index ee119867bcc..b1d957b32a2 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
index f4259332e9c..23d2ee8b32f 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
index 12745ea044f..1fd1526e11e 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
index c80c35dd25f..0f93b29eddd 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
index 37bbc4b2b6f..2ea896dbcaf 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
index 00c7208f574..b7ce7f75805 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
index f77605708f7..88880e0cc8c 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
index 691c4063aef..398099229b5 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
index 6072e623fff..debc1fccfa7 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
index 3f555b260d0..88a25b87750 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
index 04ac5b307ba..aabf7f71880 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
index 3f68899537c..d7783076cf9 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
index 2840c2b0677..a798f4c4a63 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
index dc8ae8c722f..bdb78bd6734 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
index f0174f57f58..39ace993aec 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
index 4d294bbe6a0..4b58163e802 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
index ed5c6ab38e1..7fb9408273d 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
index b0878430329..5fccff30477 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
index e25eedec66a..46dcf8c91f3 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
index f0039bb3564..eda4e5a1120 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
index 558229f85a7..7f54a4d52fe 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
index dec4638adf4..da409757743 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
index 91132fcae58..23ee5b592f5 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
index 38e23490065..eeecf1c005e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
index 188d30f2a06..a9ae0b2b97f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
index 0af11fc6759..226468085c5 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
index a99b042c986..256bc4be0f6 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
index 2e147539dbf..7c7414bb96b 100755
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
index 44a60479f8c..87ab414e59c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
index 1cdd7fd1beb..2ac7a4871b2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
index 5ed4a0e21e1..27fe207e455 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
index d01bc1b84c0..48825106e9d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
index f7fbae9c6b5..1ff5ce13c38 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
index 9033c022bb3..0dd6aff9502 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
index 8644b633b35..399456943a9 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
index 2545213135d..57aec2569fd 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
index 001bada3c19..25f94a5e9bb 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
index 4c67460ddc5..a16e00d375c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
@@ -1,8 +1,4 @@
 {
-  "addressing_plan": {
-    "kavlan": "10.28.0.0/14",
-    "virt": "10.160.0.0/14"
-  },
   "architecture": {
     "platform_type": "x86_64",
     "smp_size": 2,
diff --git a/generators/input/sites/toulouse/clusters/pastel.rb b/generators/input/sites/toulouse/clusters/pastel.rb
index 19b8f3c417d..60519087243 100644
--- a/generators/input/sites/toulouse/clusters/pastel.rb
+++ b/generators/input/sites/toulouse/clusters/pastel.rb
@@ -80,11 +80,6 @@ site :toulouse do |site_uid|
             :switch => '<unknown>'
           }
         ]
-        addressing_plan({
-              :kavlan => "10.28.0.0/14",
-              :virt   => "10.160.0.0/14"
-               })
-
       end
     end
   end
diff --git a/generators/input/sites/toulouse/toulouse.rb b/generators/input/sites/toulouse/toulouse.rb
index 3a988af017f..c613734610d 100644
--- a/generators/input/sites/toulouse/toulouse.rb
+++ b/generators/input/sites/toulouse/toulouse.rb
@@ -10,5 +10,6 @@ site :toulouse do |site_uid|
   security_contact "toulouse-staff@lists.grid5000.fr"
   user_support_contact "toulouse-staff@lists.grid5000.fr"
   compilation_server false
-
+  kavlan_plage "10.28.0.0/14"
+  virt_plage "10.160.0.0/14"
 end
-- 
GitLab