diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
index c3427e3915a7f99a4d85317123f0e66e395177c6..68861a14753151a146507525e7f6e0d3a9f68394 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.1",
-      "kavlan-11": "10.7.197.1",
-      "kavlan-12": "10.11.197.1",
-      "kavlan-13": "10.15.197.1",
-      "kavlan-14": "10.19.197.1",
-      "kavlan-16": "10.27.197.1",
-      "kavlan-18": "10.35.197.1",
-      "kavlan-19": "10.39.197.1",
-      "kavlan-2": "192.168.212.1",
-      "kavlan-20": "10.43.197.1",
-      "kavlan-21": "10.47.197.1",
-      "kavlan-3": "192.168.228.1",
-      "kavlan-4": "10.8.1.1",
-      "kavlan-5": "10.8.65.1",
-      "kavlan-6": "10.8.129.1",
-      "kavlan-7": "10.8.193.1",
-      "kavlan-8": "10.9.1.1",
-      "kavlan-9": "10.9.65.1"
+      "kavlan-1": "192.168.192.1",
+      "kavlan-11": "10.7.196.1",
+      "kavlan-12": "10.11.196.1",
+      "kavlan-13": "10.15.196.1",
+      "kavlan-14": "10.19.196.1",
+      "kavlan-16": "10.27.196.1",
+      "kavlan-18": "10.35.196.1",
+      "kavlan-19": "10.39.196.1",
+      "kavlan-2": "192.168.208.1",
+      "kavlan-20": "10.43.196.1",
+      "kavlan-21": "10.47.196.1",
+      "kavlan-3": "192.168.224.1",
+      "kavlan-4": "10.8.0.1",
+      "kavlan-5": "10.8.64.1",
+      "kavlan-6": "10.8.128.1",
+      "kavlan-7": "10.8.192.1",
+      "kavlan-8": "10.9.0.1",
+      "kavlan-9": "10.9.64.1"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.21",
-      "kavlan-11": "10.7.197.16",
-      "kavlan-12": "10.11.197.16",
-      "kavlan-13": "10.15.197.16",
-      "kavlan-14": "10.19.197.16",
-      "kavlan-16": "10.27.197.16",
-      "kavlan-18": "10.35.197.16",
-      "kavlan-19": "10.39.197.16",
-      "kavlan-2": "192.168.212.21",
-      "kavlan-20": "10.43.197.16",
-      "kavlan-21": "10.47.197.16",
-      "kavlan-3": "192.168.228.21",
-      "kavlan-4": "10.8.1.21",
-      "kavlan-5": "10.8.65.21",
-      "kavlan-6": "10.8.129.21",
-      "kavlan-7": "10.8.193.21",
-      "kavlan-8": "10.9.1.21",
-      "kavlan-9": "10.9.65.21"
+      "kavlan-1": "192.168.192.16",
+      "kavlan-11": "10.7.196.16",
+      "kavlan-12": "10.11.196.16",
+      "kavlan-13": "10.15.196.16",
+      "kavlan-14": "10.19.196.16",
+      "kavlan-16": "10.27.196.16",
+      "kavlan-18": "10.35.196.16",
+      "kavlan-19": "10.39.196.16",
+      "kavlan-2": "192.168.208.16",
+      "kavlan-20": "10.43.196.16",
+      "kavlan-21": "10.47.196.16",
+      "kavlan-3": "192.168.224.16",
+      "kavlan-4": "10.8.0.16",
+      "kavlan-5": "10.8.64.16",
+      "kavlan-6": "10.8.128.16",
+      "kavlan-7": "10.8.192.16",
+      "kavlan-8": "10.9.0.16",
+      "kavlan-9": "10.9.64.16"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
index 48b203234f23016273e8d87bb32d8def8a8728cb..c889decaf5e39c5f558473fd4c8d6b46d9058c76 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.10",
-      "kavlan-11": "10.7.197.10",
-      "kavlan-12": "10.11.197.10",
-      "kavlan-13": "10.15.197.10",
-      "kavlan-14": "10.19.197.10",
-      "kavlan-16": "10.27.197.10",
-      "kavlan-18": "10.35.197.10",
-      "kavlan-19": "10.39.197.10",
-      "kavlan-2": "192.168.212.10",
-      "kavlan-20": "10.43.197.10",
-      "kavlan-21": "10.47.197.10",
-      "kavlan-3": "192.168.228.10",
-      "kavlan-4": "10.8.1.10",
-      "kavlan-5": "10.8.65.10",
-      "kavlan-6": "10.8.129.10",
-      "kavlan-7": "10.8.193.10",
-      "kavlan-8": "10.9.1.10",
-      "kavlan-9": "10.9.65.10"
+      "kavlan-1": "192.168.192.10",
+      "kavlan-11": "10.7.196.10",
+      "kavlan-12": "10.11.196.10",
+      "kavlan-13": "10.15.196.10",
+      "kavlan-14": "10.19.196.10",
+      "kavlan-16": "10.27.196.10",
+      "kavlan-18": "10.35.196.10",
+      "kavlan-19": "10.39.196.10",
+      "kavlan-2": "192.168.208.10",
+      "kavlan-20": "10.43.196.10",
+      "kavlan-21": "10.47.196.10",
+      "kavlan-3": "192.168.224.10",
+      "kavlan-4": "10.8.0.10",
+      "kavlan-5": "10.8.64.10",
+      "kavlan-6": "10.8.128.10",
+      "kavlan-7": "10.8.192.10",
+      "kavlan-8": "10.9.0.10",
+      "kavlan-9": "10.9.64.10"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.30",
-      "kavlan-11": "10.7.197.25",
-      "kavlan-12": "10.11.197.25",
-      "kavlan-13": "10.15.197.25",
-      "kavlan-14": "10.19.197.25",
-      "kavlan-16": "10.27.197.25",
-      "kavlan-18": "10.35.197.25",
-      "kavlan-19": "10.39.197.25",
-      "kavlan-2": "192.168.212.30",
-      "kavlan-20": "10.43.197.25",
-      "kavlan-21": "10.47.197.25",
-      "kavlan-3": "192.168.228.30",
-      "kavlan-4": "10.8.1.30",
-      "kavlan-5": "10.8.65.30",
-      "kavlan-6": "10.8.129.30",
-      "kavlan-7": "10.8.193.30",
-      "kavlan-8": "10.9.1.30",
-      "kavlan-9": "10.9.65.30"
+      "kavlan-1": "192.168.192.25",
+      "kavlan-11": "10.7.196.25",
+      "kavlan-12": "10.11.196.25",
+      "kavlan-13": "10.15.196.25",
+      "kavlan-14": "10.19.196.25",
+      "kavlan-16": "10.27.196.25",
+      "kavlan-18": "10.35.196.25",
+      "kavlan-19": "10.39.196.25",
+      "kavlan-2": "192.168.208.25",
+      "kavlan-20": "10.43.196.25",
+      "kavlan-21": "10.47.196.25",
+      "kavlan-3": "192.168.224.25",
+      "kavlan-4": "10.8.0.25",
+      "kavlan-5": "10.8.64.25",
+      "kavlan-6": "10.8.128.25",
+      "kavlan-7": "10.8.192.25",
+      "kavlan-8": "10.9.0.25",
+      "kavlan-9": "10.9.64.25"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
index b55334a5e783e086c196d43f2f529ab5785299c3..1c5238fc1245477fef15bab87625c4ae1062cf72 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.11",
-      "kavlan-11": "10.7.197.11",
-      "kavlan-12": "10.11.197.11",
-      "kavlan-13": "10.15.197.11",
-      "kavlan-14": "10.19.197.11",
-      "kavlan-16": "10.27.197.11",
-      "kavlan-18": "10.35.197.11",
-      "kavlan-19": "10.39.197.11",
-      "kavlan-2": "192.168.212.11",
-      "kavlan-20": "10.43.197.11",
-      "kavlan-21": "10.47.197.11",
-      "kavlan-3": "192.168.228.11",
-      "kavlan-4": "10.8.1.11",
-      "kavlan-5": "10.8.65.11",
-      "kavlan-6": "10.8.129.11",
-      "kavlan-7": "10.8.193.11",
-      "kavlan-8": "10.9.1.11",
-      "kavlan-9": "10.9.65.11"
+      "kavlan-1": "192.168.192.11",
+      "kavlan-11": "10.7.196.11",
+      "kavlan-12": "10.11.196.11",
+      "kavlan-13": "10.15.196.11",
+      "kavlan-14": "10.19.196.11",
+      "kavlan-16": "10.27.196.11",
+      "kavlan-18": "10.35.196.11",
+      "kavlan-19": "10.39.196.11",
+      "kavlan-2": "192.168.208.11",
+      "kavlan-20": "10.43.196.11",
+      "kavlan-21": "10.47.196.11",
+      "kavlan-3": "192.168.224.11",
+      "kavlan-4": "10.8.0.11",
+      "kavlan-5": "10.8.64.11",
+      "kavlan-6": "10.8.128.11",
+      "kavlan-7": "10.8.192.11",
+      "kavlan-8": "10.9.0.11",
+      "kavlan-9": "10.9.64.11"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.31",
-      "kavlan-11": "10.7.197.26",
-      "kavlan-12": "10.11.197.26",
-      "kavlan-13": "10.15.197.26",
-      "kavlan-14": "10.19.197.26",
-      "kavlan-16": "10.27.197.26",
-      "kavlan-18": "10.35.197.26",
-      "kavlan-19": "10.39.197.26",
-      "kavlan-2": "192.168.212.31",
-      "kavlan-20": "10.43.197.26",
-      "kavlan-21": "10.47.197.26",
-      "kavlan-3": "192.168.228.31",
-      "kavlan-4": "10.8.1.31",
-      "kavlan-5": "10.8.65.31",
-      "kavlan-6": "10.8.129.31",
-      "kavlan-7": "10.8.193.31",
-      "kavlan-8": "10.9.1.31",
-      "kavlan-9": "10.9.65.31"
+      "kavlan-1": "192.168.192.26",
+      "kavlan-11": "10.7.196.26",
+      "kavlan-12": "10.11.196.26",
+      "kavlan-13": "10.15.196.26",
+      "kavlan-14": "10.19.196.26",
+      "kavlan-16": "10.27.196.26",
+      "kavlan-18": "10.35.196.26",
+      "kavlan-19": "10.39.196.26",
+      "kavlan-2": "192.168.208.26",
+      "kavlan-20": "10.43.196.26",
+      "kavlan-21": "10.47.196.26",
+      "kavlan-3": "192.168.224.26",
+      "kavlan-4": "10.8.0.26",
+      "kavlan-5": "10.8.64.26",
+      "kavlan-6": "10.8.128.26",
+      "kavlan-7": "10.8.192.26",
+      "kavlan-8": "10.9.0.26",
+      "kavlan-9": "10.9.64.26"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
index a217d5a0d1d819a0e9f44e74990219b226c4f9ee..711542d54f2f8322a26c3029617c468ed47cf2b4 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.12",
-      "kavlan-11": "10.7.197.12",
-      "kavlan-12": "10.11.197.12",
-      "kavlan-13": "10.15.197.12",
-      "kavlan-14": "10.19.197.12",
-      "kavlan-16": "10.27.197.12",
-      "kavlan-18": "10.35.197.12",
-      "kavlan-19": "10.39.197.12",
-      "kavlan-2": "192.168.212.12",
-      "kavlan-20": "10.43.197.12",
-      "kavlan-21": "10.47.197.12",
-      "kavlan-3": "192.168.228.12",
-      "kavlan-4": "10.8.1.12",
-      "kavlan-5": "10.8.65.12",
-      "kavlan-6": "10.8.129.12",
-      "kavlan-7": "10.8.193.12",
-      "kavlan-8": "10.9.1.12",
-      "kavlan-9": "10.9.65.12"
+      "kavlan-1": "192.168.192.12",
+      "kavlan-11": "10.7.196.12",
+      "kavlan-12": "10.11.196.12",
+      "kavlan-13": "10.15.196.12",
+      "kavlan-14": "10.19.196.12",
+      "kavlan-16": "10.27.196.12",
+      "kavlan-18": "10.35.196.12",
+      "kavlan-19": "10.39.196.12",
+      "kavlan-2": "192.168.208.12",
+      "kavlan-20": "10.43.196.12",
+      "kavlan-21": "10.47.196.12",
+      "kavlan-3": "192.168.224.12",
+      "kavlan-4": "10.8.0.12",
+      "kavlan-5": "10.8.64.12",
+      "kavlan-6": "10.8.128.12",
+      "kavlan-7": "10.8.192.12",
+      "kavlan-8": "10.9.0.12",
+      "kavlan-9": "10.9.64.12"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.32",
-      "kavlan-11": "10.7.197.27",
-      "kavlan-12": "10.11.197.27",
-      "kavlan-13": "10.15.197.27",
-      "kavlan-14": "10.19.197.27",
-      "kavlan-16": "10.27.197.27",
-      "kavlan-18": "10.35.197.27",
-      "kavlan-19": "10.39.197.27",
-      "kavlan-2": "192.168.212.32",
-      "kavlan-20": "10.43.197.27",
-      "kavlan-21": "10.47.197.27",
-      "kavlan-3": "192.168.228.32",
-      "kavlan-4": "10.8.1.32",
-      "kavlan-5": "10.8.65.32",
-      "kavlan-6": "10.8.129.32",
-      "kavlan-7": "10.8.193.32",
-      "kavlan-8": "10.9.1.32",
-      "kavlan-9": "10.9.65.32"
+      "kavlan-1": "192.168.192.27",
+      "kavlan-11": "10.7.196.27",
+      "kavlan-12": "10.11.196.27",
+      "kavlan-13": "10.15.196.27",
+      "kavlan-14": "10.19.196.27",
+      "kavlan-16": "10.27.196.27",
+      "kavlan-18": "10.35.196.27",
+      "kavlan-19": "10.39.196.27",
+      "kavlan-2": "192.168.208.27",
+      "kavlan-20": "10.43.196.27",
+      "kavlan-21": "10.47.196.27",
+      "kavlan-3": "192.168.224.27",
+      "kavlan-4": "10.8.0.27",
+      "kavlan-5": "10.8.64.27",
+      "kavlan-6": "10.8.128.27",
+      "kavlan-7": "10.8.192.27",
+      "kavlan-8": "10.9.0.27",
+      "kavlan-9": "10.9.64.27"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
index f4a0c323311e956059cd03876b2608c3c0cbb60f..f31e9b0a33e5a49fd2d0844c5e0dd44999fd1550 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.13",
-      "kavlan-11": "10.7.197.13",
-      "kavlan-12": "10.11.197.13",
-      "kavlan-13": "10.15.197.13",
-      "kavlan-14": "10.19.197.13",
-      "kavlan-16": "10.27.197.13",
-      "kavlan-18": "10.35.197.13",
-      "kavlan-19": "10.39.197.13",
-      "kavlan-2": "192.168.212.13",
-      "kavlan-20": "10.43.197.13",
-      "kavlan-21": "10.47.197.13",
-      "kavlan-3": "192.168.228.13",
-      "kavlan-4": "10.8.1.13",
-      "kavlan-5": "10.8.65.13",
-      "kavlan-6": "10.8.129.13",
-      "kavlan-7": "10.8.193.13",
-      "kavlan-8": "10.9.1.13",
-      "kavlan-9": "10.9.65.13"
+      "kavlan-1": "192.168.192.13",
+      "kavlan-11": "10.7.196.13",
+      "kavlan-12": "10.11.196.13",
+      "kavlan-13": "10.15.196.13",
+      "kavlan-14": "10.19.196.13",
+      "kavlan-16": "10.27.196.13",
+      "kavlan-18": "10.35.196.13",
+      "kavlan-19": "10.39.196.13",
+      "kavlan-2": "192.168.208.13",
+      "kavlan-20": "10.43.196.13",
+      "kavlan-21": "10.47.196.13",
+      "kavlan-3": "192.168.224.13",
+      "kavlan-4": "10.8.0.13",
+      "kavlan-5": "10.8.64.13",
+      "kavlan-6": "10.8.128.13",
+      "kavlan-7": "10.8.192.13",
+      "kavlan-8": "10.9.0.13",
+      "kavlan-9": "10.9.64.13"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.33",
-      "kavlan-11": "10.7.197.28",
-      "kavlan-12": "10.11.197.28",
-      "kavlan-13": "10.15.197.28",
-      "kavlan-14": "10.19.197.28",
-      "kavlan-16": "10.27.197.28",
-      "kavlan-18": "10.35.197.28",
-      "kavlan-19": "10.39.197.28",
-      "kavlan-2": "192.168.212.33",
-      "kavlan-20": "10.43.197.28",
-      "kavlan-21": "10.47.197.28",
-      "kavlan-3": "192.168.228.33",
-      "kavlan-4": "10.8.1.33",
-      "kavlan-5": "10.8.65.33",
-      "kavlan-6": "10.8.129.33",
-      "kavlan-7": "10.8.193.33",
-      "kavlan-8": "10.9.1.33",
-      "kavlan-9": "10.9.65.33"
+      "kavlan-1": "192.168.192.28",
+      "kavlan-11": "10.7.196.28",
+      "kavlan-12": "10.11.196.28",
+      "kavlan-13": "10.15.196.28",
+      "kavlan-14": "10.19.196.28",
+      "kavlan-16": "10.27.196.28",
+      "kavlan-18": "10.35.196.28",
+      "kavlan-19": "10.39.196.28",
+      "kavlan-2": "192.168.208.28",
+      "kavlan-20": "10.43.196.28",
+      "kavlan-21": "10.47.196.28",
+      "kavlan-3": "192.168.224.28",
+      "kavlan-4": "10.8.0.28",
+      "kavlan-5": "10.8.64.28",
+      "kavlan-6": "10.8.128.28",
+      "kavlan-7": "10.8.192.28",
+      "kavlan-8": "10.9.0.28",
+      "kavlan-9": "10.9.64.28"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
index 9a43fdb228297e922ad00047c2e6945ed9f2288b..7a8742c973dbf59f81594da61faf0b85bf15762b 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.14",
-      "kavlan-11": "10.7.197.14",
-      "kavlan-12": "10.11.197.14",
-      "kavlan-13": "10.15.197.14",
-      "kavlan-14": "10.19.197.14",
-      "kavlan-16": "10.27.197.14",
-      "kavlan-18": "10.35.197.14",
-      "kavlan-19": "10.39.197.14",
-      "kavlan-2": "192.168.212.14",
-      "kavlan-20": "10.43.197.14",
-      "kavlan-21": "10.47.197.14",
-      "kavlan-3": "192.168.228.14",
-      "kavlan-4": "10.8.1.14",
-      "kavlan-5": "10.8.65.14",
-      "kavlan-6": "10.8.129.14",
-      "kavlan-7": "10.8.193.14",
-      "kavlan-8": "10.9.1.14",
-      "kavlan-9": "10.9.65.14"
+      "kavlan-1": "192.168.192.14",
+      "kavlan-11": "10.7.196.14",
+      "kavlan-12": "10.11.196.14",
+      "kavlan-13": "10.15.196.14",
+      "kavlan-14": "10.19.196.14",
+      "kavlan-16": "10.27.196.14",
+      "kavlan-18": "10.35.196.14",
+      "kavlan-19": "10.39.196.14",
+      "kavlan-2": "192.168.208.14",
+      "kavlan-20": "10.43.196.14",
+      "kavlan-21": "10.47.196.14",
+      "kavlan-3": "192.168.224.14",
+      "kavlan-4": "10.8.0.14",
+      "kavlan-5": "10.8.64.14",
+      "kavlan-6": "10.8.128.14",
+      "kavlan-7": "10.8.192.14",
+      "kavlan-8": "10.9.0.14",
+      "kavlan-9": "10.9.64.14"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.34",
-      "kavlan-11": "10.7.197.29",
-      "kavlan-12": "10.11.197.29",
-      "kavlan-13": "10.15.197.29",
-      "kavlan-14": "10.19.197.29",
-      "kavlan-16": "10.27.197.29",
-      "kavlan-18": "10.35.197.29",
-      "kavlan-19": "10.39.197.29",
-      "kavlan-2": "192.168.212.34",
-      "kavlan-20": "10.43.197.29",
-      "kavlan-21": "10.47.197.29",
-      "kavlan-3": "192.168.228.34",
-      "kavlan-4": "10.8.1.34",
-      "kavlan-5": "10.8.65.34",
-      "kavlan-6": "10.8.129.34",
-      "kavlan-7": "10.8.193.34",
-      "kavlan-8": "10.9.1.34",
-      "kavlan-9": "10.9.65.34"
+      "kavlan-1": "192.168.192.29",
+      "kavlan-11": "10.7.196.29",
+      "kavlan-12": "10.11.196.29",
+      "kavlan-13": "10.15.196.29",
+      "kavlan-14": "10.19.196.29",
+      "kavlan-16": "10.27.196.29",
+      "kavlan-18": "10.35.196.29",
+      "kavlan-19": "10.39.196.29",
+      "kavlan-2": "192.168.208.29",
+      "kavlan-20": "10.43.196.29",
+      "kavlan-21": "10.47.196.29",
+      "kavlan-3": "192.168.224.29",
+      "kavlan-4": "10.8.0.29",
+      "kavlan-5": "10.8.64.29",
+      "kavlan-6": "10.8.128.29",
+      "kavlan-7": "10.8.192.29",
+      "kavlan-8": "10.9.0.29",
+      "kavlan-9": "10.9.64.29"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
index 6911dc5d81d1a8255d1c70e75a7c0c1b52272c60..4f1f5c198be81444a7afbf41aafa967c4b39bf8b 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.15",
-      "kavlan-11": "10.7.197.15",
-      "kavlan-12": "10.11.197.15",
-      "kavlan-13": "10.15.197.15",
-      "kavlan-14": "10.19.197.15",
-      "kavlan-16": "10.27.197.15",
-      "kavlan-18": "10.35.197.15",
-      "kavlan-19": "10.39.197.15",
-      "kavlan-2": "192.168.212.15",
-      "kavlan-20": "10.43.197.15",
-      "kavlan-21": "10.47.197.15",
-      "kavlan-3": "192.168.228.15",
-      "kavlan-4": "10.8.1.15",
-      "kavlan-5": "10.8.65.15",
-      "kavlan-6": "10.8.129.15",
-      "kavlan-7": "10.8.193.15",
-      "kavlan-8": "10.9.1.15",
-      "kavlan-9": "10.9.65.15"
+      "kavlan-1": "192.168.192.15",
+      "kavlan-11": "10.7.196.15",
+      "kavlan-12": "10.11.196.15",
+      "kavlan-13": "10.15.196.15",
+      "kavlan-14": "10.19.196.15",
+      "kavlan-16": "10.27.196.15",
+      "kavlan-18": "10.35.196.15",
+      "kavlan-19": "10.39.196.15",
+      "kavlan-2": "192.168.208.15",
+      "kavlan-20": "10.43.196.15",
+      "kavlan-21": "10.47.196.15",
+      "kavlan-3": "192.168.224.15",
+      "kavlan-4": "10.8.0.15",
+      "kavlan-5": "10.8.64.15",
+      "kavlan-6": "10.8.128.15",
+      "kavlan-7": "10.8.192.15",
+      "kavlan-8": "10.9.0.15",
+      "kavlan-9": "10.9.64.15"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.35",
-      "kavlan-11": "10.7.197.30",
-      "kavlan-12": "10.11.197.30",
-      "kavlan-13": "10.15.197.30",
-      "kavlan-14": "10.19.197.30",
-      "kavlan-16": "10.27.197.30",
-      "kavlan-18": "10.35.197.30",
-      "kavlan-19": "10.39.197.30",
-      "kavlan-2": "192.168.212.35",
-      "kavlan-20": "10.43.197.30",
-      "kavlan-21": "10.47.197.30",
-      "kavlan-3": "192.168.228.35",
-      "kavlan-4": "10.8.1.35",
-      "kavlan-5": "10.8.65.35",
-      "kavlan-6": "10.8.129.35",
-      "kavlan-7": "10.8.193.35",
-      "kavlan-8": "10.9.1.35",
-      "kavlan-9": "10.9.65.35"
+      "kavlan-1": "192.168.192.30",
+      "kavlan-11": "10.7.196.30",
+      "kavlan-12": "10.11.196.30",
+      "kavlan-13": "10.15.196.30",
+      "kavlan-14": "10.19.196.30",
+      "kavlan-16": "10.27.196.30",
+      "kavlan-18": "10.35.196.30",
+      "kavlan-19": "10.39.196.30",
+      "kavlan-2": "192.168.208.30",
+      "kavlan-20": "10.43.196.30",
+      "kavlan-21": "10.47.196.30",
+      "kavlan-3": "192.168.224.30",
+      "kavlan-4": "10.8.0.30",
+      "kavlan-5": "10.8.64.30",
+      "kavlan-6": "10.8.128.30",
+      "kavlan-7": "10.8.192.30",
+      "kavlan-8": "10.9.0.30",
+      "kavlan-9": "10.9.64.30"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
index 8014257b7509bd141d1a0d7d4e84f2da981032b1..24d68bd5f5ef4a5039d31f511cfad4be66396dfb 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.2",
-      "kavlan-11": "10.7.197.2",
-      "kavlan-12": "10.11.197.2",
-      "kavlan-13": "10.15.197.2",
-      "kavlan-14": "10.19.197.2",
-      "kavlan-16": "10.27.197.2",
-      "kavlan-18": "10.35.197.2",
-      "kavlan-19": "10.39.197.2",
-      "kavlan-2": "192.168.212.2",
-      "kavlan-20": "10.43.197.2",
-      "kavlan-21": "10.47.197.2",
-      "kavlan-3": "192.168.228.2",
-      "kavlan-4": "10.8.1.2",
-      "kavlan-5": "10.8.65.2",
-      "kavlan-6": "10.8.129.2",
-      "kavlan-7": "10.8.193.2",
-      "kavlan-8": "10.9.1.2",
-      "kavlan-9": "10.9.65.2"
+      "kavlan-1": "192.168.192.2",
+      "kavlan-11": "10.7.196.2",
+      "kavlan-12": "10.11.196.2",
+      "kavlan-13": "10.15.196.2",
+      "kavlan-14": "10.19.196.2",
+      "kavlan-16": "10.27.196.2",
+      "kavlan-18": "10.35.196.2",
+      "kavlan-19": "10.39.196.2",
+      "kavlan-2": "192.168.208.2",
+      "kavlan-20": "10.43.196.2",
+      "kavlan-21": "10.47.196.2",
+      "kavlan-3": "192.168.224.2",
+      "kavlan-4": "10.8.0.2",
+      "kavlan-5": "10.8.64.2",
+      "kavlan-6": "10.8.128.2",
+      "kavlan-7": "10.8.192.2",
+      "kavlan-8": "10.9.0.2",
+      "kavlan-9": "10.9.64.2"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.22",
-      "kavlan-11": "10.7.197.17",
-      "kavlan-12": "10.11.197.17",
-      "kavlan-13": "10.15.197.17",
-      "kavlan-14": "10.19.197.17",
-      "kavlan-16": "10.27.197.17",
-      "kavlan-18": "10.35.197.17",
-      "kavlan-19": "10.39.197.17",
-      "kavlan-2": "192.168.212.22",
-      "kavlan-20": "10.43.197.17",
-      "kavlan-21": "10.47.197.17",
-      "kavlan-3": "192.168.228.22",
-      "kavlan-4": "10.8.1.22",
-      "kavlan-5": "10.8.65.22",
-      "kavlan-6": "10.8.129.22",
-      "kavlan-7": "10.8.193.22",
-      "kavlan-8": "10.9.1.22",
-      "kavlan-9": "10.9.65.22"
+      "kavlan-1": "192.168.192.17",
+      "kavlan-11": "10.7.196.17",
+      "kavlan-12": "10.11.196.17",
+      "kavlan-13": "10.15.196.17",
+      "kavlan-14": "10.19.196.17",
+      "kavlan-16": "10.27.196.17",
+      "kavlan-18": "10.35.196.17",
+      "kavlan-19": "10.39.196.17",
+      "kavlan-2": "192.168.208.17",
+      "kavlan-20": "10.43.196.17",
+      "kavlan-21": "10.47.196.17",
+      "kavlan-3": "192.168.224.17",
+      "kavlan-4": "10.8.0.17",
+      "kavlan-5": "10.8.64.17",
+      "kavlan-6": "10.8.128.17",
+      "kavlan-7": "10.8.192.17",
+      "kavlan-8": "10.9.0.17",
+      "kavlan-9": "10.9.64.17"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
index 73cc9b5327e9e36300a8dcccf4b4d3f91b8cd84c..0da0470e28db983f66c42f5862b3600b41a45ca7 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.3",
-      "kavlan-11": "10.7.197.3",
-      "kavlan-12": "10.11.197.3",
-      "kavlan-13": "10.15.197.3",
-      "kavlan-14": "10.19.197.3",
-      "kavlan-16": "10.27.197.3",
-      "kavlan-18": "10.35.197.3",
-      "kavlan-19": "10.39.197.3",
-      "kavlan-2": "192.168.212.3",
-      "kavlan-20": "10.43.197.3",
-      "kavlan-21": "10.47.197.3",
-      "kavlan-3": "192.168.228.3",
-      "kavlan-4": "10.8.1.3",
-      "kavlan-5": "10.8.65.3",
-      "kavlan-6": "10.8.129.3",
-      "kavlan-7": "10.8.193.3",
-      "kavlan-8": "10.9.1.3",
-      "kavlan-9": "10.9.65.3"
+      "kavlan-1": "192.168.192.3",
+      "kavlan-11": "10.7.196.3",
+      "kavlan-12": "10.11.196.3",
+      "kavlan-13": "10.15.196.3",
+      "kavlan-14": "10.19.196.3",
+      "kavlan-16": "10.27.196.3",
+      "kavlan-18": "10.35.196.3",
+      "kavlan-19": "10.39.196.3",
+      "kavlan-2": "192.168.208.3",
+      "kavlan-20": "10.43.196.3",
+      "kavlan-21": "10.47.196.3",
+      "kavlan-3": "192.168.224.3",
+      "kavlan-4": "10.8.0.3",
+      "kavlan-5": "10.8.64.3",
+      "kavlan-6": "10.8.128.3",
+      "kavlan-7": "10.8.192.3",
+      "kavlan-8": "10.9.0.3",
+      "kavlan-9": "10.9.64.3"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.23",
-      "kavlan-11": "10.7.197.18",
-      "kavlan-12": "10.11.197.18",
-      "kavlan-13": "10.15.197.18",
-      "kavlan-14": "10.19.197.18",
-      "kavlan-16": "10.27.197.18",
-      "kavlan-18": "10.35.197.18",
-      "kavlan-19": "10.39.197.18",
-      "kavlan-2": "192.168.212.23",
-      "kavlan-20": "10.43.197.18",
-      "kavlan-21": "10.47.197.18",
-      "kavlan-3": "192.168.228.23",
-      "kavlan-4": "10.8.1.23",
-      "kavlan-5": "10.8.65.23",
-      "kavlan-6": "10.8.129.23",
-      "kavlan-7": "10.8.193.23",
-      "kavlan-8": "10.9.1.23",
-      "kavlan-9": "10.9.65.23"
+      "kavlan-1": "192.168.192.18",
+      "kavlan-11": "10.7.196.18",
+      "kavlan-12": "10.11.196.18",
+      "kavlan-13": "10.15.196.18",
+      "kavlan-14": "10.19.196.18",
+      "kavlan-16": "10.27.196.18",
+      "kavlan-18": "10.35.196.18",
+      "kavlan-19": "10.39.196.18",
+      "kavlan-2": "192.168.208.18",
+      "kavlan-20": "10.43.196.18",
+      "kavlan-21": "10.47.196.18",
+      "kavlan-3": "192.168.224.18",
+      "kavlan-4": "10.8.0.18",
+      "kavlan-5": "10.8.64.18",
+      "kavlan-6": "10.8.128.18",
+      "kavlan-7": "10.8.192.18",
+      "kavlan-8": "10.9.0.18",
+      "kavlan-9": "10.9.64.18"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
index f2ca097f456e438496096d47f77c79c1d54731bb..0d79da1853dcddbe754bc44354dc4d67fa43c3b3 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.4",
-      "kavlan-11": "10.7.197.4",
-      "kavlan-12": "10.11.197.4",
-      "kavlan-13": "10.15.197.4",
-      "kavlan-14": "10.19.197.4",
-      "kavlan-16": "10.27.197.4",
-      "kavlan-18": "10.35.197.4",
-      "kavlan-19": "10.39.197.4",
-      "kavlan-2": "192.168.212.4",
-      "kavlan-20": "10.43.197.4",
-      "kavlan-21": "10.47.197.4",
-      "kavlan-3": "192.168.228.4",
-      "kavlan-4": "10.8.1.4",
-      "kavlan-5": "10.8.65.4",
-      "kavlan-6": "10.8.129.4",
-      "kavlan-7": "10.8.193.4",
-      "kavlan-8": "10.9.1.4",
-      "kavlan-9": "10.9.65.4"
+      "kavlan-1": "192.168.192.4",
+      "kavlan-11": "10.7.196.4",
+      "kavlan-12": "10.11.196.4",
+      "kavlan-13": "10.15.196.4",
+      "kavlan-14": "10.19.196.4",
+      "kavlan-16": "10.27.196.4",
+      "kavlan-18": "10.35.196.4",
+      "kavlan-19": "10.39.196.4",
+      "kavlan-2": "192.168.208.4",
+      "kavlan-20": "10.43.196.4",
+      "kavlan-21": "10.47.196.4",
+      "kavlan-3": "192.168.224.4",
+      "kavlan-4": "10.8.0.4",
+      "kavlan-5": "10.8.64.4",
+      "kavlan-6": "10.8.128.4",
+      "kavlan-7": "10.8.192.4",
+      "kavlan-8": "10.9.0.4",
+      "kavlan-9": "10.9.64.4"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.24",
-      "kavlan-11": "10.7.197.19",
-      "kavlan-12": "10.11.197.19",
-      "kavlan-13": "10.15.197.19",
-      "kavlan-14": "10.19.197.19",
-      "kavlan-16": "10.27.197.19",
-      "kavlan-18": "10.35.197.19",
-      "kavlan-19": "10.39.197.19",
-      "kavlan-2": "192.168.212.24",
-      "kavlan-20": "10.43.197.19",
-      "kavlan-21": "10.47.197.19",
-      "kavlan-3": "192.168.228.24",
-      "kavlan-4": "10.8.1.24",
-      "kavlan-5": "10.8.65.24",
-      "kavlan-6": "10.8.129.24",
-      "kavlan-7": "10.8.193.24",
-      "kavlan-8": "10.9.1.24",
-      "kavlan-9": "10.9.65.24"
+      "kavlan-1": "192.168.192.19",
+      "kavlan-11": "10.7.196.19",
+      "kavlan-12": "10.11.196.19",
+      "kavlan-13": "10.15.196.19",
+      "kavlan-14": "10.19.196.19",
+      "kavlan-16": "10.27.196.19",
+      "kavlan-18": "10.35.196.19",
+      "kavlan-19": "10.39.196.19",
+      "kavlan-2": "192.168.208.19",
+      "kavlan-20": "10.43.196.19",
+      "kavlan-21": "10.47.196.19",
+      "kavlan-3": "192.168.224.19",
+      "kavlan-4": "10.8.0.19",
+      "kavlan-5": "10.8.64.19",
+      "kavlan-6": "10.8.128.19",
+      "kavlan-7": "10.8.192.19",
+      "kavlan-8": "10.9.0.19",
+      "kavlan-9": "10.9.64.19"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
index 375df58cfd91f1a8ab98bafb8154048b677136e9..dbe0b72cc8690748e3983ee98de8f37e6d5c8fd6 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.5",
-      "kavlan-11": "10.7.197.5",
-      "kavlan-12": "10.11.197.5",
-      "kavlan-13": "10.15.197.5",
-      "kavlan-14": "10.19.197.5",
-      "kavlan-16": "10.27.197.5",
-      "kavlan-18": "10.35.197.5",
-      "kavlan-19": "10.39.197.5",
-      "kavlan-2": "192.168.212.5",
-      "kavlan-20": "10.43.197.5",
-      "kavlan-21": "10.47.197.5",
-      "kavlan-3": "192.168.228.5",
-      "kavlan-4": "10.8.1.5",
-      "kavlan-5": "10.8.65.5",
-      "kavlan-6": "10.8.129.5",
-      "kavlan-7": "10.8.193.5",
-      "kavlan-8": "10.9.1.5",
-      "kavlan-9": "10.9.65.5"
+      "kavlan-1": "192.168.192.5",
+      "kavlan-11": "10.7.196.5",
+      "kavlan-12": "10.11.196.5",
+      "kavlan-13": "10.15.196.5",
+      "kavlan-14": "10.19.196.5",
+      "kavlan-16": "10.27.196.5",
+      "kavlan-18": "10.35.196.5",
+      "kavlan-19": "10.39.196.5",
+      "kavlan-2": "192.168.208.5",
+      "kavlan-20": "10.43.196.5",
+      "kavlan-21": "10.47.196.5",
+      "kavlan-3": "192.168.224.5",
+      "kavlan-4": "10.8.0.5",
+      "kavlan-5": "10.8.64.5",
+      "kavlan-6": "10.8.128.5",
+      "kavlan-7": "10.8.192.5",
+      "kavlan-8": "10.9.0.5",
+      "kavlan-9": "10.9.64.5"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.25",
-      "kavlan-11": "10.7.197.20",
-      "kavlan-12": "10.11.197.20",
-      "kavlan-13": "10.15.197.20",
-      "kavlan-14": "10.19.197.20",
-      "kavlan-16": "10.27.197.20",
-      "kavlan-18": "10.35.197.20",
-      "kavlan-19": "10.39.197.20",
-      "kavlan-2": "192.168.212.25",
-      "kavlan-20": "10.43.197.20",
-      "kavlan-21": "10.47.197.20",
-      "kavlan-3": "192.168.228.25",
-      "kavlan-4": "10.8.1.25",
-      "kavlan-5": "10.8.65.25",
-      "kavlan-6": "10.8.129.25",
-      "kavlan-7": "10.8.193.25",
-      "kavlan-8": "10.9.1.25",
-      "kavlan-9": "10.9.65.25"
+      "kavlan-1": "192.168.192.20",
+      "kavlan-11": "10.7.196.20",
+      "kavlan-12": "10.11.196.20",
+      "kavlan-13": "10.15.196.20",
+      "kavlan-14": "10.19.196.20",
+      "kavlan-16": "10.27.196.20",
+      "kavlan-18": "10.35.196.20",
+      "kavlan-19": "10.39.196.20",
+      "kavlan-2": "192.168.208.20",
+      "kavlan-20": "10.43.196.20",
+      "kavlan-21": "10.47.196.20",
+      "kavlan-3": "192.168.224.20",
+      "kavlan-4": "10.8.0.20",
+      "kavlan-5": "10.8.64.20",
+      "kavlan-6": "10.8.128.20",
+      "kavlan-7": "10.8.192.20",
+      "kavlan-8": "10.9.0.20",
+      "kavlan-9": "10.9.64.20"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
index 9106129d6a3188561cb618a1de8d2aade24245fc..6f075b03024e39f39c4be6bf6b0a0a5c926f6f77 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.6",
-      "kavlan-11": "10.7.197.6",
-      "kavlan-12": "10.11.197.6",
-      "kavlan-13": "10.15.197.6",
-      "kavlan-14": "10.19.197.6",
-      "kavlan-16": "10.27.197.6",
-      "kavlan-18": "10.35.197.6",
-      "kavlan-19": "10.39.197.6",
-      "kavlan-2": "192.168.212.6",
-      "kavlan-20": "10.43.197.6",
-      "kavlan-21": "10.47.197.6",
-      "kavlan-3": "192.168.228.6",
-      "kavlan-4": "10.8.1.6",
-      "kavlan-5": "10.8.65.6",
-      "kavlan-6": "10.8.129.6",
-      "kavlan-7": "10.8.193.6",
-      "kavlan-8": "10.9.1.6",
-      "kavlan-9": "10.9.65.6"
+      "kavlan-1": "192.168.192.6",
+      "kavlan-11": "10.7.196.6",
+      "kavlan-12": "10.11.196.6",
+      "kavlan-13": "10.15.196.6",
+      "kavlan-14": "10.19.196.6",
+      "kavlan-16": "10.27.196.6",
+      "kavlan-18": "10.35.196.6",
+      "kavlan-19": "10.39.196.6",
+      "kavlan-2": "192.168.208.6",
+      "kavlan-20": "10.43.196.6",
+      "kavlan-21": "10.47.196.6",
+      "kavlan-3": "192.168.224.6",
+      "kavlan-4": "10.8.0.6",
+      "kavlan-5": "10.8.64.6",
+      "kavlan-6": "10.8.128.6",
+      "kavlan-7": "10.8.192.6",
+      "kavlan-8": "10.9.0.6",
+      "kavlan-9": "10.9.64.6"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.26",
-      "kavlan-11": "10.7.197.21",
-      "kavlan-12": "10.11.197.21",
-      "kavlan-13": "10.15.197.21",
-      "kavlan-14": "10.19.197.21",
-      "kavlan-16": "10.27.197.21",
-      "kavlan-18": "10.35.197.21",
-      "kavlan-19": "10.39.197.21",
-      "kavlan-2": "192.168.212.26",
-      "kavlan-20": "10.43.197.21",
-      "kavlan-21": "10.47.197.21",
-      "kavlan-3": "192.168.228.26",
-      "kavlan-4": "10.8.1.26",
-      "kavlan-5": "10.8.65.26",
-      "kavlan-6": "10.8.129.26",
-      "kavlan-7": "10.8.193.26",
-      "kavlan-8": "10.9.1.26",
-      "kavlan-9": "10.9.65.26"
+      "kavlan-1": "192.168.192.21",
+      "kavlan-11": "10.7.196.21",
+      "kavlan-12": "10.11.196.21",
+      "kavlan-13": "10.15.196.21",
+      "kavlan-14": "10.19.196.21",
+      "kavlan-16": "10.27.196.21",
+      "kavlan-18": "10.35.196.21",
+      "kavlan-19": "10.39.196.21",
+      "kavlan-2": "192.168.208.21",
+      "kavlan-20": "10.43.196.21",
+      "kavlan-21": "10.47.196.21",
+      "kavlan-3": "192.168.224.21",
+      "kavlan-4": "10.8.0.21",
+      "kavlan-5": "10.8.64.21",
+      "kavlan-6": "10.8.128.21",
+      "kavlan-7": "10.8.192.21",
+      "kavlan-8": "10.9.0.21",
+      "kavlan-9": "10.9.64.21"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
index b2811b70b5bb71fdce7c20a46e6cf0ab3e30558e..93495b0008ffa2dcb00a4fd2a57e81406e0f76d0 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.7",
-      "kavlan-11": "10.7.197.7",
-      "kavlan-12": "10.11.197.7",
-      "kavlan-13": "10.15.197.7",
-      "kavlan-14": "10.19.197.7",
-      "kavlan-16": "10.27.197.7",
-      "kavlan-18": "10.35.197.7",
-      "kavlan-19": "10.39.197.7",
-      "kavlan-2": "192.168.212.7",
-      "kavlan-20": "10.43.197.7",
-      "kavlan-21": "10.47.197.7",
-      "kavlan-3": "192.168.228.7",
-      "kavlan-4": "10.8.1.7",
-      "kavlan-5": "10.8.65.7",
-      "kavlan-6": "10.8.129.7",
-      "kavlan-7": "10.8.193.7",
-      "kavlan-8": "10.9.1.7",
-      "kavlan-9": "10.9.65.7"
+      "kavlan-1": "192.168.192.7",
+      "kavlan-11": "10.7.196.7",
+      "kavlan-12": "10.11.196.7",
+      "kavlan-13": "10.15.196.7",
+      "kavlan-14": "10.19.196.7",
+      "kavlan-16": "10.27.196.7",
+      "kavlan-18": "10.35.196.7",
+      "kavlan-19": "10.39.196.7",
+      "kavlan-2": "192.168.208.7",
+      "kavlan-20": "10.43.196.7",
+      "kavlan-21": "10.47.196.7",
+      "kavlan-3": "192.168.224.7",
+      "kavlan-4": "10.8.0.7",
+      "kavlan-5": "10.8.64.7",
+      "kavlan-6": "10.8.128.7",
+      "kavlan-7": "10.8.192.7",
+      "kavlan-8": "10.9.0.7",
+      "kavlan-9": "10.9.64.7"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.27",
-      "kavlan-11": "10.7.197.22",
-      "kavlan-12": "10.11.197.22",
-      "kavlan-13": "10.15.197.22",
-      "kavlan-14": "10.19.197.22",
-      "kavlan-16": "10.27.197.22",
-      "kavlan-18": "10.35.197.22",
-      "kavlan-19": "10.39.197.22",
-      "kavlan-2": "192.168.212.27",
-      "kavlan-20": "10.43.197.22",
-      "kavlan-21": "10.47.197.22",
-      "kavlan-3": "192.168.228.27",
-      "kavlan-4": "10.8.1.27",
-      "kavlan-5": "10.8.65.27",
-      "kavlan-6": "10.8.129.27",
-      "kavlan-7": "10.8.193.27",
-      "kavlan-8": "10.9.1.27",
-      "kavlan-9": "10.9.65.27"
+      "kavlan-1": "192.168.192.22",
+      "kavlan-11": "10.7.196.22",
+      "kavlan-12": "10.11.196.22",
+      "kavlan-13": "10.15.196.22",
+      "kavlan-14": "10.19.196.22",
+      "kavlan-16": "10.27.196.22",
+      "kavlan-18": "10.35.196.22",
+      "kavlan-19": "10.39.196.22",
+      "kavlan-2": "192.168.208.22",
+      "kavlan-20": "10.43.196.22",
+      "kavlan-21": "10.47.196.22",
+      "kavlan-3": "192.168.224.22",
+      "kavlan-4": "10.8.0.22",
+      "kavlan-5": "10.8.64.22",
+      "kavlan-6": "10.8.128.22",
+      "kavlan-7": "10.8.192.22",
+      "kavlan-8": "10.9.0.22",
+      "kavlan-9": "10.9.64.22"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
index 3f113d814b31e19bb93c1dbdb8701111820aae9b..036a11716cbb0db83109c535b1d779ebd2f79b0d 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.8",
-      "kavlan-11": "10.7.197.8",
-      "kavlan-12": "10.11.197.8",
-      "kavlan-13": "10.15.197.8",
-      "kavlan-14": "10.19.197.8",
-      "kavlan-16": "10.27.197.8",
-      "kavlan-18": "10.35.197.8",
-      "kavlan-19": "10.39.197.8",
-      "kavlan-2": "192.168.212.8",
-      "kavlan-20": "10.43.197.8",
-      "kavlan-21": "10.47.197.8",
-      "kavlan-3": "192.168.228.8",
-      "kavlan-4": "10.8.1.8",
-      "kavlan-5": "10.8.65.8",
-      "kavlan-6": "10.8.129.8",
-      "kavlan-7": "10.8.193.8",
-      "kavlan-8": "10.9.1.8",
-      "kavlan-9": "10.9.65.8"
+      "kavlan-1": "192.168.192.8",
+      "kavlan-11": "10.7.196.8",
+      "kavlan-12": "10.11.196.8",
+      "kavlan-13": "10.15.196.8",
+      "kavlan-14": "10.19.196.8",
+      "kavlan-16": "10.27.196.8",
+      "kavlan-18": "10.35.196.8",
+      "kavlan-19": "10.39.196.8",
+      "kavlan-2": "192.168.208.8",
+      "kavlan-20": "10.43.196.8",
+      "kavlan-21": "10.47.196.8",
+      "kavlan-3": "192.168.224.8",
+      "kavlan-4": "10.8.0.8",
+      "kavlan-5": "10.8.64.8",
+      "kavlan-6": "10.8.128.8",
+      "kavlan-7": "10.8.192.8",
+      "kavlan-8": "10.9.0.8",
+      "kavlan-9": "10.9.64.8"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.28",
-      "kavlan-11": "10.7.197.23",
-      "kavlan-12": "10.11.197.23",
-      "kavlan-13": "10.15.197.23",
-      "kavlan-14": "10.19.197.23",
-      "kavlan-16": "10.27.197.23",
-      "kavlan-18": "10.35.197.23",
-      "kavlan-19": "10.39.197.23",
-      "kavlan-2": "192.168.212.28",
-      "kavlan-20": "10.43.197.23",
-      "kavlan-21": "10.47.197.23",
-      "kavlan-3": "192.168.228.28",
-      "kavlan-4": "10.8.1.28",
-      "kavlan-5": "10.8.65.28",
-      "kavlan-6": "10.8.129.28",
-      "kavlan-7": "10.8.193.28",
-      "kavlan-8": "10.9.1.28",
-      "kavlan-9": "10.9.65.28"
+      "kavlan-1": "192.168.192.23",
+      "kavlan-11": "10.7.196.23",
+      "kavlan-12": "10.11.196.23",
+      "kavlan-13": "10.15.196.23",
+      "kavlan-14": "10.19.196.23",
+      "kavlan-16": "10.27.196.23",
+      "kavlan-18": "10.35.196.23",
+      "kavlan-19": "10.39.196.23",
+      "kavlan-2": "192.168.208.23",
+      "kavlan-20": "10.43.196.23",
+      "kavlan-21": "10.47.196.23",
+      "kavlan-3": "192.168.224.23",
+      "kavlan-4": "10.8.0.23",
+      "kavlan-5": "10.8.64.23",
+      "kavlan-6": "10.8.128.23",
+      "kavlan-7": "10.8.192.23",
+      "kavlan-8": "10.9.0.23",
+      "kavlan-9": "10.9.64.23"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
index d870b52aa82c0a9e7accb95899d11ed6a1822b54..ee09f728a451b5b9095e040108f67694dd33d8a8 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json
@@ -20,44 +20,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.195.9",
-      "kavlan-11": "10.7.197.9",
-      "kavlan-12": "10.11.197.9",
-      "kavlan-13": "10.15.197.9",
-      "kavlan-14": "10.19.197.9",
-      "kavlan-16": "10.27.197.9",
-      "kavlan-18": "10.35.197.9",
-      "kavlan-19": "10.39.197.9",
-      "kavlan-2": "192.168.212.9",
-      "kavlan-20": "10.43.197.9",
-      "kavlan-21": "10.47.197.9",
-      "kavlan-3": "192.168.228.9",
-      "kavlan-4": "10.8.1.9",
-      "kavlan-5": "10.8.65.9",
-      "kavlan-6": "10.8.129.9",
-      "kavlan-7": "10.8.193.9",
-      "kavlan-8": "10.9.1.9",
-      "kavlan-9": "10.9.65.9"
+      "kavlan-1": "192.168.192.9",
+      "kavlan-11": "10.7.196.9",
+      "kavlan-12": "10.11.196.9",
+      "kavlan-13": "10.15.196.9",
+      "kavlan-14": "10.19.196.9",
+      "kavlan-16": "10.27.196.9",
+      "kavlan-18": "10.35.196.9",
+      "kavlan-19": "10.39.196.9",
+      "kavlan-2": "192.168.208.9",
+      "kavlan-20": "10.43.196.9",
+      "kavlan-21": "10.47.196.9",
+      "kavlan-3": "192.168.224.9",
+      "kavlan-4": "10.8.0.9",
+      "kavlan-5": "10.8.64.9",
+      "kavlan-6": "10.8.128.9",
+      "kavlan-7": "10.8.192.9",
+      "kavlan-8": "10.9.0.9",
+      "kavlan-9": "10.9.64.9"
     },
     "eth1": {
-      "kavlan-1": "192.168.195.29",
-      "kavlan-11": "10.7.197.24",
-      "kavlan-12": "10.11.197.24",
-      "kavlan-13": "10.15.197.24",
-      "kavlan-14": "10.19.197.24",
-      "kavlan-16": "10.27.197.24",
-      "kavlan-18": "10.35.197.24",
-      "kavlan-19": "10.39.197.24",
-      "kavlan-2": "192.168.212.29",
-      "kavlan-20": "10.43.197.24",
-      "kavlan-21": "10.47.197.24",
-      "kavlan-3": "192.168.228.29",
-      "kavlan-4": "10.8.1.29",
-      "kavlan-5": "10.8.65.29",
-      "kavlan-6": "10.8.129.29",
-      "kavlan-7": "10.8.193.29",
-      "kavlan-8": "10.9.1.29",
-      "kavlan-9": "10.9.65.29"
+      "kavlan-1": "192.168.192.24",
+      "kavlan-11": "10.7.196.24",
+      "kavlan-12": "10.11.196.24",
+      "kavlan-13": "10.15.196.24",
+      "kavlan-14": "10.19.196.24",
+      "kavlan-16": "10.27.196.24",
+      "kavlan-18": "10.35.196.24",
+      "kavlan-19": "10.39.196.24",
+      "kavlan-2": "192.168.208.24",
+      "kavlan-20": "10.43.196.24",
+      "kavlan-21": "10.47.196.24",
+      "kavlan-3": "192.168.224.24",
+      "kavlan-4": "10.8.0.24",
+      "kavlan-5": "10.8.64.24",
+      "kavlan-6": "10.8.128.24",
+      "kavlan-7": "10.8.192.24",
+      "kavlan-8": "10.9.0.24",
+      "kavlan-9": "10.9.64.24"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
index 1aadf84c8352b6550363da7429b7160991fdd209..1de62df9ede8f4524eb0f627e205bdc3feb471f3 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.1",
-      "kavlan-11": "10.7.197.21",
-      "kavlan-12": "10.11.197.21",
-      "kavlan-13": "10.15.197.21",
-      "kavlan-14": "10.19.197.21",
-      "kavlan-16": "10.27.197.21",
-      "kavlan-18": "10.35.197.21",
-      "kavlan-19": "10.39.197.21",
-      "kavlan-2": "192.168.213.1",
-      "kavlan-20": "10.43.197.21",
-      "kavlan-21": "10.47.197.21",
-      "kavlan-3": "192.168.229.1",
-      "kavlan-4": "10.8.2.1",
-      "kavlan-5": "10.8.66.1",
-      "kavlan-6": "10.8.130.1",
-      "kavlan-7": "10.8.194.1",
-      "kavlan-8": "10.9.2.1",
-      "kavlan-9": "10.9.66.1"
+      "kavlan-1": "192.168.193.1",
+      "kavlan-11": "10.7.196.31",
+      "kavlan-12": "10.11.196.31",
+      "kavlan-13": "10.15.196.31",
+      "kavlan-14": "10.19.196.31",
+      "kavlan-16": "10.27.196.31",
+      "kavlan-18": "10.35.196.31",
+      "kavlan-19": "10.39.196.31",
+      "kavlan-2": "192.168.209.1",
+      "kavlan-20": "10.43.196.31",
+      "kavlan-21": "10.47.196.31",
+      "kavlan-3": "192.168.225.1",
+      "kavlan-4": "10.8.1.1",
+      "kavlan-5": "10.8.65.1",
+      "kavlan-6": "10.8.129.1",
+      "kavlan-7": "10.8.193.1",
+      "kavlan-8": "10.9.1.1",
+      "kavlan-9": "10.9.65.1"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.11",
-      "kavlan-11": "10.7.197.32",
-      "kavlan-12": "10.11.197.32",
-      "kavlan-13": "10.15.197.32",
-      "kavlan-14": "10.19.197.32",
-      "kavlan-16": "10.27.197.32",
-      "kavlan-18": "10.35.197.32",
-      "kavlan-19": "10.39.197.32",
-      "kavlan-2": "192.168.213.11",
-      "kavlan-20": "10.43.197.32",
-      "kavlan-21": "10.47.197.32",
-      "kavlan-3": "192.168.229.11",
-      "kavlan-4": "10.8.2.11",
-      "kavlan-5": "10.8.66.11",
-      "kavlan-6": "10.8.130.11",
-      "kavlan-7": "10.8.194.11",
-      "kavlan-8": "10.9.2.11",
-      "kavlan-9": "10.9.66.11"
+      "kavlan-1": "192.168.193.9",
+      "kavlan-11": "10.7.196.39",
+      "kavlan-12": "10.11.196.39",
+      "kavlan-13": "10.15.196.39",
+      "kavlan-14": "10.19.196.39",
+      "kavlan-16": "10.27.196.39",
+      "kavlan-18": "10.35.196.39",
+      "kavlan-19": "10.39.196.39",
+      "kavlan-2": "192.168.209.9",
+      "kavlan-20": "10.43.196.39",
+      "kavlan-21": "10.47.196.39",
+      "kavlan-3": "192.168.225.9",
+      "kavlan-4": "10.8.1.9",
+      "kavlan-5": "10.8.65.9",
+      "kavlan-6": "10.8.129.9",
+      "kavlan-7": "10.8.193.9",
+      "kavlan-8": "10.9.1.9",
+      "kavlan-9": "10.9.65.9"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
index e3d1dba2956e71edde89e3855d8727e9397aa194..19de8e221c93edc82677ba61b39c7943a030c5e8 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.2",
-      "kavlan-11": "10.7.197.22",
-      "kavlan-12": "10.11.197.22",
-      "kavlan-13": "10.15.197.22",
-      "kavlan-14": "10.19.197.22",
-      "kavlan-16": "10.27.197.22",
-      "kavlan-18": "10.35.197.22",
-      "kavlan-19": "10.39.197.22",
-      "kavlan-2": "192.168.213.2",
-      "kavlan-20": "10.43.197.22",
-      "kavlan-21": "10.47.197.22",
-      "kavlan-3": "192.168.229.2",
-      "kavlan-4": "10.8.2.2",
-      "kavlan-5": "10.8.66.2",
-      "kavlan-6": "10.8.130.2",
-      "kavlan-7": "10.8.194.2",
-      "kavlan-8": "10.9.2.2",
-      "kavlan-9": "10.9.66.2"
+      "kavlan-1": "192.168.193.2",
+      "kavlan-11": "10.7.196.32",
+      "kavlan-12": "10.11.196.32",
+      "kavlan-13": "10.15.196.32",
+      "kavlan-14": "10.19.196.32",
+      "kavlan-16": "10.27.196.32",
+      "kavlan-18": "10.35.196.32",
+      "kavlan-19": "10.39.196.32",
+      "kavlan-2": "192.168.209.2",
+      "kavlan-20": "10.43.196.32",
+      "kavlan-21": "10.47.196.32",
+      "kavlan-3": "192.168.225.2",
+      "kavlan-4": "10.8.1.2",
+      "kavlan-5": "10.8.65.2",
+      "kavlan-6": "10.8.129.2",
+      "kavlan-7": "10.8.193.2",
+      "kavlan-8": "10.9.1.2",
+      "kavlan-9": "10.9.65.2"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.12",
-      "kavlan-11": "10.7.197.33",
-      "kavlan-12": "10.11.197.33",
-      "kavlan-13": "10.15.197.33",
-      "kavlan-14": "10.19.197.33",
-      "kavlan-16": "10.27.197.33",
-      "kavlan-18": "10.35.197.33",
-      "kavlan-19": "10.39.197.33",
-      "kavlan-2": "192.168.213.12",
-      "kavlan-20": "10.43.197.33",
-      "kavlan-21": "10.47.197.33",
-      "kavlan-3": "192.168.229.12",
-      "kavlan-4": "10.8.2.12",
-      "kavlan-5": "10.8.66.12",
-      "kavlan-6": "10.8.130.12",
-      "kavlan-7": "10.8.194.12",
-      "kavlan-8": "10.9.2.12",
-      "kavlan-9": "10.9.66.12"
+      "kavlan-1": "192.168.193.10",
+      "kavlan-11": "10.7.196.40",
+      "kavlan-12": "10.11.196.40",
+      "kavlan-13": "10.15.196.40",
+      "kavlan-14": "10.19.196.40",
+      "kavlan-16": "10.27.196.40",
+      "kavlan-18": "10.35.196.40",
+      "kavlan-19": "10.39.196.40",
+      "kavlan-2": "192.168.209.10",
+      "kavlan-20": "10.43.196.40",
+      "kavlan-21": "10.47.196.40",
+      "kavlan-3": "192.168.225.10",
+      "kavlan-4": "10.8.1.10",
+      "kavlan-5": "10.8.65.10",
+      "kavlan-6": "10.8.129.10",
+      "kavlan-7": "10.8.193.10",
+      "kavlan-8": "10.9.1.10",
+      "kavlan-9": "10.9.65.10"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
index f837a18049cf6c993fa817bd86b99a087c510454..5d13eb4244449159a45088662fe65040c408a5c8 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.3",
-      "kavlan-11": "10.7.197.23",
-      "kavlan-12": "10.11.197.23",
-      "kavlan-13": "10.15.197.23",
-      "kavlan-14": "10.19.197.23",
-      "kavlan-16": "10.27.197.23",
-      "kavlan-18": "10.35.197.23",
-      "kavlan-19": "10.39.197.23",
-      "kavlan-2": "192.168.213.3",
-      "kavlan-20": "10.43.197.23",
-      "kavlan-21": "10.47.197.23",
-      "kavlan-3": "192.168.229.3",
-      "kavlan-4": "10.8.2.3",
-      "kavlan-5": "10.8.66.3",
-      "kavlan-6": "10.8.130.3",
-      "kavlan-7": "10.8.194.3",
-      "kavlan-8": "10.9.2.3",
-      "kavlan-9": "10.9.66.3"
+      "kavlan-1": "192.168.193.3",
+      "kavlan-11": "10.7.196.33",
+      "kavlan-12": "10.11.196.33",
+      "kavlan-13": "10.15.196.33",
+      "kavlan-14": "10.19.196.33",
+      "kavlan-16": "10.27.196.33",
+      "kavlan-18": "10.35.196.33",
+      "kavlan-19": "10.39.196.33",
+      "kavlan-2": "192.168.209.3",
+      "kavlan-20": "10.43.196.33",
+      "kavlan-21": "10.47.196.33",
+      "kavlan-3": "192.168.225.3",
+      "kavlan-4": "10.8.1.3",
+      "kavlan-5": "10.8.65.3",
+      "kavlan-6": "10.8.129.3",
+      "kavlan-7": "10.8.193.3",
+      "kavlan-8": "10.9.1.3",
+      "kavlan-9": "10.9.65.3"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.13",
-      "kavlan-11": "10.7.197.34",
-      "kavlan-12": "10.11.197.34",
-      "kavlan-13": "10.15.197.34",
-      "kavlan-14": "10.19.197.34",
-      "kavlan-16": "10.27.197.34",
-      "kavlan-18": "10.35.197.34",
-      "kavlan-19": "10.39.197.34",
-      "kavlan-2": "192.168.213.13",
-      "kavlan-20": "10.43.197.34",
-      "kavlan-21": "10.47.197.34",
-      "kavlan-3": "192.168.229.13",
-      "kavlan-4": "10.8.2.13",
-      "kavlan-5": "10.8.66.13",
-      "kavlan-6": "10.8.130.13",
-      "kavlan-7": "10.8.194.13",
-      "kavlan-8": "10.9.2.13",
-      "kavlan-9": "10.9.66.13"
+      "kavlan-1": "192.168.193.11",
+      "kavlan-11": "10.7.196.41",
+      "kavlan-12": "10.11.196.41",
+      "kavlan-13": "10.15.196.41",
+      "kavlan-14": "10.19.196.41",
+      "kavlan-16": "10.27.196.41",
+      "kavlan-18": "10.35.196.41",
+      "kavlan-19": "10.39.196.41",
+      "kavlan-2": "192.168.209.11",
+      "kavlan-20": "10.43.196.41",
+      "kavlan-21": "10.47.196.41",
+      "kavlan-3": "192.168.225.11",
+      "kavlan-4": "10.8.1.11",
+      "kavlan-5": "10.8.65.11",
+      "kavlan-6": "10.8.129.11",
+      "kavlan-7": "10.8.193.11",
+      "kavlan-8": "10.9.1.11",
+      "kavlan-9": "10.9.65.11"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
index 1164e859ca2a7c337bdb2b112cc25fc4076a9574..0be6ecc759345bbf7535fe3842aaecdc886f31bc 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.4",
-      "kavlan-11": "10.7.197.24",
-      "kavlan-12": "10.11.197.24",
-      "kavlan-13": "10.15.197.24",
-      "kavlan-14": "10.19.197.24",
-      "kavlan-16": "10.27.197.24",
-      "kavlan-18": "10.35.197.24",
-      "kavlan-19": "10.39.197.24",
-      "kavlan-2": "192.168.213.4",
-      "kavlan-20": "10.43.197.24",
-      "kavlan-21": "10.47.197.24",
-      "kavlan-3": "192.168.229.4",
-      "kavlan-4": "10.8.2.4",
-      "kavlan-5": "10.8.66.4",
-      "kavlan-6": "10.8.130.4",
-      "kavlan-7": "10.8.194.4",
-      "kavlan-8": "10.9.2.4",
-      "kavlan-9": "10.9.66.4"
+      "kavlan-1": "192.168.193.4",
+      "kavlan-11": "10.7.196.34",
+      "kavlan-12": "10.11.196.34",
+      "kavlan-13": "10.15.196.34",
+      "kavlan-14": "10.19.196.34",
+      "kavlan-16": "10.27.196.34",
+      "kavlan-18": "10.35.196.34",
+      "kavlan-19": "10.39.196.34",
+      "kavlan-2": "192.168.209.4",
+      "kavlan-20": "10.43.196.34",
+      "kavlan-21": "10.47.196.34",
+      "kavlan-3": "192.168.225.4",
+      "kavlan-4": "10.8.1.4",
+      "kavlan-5": "10.8.65.4",
+      "kavlan-6": "10.8.129.4",
+      "kavlan-7": "10.8.193.4",
+      "kavlan-8": "10.9.1.4",
+      "kavlan-9": "10.9.65.4"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.14",
-      "kavlan-11": "10.7.197.35",
-      "kavlan-12": "10.11.197.35",
-      "kavlan-13": "10.15.197.35",
-      "kavlan-14": "10.19.197.35",
-      "kavlan-16": "10.27.197.35",
-      "kavlan-18": "10.35.197.35",
-      "kavlan-19": "10.39.197.35",
-      "kavlan-2": "192.168.213.14",
-      "kavlan-20": "10.43.197.35",
-      "kavlan-21": "10.47.197.35",
-      "kavlan-3": "192.168.229.14",
-      "kavlan-4": "10.8.2.14",
-      "kavlan-5": "10.8.66.14",
-      "kavlan-6": "10.8.130.14",
-      "kavlan-7": "10.8.194.14",
-      "kavlan-8": "10.9.2.14",
-      "kavlan-9": "10.9.66.14"
+      "kavlan-1": "192.168.193.12",
+      "kavlan-11": "10.7.196.42",
+      "kavlan-12": "10.11.196.42",
+      "kavlan-13": "10.15.196.42",
+      "kavlan-14": "10.19.196.42",
+      "kavlan-16": "10.27.196.42",
+      "kavlan-18": "10.35.196.42",
+      "kavlan-19": "10.39.196.42",
+      "kavlan-2": "192.168.209.12",
+      "kavlan-20": "10.43.196.42",
+      "kavlan-21": "10.47.196.42",
+      "kavlan-3": "192.168.225.12",
+      "kavlan-4": "10.8.1.12",
+      "kavlan-5": "10.8.65.12",
+      "kavlan-6": "10.8.129.12",
+      "kavlan-7": "10.8.193.12",
+      "kavlan-8": "10.9.1.12",
+      "kavlan-9": "10.9.65.12"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
index d4c3dee85a46c1373be0414a57c80424795d7b5c..a7be1451a9173403ed40221d5e1442edbea58233 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.5",
-      "kavlan-11": "10.7.197.25",
-      "kavlan-12": "10.11.197.25",
-      "kavlan-13": "10.15.197.25",
-      "kavlan-14": "10.19.197.25",
-      "kavlan-16": "10.27.197.25",
-      "kavlan-18": "10.35.197.25",
-      "kavlan-19": "10.39.197.25",
-      "kavlan-2": "192.168.213.5",
-      "kavlan-20": "10.43.197.25",
-      "kavlan-21": "10.47.197.25",
-      "kavlan-3": "192.168.229.5",
-      "kavlan-4": "10.8.2.5",
-      "kavlan-5": "10.8.66.5",
-      "kavlan-6": "10.8.130.5",
-      "kavlan-7": "10.8.194.5",
-      "kavlan-8": "10.9.2.5",
-      "kavlan-9": "10.9.66.5"
+      "kavlan-1": "192.168.193.5",
+      "kavlan-11": "10.7.196.35",
+      "kavlan-12": "10.11.196.35",
+      "kavlan-13": "10.15.196.35",
+      "kavlan-14": "10.19.196.35",
+      "kavlan-16": "10.27.196.35",
+      "kavlan-18": "10.35.196.35",
+      "kavlan-19": "10.39.196.35",
+      "kavlan-2": "192.168.209.5",
+      "kavlan-20": "10.43.196.35",
+      "kavlan-21": "10.47.196.35",
+      "kavlan-3": "192.168.225.5",
+      "kavlan-4": "10.8.1.5",
+      "kavlan-5": "10.8.65.5",
+      "kavlan-6": "10.8.129.5",
+      "kavlan-7": "10.8.193.5",
+      "kavlan-8": "10.9.1.5",
+      "kavlan-9": "10.9.65.5"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.15",
-      "kavlan-11": "10.7.197.36",
-      "kavlan-12": "10.11.197.36",
-      "kavlan-13": "10.15.197.36",
-      "kavlan-14": "10.19.197.36",
-      "kavlan-16": "10.27.197.36",
-      "kavlan-18": "10.35.197.36",
-      "kavlan-19": "10.39.197.36",
-      "kavlan-2": "192.168.213.15",
-      "kavlan-20": "10.43.197.36",
-      "kavlan-21": "10.47.197.36",
-      "kavlan-3": "192.168.229.15",
-      "kavlan-4": "10.8.2.15",
-      "kavlan-5": "10.8.66.15",
-      "kavlan-6": "10.8.130.15",
-      "kavlan-7": "10.8.194.15",
-      "kavlan-8": "10.9.2.15",
-      "kavlan-9": "10.9.66.15"
+      "kavlan-1": "192.168.193.13",
+      "kavlan-11": "10.7.196.43",
+      "kavlan-12": "10.11.196.43",
+      "kavlan-13": "10.15.196.43",
+      "kavlan-14": "10.19.196.43",
+      "kavlan-16": "10.27.196.43",
+      "kavlan-18": "10.35.196.43",
+      "kavlan-19": "10.39.196.43",
+      "kavlan-2": "192.168.209.13",
+      "kavlan-20": "10.43.196.43",
+      "kavlan-21": "10.47.196.43",
+      "kavlan-3": "192.168.225.13",
+      "kavlan-4": "10.8.1.13",
+      "kavlan-5": "10.8.65.13",
+      "kavlan-6": "10.8.129.13",
+      "kavlan-7": "10.8.193.13",
+      "kavlan-8": "10.9.1.13",
+      "kavlan-9": "10.9.65.13"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
index b718a924ad76072337705855df24eee28adef206..51c261e82604b74c03d2f6c94b0632541b59e073 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.6",
-      "kavlan-11": "10.7.197.26",
-      "kavlan-12": "10.11.197.26",
-      "kavlan-13": "10.15.197.26",
-      "kavlan-14": "10.19.197.26",
-      "kavlan-16": "10.27.197.26",
-      "kavlan-18": "10.35.197.26",
-      "kavlan-19": "10.39.197.26",
-      "kavlan-2": "192.168.213.6",
-      "kavlan-20": "10.43.197.26",
-      "kavlan-21": "10.47.197.26",
-      "kavlan-3": "192.168.229.6",
-      "kavlan-4": "10.8.2.6",
-      "kavlan-5": "10.8.66.6",
-      "kavlan-6": "10.8.130.6",
-      "kavlan-7": "10.8.194.6",
-      "kavlan-8": "10.9.2.6",
-      "kavlan-9": "10.9.66.6"
+      "kavlan-1": "192.168.193.6",
+      "kavlan-11": "10.7.196.36",
+      "kavlan-12": "10.11.196.36",
+      "kavlan-13": "10.15.196.36",
+      "kavlan-14": "10.19.196.36",
+      "kavlan-16": "10.27.196.36",
+      "kavlan-18": "10.35.196.36",
+      "kavlan-19": "10.39.196.36",
+      "kavlan-2": "192.168.209.6",
+      "kavlan-20": "10.43.196.36",
+      "kavlan-21": "10.47.196.36",
+      "kavlan-3": "192.168.225.6",
+      "kavlan-4": "10.8.1.6",
+      "kavlan-5": "10.8.65.6",
+      "kavlan-6": "10.8.129.6",
+      "kavlan-7": "10.8.193.6",
+      "kavlan-8": "10.9.1.6",
+      "kavlan-9": "10.9.65.6"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.16",
-      "kavlan-11": "10.7.197.37",
-      "kavlan-12": "10.11.197.37",
-      "kavlan-13": "10.15.197.37",
-      "kavlan-14": "10.19.197.37",
-      "kavlan-16": "10.27.197.37",
-      "kavlan-18": "10.35.197.37",
-      "kavlan-19": "10.39.197.37",
-      "kavlan-2": "192.168.213.16",
-      "kavlan-20": "10.43.197.37",
-      "kavlan-21": "10.47.197.37",
-      "kavlan-3": "192.168.229.16",
-      "kavlan-4": "10.8.2.16",
-      "kavlan-5": "10.8.66.16",
-      "kavlan-6": "10.8.130.16",
-      "kavlan-7": "10.8.194.16",
-      "kavlan-8": "10.9.2.16",
-      "kavlan-9": "10.9.66.16"
+      "kavlan-1": "192.168.193.14",
+      "kavlan-11": "10.7.196.44",
+      "kavlan-12": "10.11.196.44",
+      "kavlan-13": "10.15.196.44",
+      "kavlan-14": "10.19.196.44",
+      "kavlan-16": "10.27.196.44",
+      "kavlan-18": "10.35.196.44",
+      "kavlan-19": "10.39.196.44",
+      "kavlan-2": "192.168.209.14",
+      "kavlan-20": "10.43.196.44",
+      "kavlan-21": "10.47.196.44",
+      "kavlan-3": "192.168.225.14",
+      "kavlan-4": "10.8.1.14",
+      "kavlan-5": "10.8.65.14",
+      "kavlan-6": "10.8.129.14",
+      "kavlan-7": "10.8.193.14",
+      "kavlan-8": "10.9.1.14",
+      "kavlan-9": "10.9.65.14"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
index 18429613bf706b8a7af2371602ff24eedb3cf705..fb77e97e6bd02ad16a894a5aa0afea33d7e05035 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.7",
-      "kavlan-11": "10.7.197.27",
-      "kavlan-12": "10.11.197.27",
-      "kavlan-13": "10.15.197.27",
-      "kavlan-14": "10.19.197.27",
-      "kavlan-16": "10.27.197.27",
-      "kavlan-18": "10.35.197.27",
-      "kavlan-19": "10.39.197.27",
-      "kavlan-2": "192.168.213.7",
-      "kavlan-20": "10.43.197.27",
-      "kavlan-21": "10.47.197.27",
-      "kavlan-3": "192.168.229.7",
-      "kavlan-4": "10.8.2.7",
-      "kavlan-5": "10.8.66.7",
-      "kavlan-6": "10.8.130.7",
-      "kavlan-7": "10.8.194.7",
-      "kavlan-8": "10.9.2.7",
-      "kavlan-9": "10.9.66.7"
+      "kavlan-1": "192.168.193.7",
+      "kavlan-11": "10.7.196.37",
+      "kavlan-12": "10.11.196.37",
+      "kavlan-13": "10.15.196.37",
+      "kavlan-14": "10.19.196.37",
+      "kavlan-16": "10.27.196.37",
+      "kavlan-18": "10.35.196.37",
+      "kavlan-19": "10.39.196.37",
+      "kavlan-2": "192.168.209.7",
+      "kavlan-20": "10.43.196.37",
+      "kavlan-21": "10.47.196.37",
+      "kavlan-3": "192.168.225.7",
+      "kavlan-4": "10.8.1.7",
+      "kavlan-5": "10.8.65.7",
+      "kavlan-6": "10.8.129.7",
+      "kavlan-7": "10.8.193.7",
+      "kavlan-8": "10.9.1.7",
+      "kavlan-9": "10.9.65.7"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.17",
-      "kavlan-11": "10.7.197.38",
-      "kavlan-12": "10.11.197.38",
-      "kavlan-13": "10.15.197.38",
-      "kavlan-14": "10.19.197.38",
-      "kavlan-16": "10.27.197.38",
-      "kavlan-18": "10.35.197.38",
-      "kavlan-19": "10.39.197.38",
-      "kavlan-2": "192.168.213.17",
-      "kavlan-20": "10.43.197.38",
-      "kavlan-21": "10.47.197.38",
-      "kavlan-3": "192.168.229.17",
-      "kavlan-4": "10.8.2.17",
-      "kavlan-5": "10.8.66.17",
-      "kavlan-6": "10.8.130.17",
-      "kavlan-7": "10.8.194.17",
-      "kavlan-8": "10.9.2.17",
-      "kavlan-9": "10.9.66.17"
+      "kavlan-1": "192.168.193.15",
+      "kavlan-11": "10.7.196.45",
+      "kavlan-12": "10.11.196.45",
+      "kavlan-13": "10.15.196.45",
+      "kavlan-14": "10.19.196.45",
+      "kavlan-16": "10.27.196.45",
+      "kavlan-18": "10.35.196.45",
+      "kavlan-19": "10.39.196.45",
+      "kavlan-2": "192.168.209.15",
+      "kavlan-20": "10.43.196.45",
+      "kavlan-21": "10.47.196.45",
+      "kavlan-3": "192.168.225.15",
+      "kavlan-4": "10.8.1.15",
+      "kavlan-5": "10.8.65.15",
+      "kavlan-6": "10.8.129.15",
+      "kavlan-7": "10.8.193.15",
+      "kavlan-8": "10.9.1.15",
+      "kavlan-9": "10.9.65.15"
     }
   },
   "main_memory": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
index 2ba1bfedae5358e9c39ac3241030dd0235a7a6fd..2112553221403ec9e534eb2cf0c6a286813fe470 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
@@ -24,44 +24,44 @@
   },
   "kavlan": {
     "eth0": {
-      "kavlan-1": "192.168.196.8",
-      "kavlan-11": "10.7.197.28",
-      "kavlan-12": "10.11.197.28",
-      "kavlan-13": "10.15.197.28",
-      "kavlan-14": "10.19.197.28",
-      "kavlan-16": "10.27.197.28",
-      "kavlan-18": "10.35.197.28",
-      "kavlan-19": "10.39.197.28",
-      "kavlan-2": "192.168.213.8",
-      "kavlan-20": "10.43.197.28",
-      "kavlan-21": "10.47.197.28",
-      "kavlan-3": "192.168.229.8",
-      "kavlan-4": "10.8.2.8",
-      "kavlan-5": "10.8.66.8",
-      "kavlan-6": "10.8.130.8",
-      "kavlan-7": "10.8.194.8",
-      "kavlan-8": "10.9.2.8",
-      "kavlan-9": "10.9.66.8"
+      "kavlan-1": "192.168.193.8",
+      "kavlan-11": "10.7.196.38",
+      "kavlan-12": "10.11.196.38",
+      "kavlan-13": "10.15.196.38",
+      "kavlan-14": "10.19.196.38",
+      "kavlan-16": "10.27.196.38",
+      "kavlan-18": "10.35.196.38",
+      "kavlan-19": "10.39.196.38",
+      "kavlan-2": "192.168.209.8",
+      "kavlan-20": "10.43.196.38",
+      "kavlan-21": "10.47.196.38",
+      "kavlan-3": "192.168.225.8",
+      "kavlan-4": "10.8.1.8",
+      "kavlan-5": "10.8.65.8",
+      "kavlan-6": "10.8.129.8",
+      "kavlan-7": "10.8.193.8",
+      "kavlan-8": "10.9.1.8",
+      "kavlan-9": "10.9.65.8"
     },
     "eth1": {
-      "kavlan-1": "192.168.196.18",
-      "kavlan-11": "10.7.197.39",
-      "kavlan-12": "10.11.197.39",
-      "kavlan-13": "10.15.197.39",
-      "kavlan-14": "10.19.197.39",
-      "kavlan-16": "10.27.197.39",
-      "kavlan-18": "10.35.197.39",
-      "kavlan-19": "10.39.197.39",
-      "kavlan-2": "192.168.213.18",
-      "kavlan-20": "10.43.197.39",
-      "kavlan-21": "10.47.197.39",
-      "kavlan-3": "192.168.229.18",
-      "kavlan-4": "10.8.2.18",
-      "kavlan-5": "10.8.66.18",
-      "kavlan-6": "10.8.130.18",
-      "kavlan-7": "10.8.194.18",
-      "kavlan-8": "10.9.2.18",
-      "kavlan-9": "10.9.66.18"
+      "kavlan-1": "192.168.193.16",
+      "kavlan-11": "10.7.196.46",
+      "kavlan-12": "10.11.196.46",
+      "kavlan-13": "10.15.196.46",
+      "kavlan-14": "10.19.196.46",
+      "kavlan-16": "10.27.196.46",
+      "kavlan-18": "10.35.196.46",
+      "kavlan-19": "10.39.196.46",
+      "kavlan-2": "192.168.209.16",
+      "kavlan-20": "10.43.196.46",
+      "kavlan-21": "10.47.196.46",
+      "kavlan-3": "192.168.225.16",
+      "kavlan-4": "10.8.1.16",
+      "kavlan-5": "10.8.65.16",
+      "kavlan-6": "10.8.129.16",
+      "kavlan-7": "10.8.193.16",
+      "kavlan-8": "10.9.1.16",
+      "kavlan-9": "10.9.65.16"
     }
   },
   "main_memory": {
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi_ip.yaml.erb b/input/grid5000/sites/lille/clusters/chetemi/chetemi_ip.yaml.erb
index ac66d6617e7c1de8882e1b08f79a96b21d32fcc3..a3705d3315097ec644a4c323e0235c5992c6f180 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi_ip.yaml.erb
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi_ip.yaml.erb
@@ -44,43 +44,42 @@ nodes:
 
     kavlan:
       eth0:
-        kavlan-1: 192.168.195.<%= i %>
-        kavlan-2: 192.168.212.<%= i %>
-        kavlan-3: 192.168.228.<%= i %>
-        kavlan-4: 10.8.1.<%= i %>
-        kavlan-5: 10.8.65.<%= i %>
-        kavlan-6: 10.8.129.<%= i %>
-        kavlan-7: 10.8.193.<%= i %>
-        kavlan-8: 10.9.1.<%= i %>
-        kavlan-9: 10.9.65.<%= i %>
-        kavlan-11: 10.7.197.<%=  i %>
-        kavlan-12: 10.11.197.<%= i %>
-        kavlan-13: 10.15.197.<%= i %>
-        kavlan-14: 10.19.197.<%= i %>
-        kavlan-16: 10.27.197.<%= i %>
-        kavlan-18: 10.35.197.<%= i %>
-        kavlan-19: 10.39.197.<%= i %>
-        kavlan-20: 10.43.197.<%= i %>
-        kavlan-21: 10.47.197.<%= i %>
+        kavlan-1: 192.168.192.<%= i %>
+        kavlan-2: 192.168.208.<%= i %>
+        kavlan-3: 192.168.224.<%= i %>
+        kavlan-4: 10.8.0.<%= i %>
+        kavlan-5: 10.8.64.<%= i %>
+        kavlan-6: 10.8.128.<%= i %>
+        kavlan-7: 10.8.192.<%= i %>
+        kavlan-8: 10.9.0.<%= i %>
+        kavlan-9: 10.9.64.<%= i %>
+        kavlan-11: 10.7.196.<%=  i %>
+        kavlan-12: 10.11.196.<%= i %>
+        kavlan-13: 10.15.196.<%= i %>
+        kavlan-14: 10.19.196.<%= i %>
+        kavlan-16: 10.27.196.<%= i %>
+        kavlan-18: 10.35.196.<%= i %>
+        kavlan-19: 10.39.196.<%= i %>
+        kavlan-20: 10.43.196.<%= i %>
+        kavlan-21: 10.47.196.<%= i %>
       eth1:
-<% i20 = i+20 %>
-        kavlan-1: 192.168.195.<%= i20 %>
-        kavlan-2: 192.168.212.<%= i20 %>
-        kavlan-3: 192.168.228.<%= i20 %>
-        kavlan-4: 10.8.1.<%= i20 %>
-        kavlan-5: 10.8.65.<%= i20 %>
-        kavlan-6: 10.8.129.<%= i20 %>
-        kavlan-7: 10.8.193.<%= i20 %>
-        kavlan-8: 10.9.1.<%= i20 %>
-        kavlan-9: 10.9.65.<%= i20 %>
 <% i16_30 = i+15 %>
-        kavlan-11: 10.7.197.<%=  i16_30 %>
-        kavlan-12: 10.11.197.<%= i16_30 %>
-        kavlan-13: 10.15.197.<%= i16_30 %>
-        kavlan-14: 10.19.197.<%= i16_30 %>
-        kavlan-16: 10.27.197.<%= i16_30 %>
-        kavlan-18: 10.35.197.<%= i16_30 %>
-        kavlan-19: 10.39.197.<%= i16_30 %>
-        kavlan-20: 10.43.197.<%= i16_30 %>
-        kavlan-21: 10.47.197.<%= i16_30 %>
+        kavlan-1: 192.168.192.<%= i16_30 %>
+        kavlan-2: 192.168.208.<%= i16_30 %>
+        kavlan-3: 192.168.224.<%= i16_30 %>
+        kavlan-4: 10.8.0.<%= i16_30 %>
+        kavlan-5: 10.8.64.<%= i16_30 %>
+        kavlan-6: 10.8.128.<%= i16_30 %>
+        kavlan-7: 10.8.192.<%= i16_30 %>
+        kavlan-8: 10.9.0.<%= i16_30 %>
+        kavlan-9: 10.9.64.<%= i16_30 %>
+        kavlan-11: 10.7.196.<%=  i16_30 %>
+        kavlan-12: 10.11.196.<%= i16_30 %>
+        kavlan-13: 10.15.196.<%= i16_30 %>
+        kavlan-14: 10.19.196.<%= i16_30 %>
+        kavlan-16: 10.27.196.<%= i16_30 %>
+        kavlan-18: 10.35.196.<%= i16_30 %>
+        kavlan-19: 10.39.196.<%= i16_30 %>
+        kavlan-20: 10.43.196.<%= i16_30 %>
+        kavlan-21: 10.47.196.<%= i16_30 %>
 <% } %>
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet_ip.yaml.erb b/input/grid5000/sites/lille/clusters/chifflet/chifflet_ip.yaml.erb
index 24a7dea82fa20f2627874574891b9bf40e0b8133..7c9d20ce0c464e17d2102e3b120651ec9ca8d2ae 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet_ip.yaml.erb
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet_ip.yaml.erb
@@ -30,44 +30,44 @@ nodes:
 
     kavlan:
       eth0:
-<% i20 = i+20 %>
-        kavlan-1: 192.168.196.<%= i %>
-        kavlan-2: 192.168.213.<%= i %>
-        kavlan-3: 192.168.229.<%= i %>
-        kavlan-4: 10.8.2.<%= i %>
-        kavlan-5: 10.8.66.<%= i %>
-        kavlan-6: 10.8.130.<%= i %>
-        kavlan-7: 10.8.194.<%= i %>
-        kavlan-8: 10.9.2.<%= i %>
-        kavlan-9: 10.9.66.<%= i %>
-        kavlan-11: 10.7.197.<%=  i20 %>
-        kavlan-12: 10.11.197.<%= i20 %>
-        kavlan-13: 10.15.197.<%= i20 %>
-        kavlan-14: 10.19.197.<%= i20 %>
-        kavlan-16: 10.27.197.<%= i20 %>
-        kavlan-18: 10.35.197.<%= i20 %>
-        kavlan-19: 10.39.197.<%= i20 %>
-        kavlan-20: 10.43.197.<%= i20 %>
-        kavlan-21: 10.47.197.<%= i20 %>
+        kavlan-1: 192.168.193.<%= i %>
+        kavlan-2: 192.168.209.<%= i %>
+        kavlan-3: 192.168.225.<%= i %>
+        kavlan-4: 10.8.1.<%= i %>
+        kavlan-5: 10.8.65.<%= i %>
+        kavlan-6: 10.8.129.<%= i %>
+        kavlan-7: 10.8.193.<%= i %>
+        kavlan-8: 10.9.1.<%= i %>
+        kavlan-9: 10.9.65.<%= i %>
+<% i31_38 = i+30 %>
+        kavlan-11: 10.7.196.<%=  i31_38 %>
+        kavlan-12: 10.11.196.<%= i31_38 %>
+        kavlan-13: 10.15.196.<%= i31_38 %>
+        kavlan-14: 10.19.196.<%= i31_38 %>
+        kavlan-16: 10.27.196.<%= i31_38 %>
+        kavlan-18: 10.35.196.<%= i31_38 %>
+        kavlan-19: 10.39.196.<%= i31_38 %>
+        kavlan-20: 10.43.196.<%= i31_38 %>
+        kavlan-21: 10.47.196.<%= i31_38 %>
       eth1:
-<% i10 = i+10 %>
-        kavlan-1: 192.168.196.<%= i10 %>
-        kavlan-2: 192.168.213.<%= i10 %>
-        kavlan-3: 192.168.229.<%= i10 %>
-        kavlan-4: 10.8.2.<%= i10 %>
-        kavlan-5: 10.8.66.<%= i10 %>
-        kavlan-6: 10.8.130.<%= i10 %>
-        kavlan-7: 10.8.194.<%= i10 %>
-        kavlan-8: 10.9.2.<%= i10 %>
-        kavlan-9: 10.9.66.<%= i10 %>
-<% i31_38 = i+31 %>
-        kavlan-11: 10.7.197.<%=  i31_38 %>
-        kavlan-12: 10.11.197.<%= i31_38 %>
-        kavlan-13: 10.15.197.<%= i31_38 %>
-        kavlan-14: 10.19.197.<%= i31_38 %>
-        kavlan-16: 10.27.197.<%= i31_38 %>
-        kavlan-18: 10.35.197.<%= i31_38 %>
-        kavlan-19: 10.39.197.<%= i31_38 %>
-        kavlan-20: 10.43.197.<%= i31_38 %>
-        kavlan-21: 10.47.197.<%= i31_38 %>
+<% i9_16 = i+8 %>
+        kavlan-1: 192.168.193.<%= i9_16 %>
+        kavlan-2: 192.168.209.<%= i9_16 %>
+        kavlan-3: 192.168.225.<%= i9_16 %>
+        kavlan-4: 10.8.1.<%= i9_16 %>
+        kavlan-5: 10.8.65.<%= i9_16 %>
+        kavlan-6: 10.8.129.<%= i9_16 %>
+        kavlan-7: 10.8.193.<%= i9_16 %>
+        kavlan-8: 10.9.1.<%= i9_16 %>
+        kavlan-9: 10.9.65.<%= i9_16 %>
+<% i39_46 = i+38 %>
+        kavlan-11: 10.7.196.<%=  i39_46 %>
+        kavlan-12: 10.11.196.<%= i39_46 %>
+        kavlan-13: 10.15.196.<%= i39_46 %>
+        kavlan-14: 10.19.196.<%= i39_46 %>
+        kavlan-16: 10.27.196.<%= i39_46 %>
+        kavlan-18: 10.35.196.<%= i39_46 %>
+        kavlan-19: 10.39.196.<%= i39_46 %>
+        kavlan-20: 10.43.196.<%= i39_46 %>
+        kavlan-21: 10.47.196.<%= i39_46 %>
 <% } %>