From b4de401e502f70616ea8b61eccb1928594c86d90 Mon Sep 17 00:00:00 2001
From: Clement Parisot <clement.parisot@inria.fr>
Date: Tue, 15 Mar 2016 17:54:26 +0100
Subject: [PATCH] [nancy] grisou - Remove null switch/port on non connected
 interfaces

---
 .../nancy/clusters/grisou/nodes/grisou-1.json |  4 ----
 .../clusters/grisou/nodes/grisou-10.json      |  4 ----
 .../clusters/grisou/nodes/grisou-11.json      |  4 ----
 .../clusters/grisou/nodes/grisou-12.json      |  4 ----
 .../clusters/grisou/nodes/grisou-13.json      |  4 ----
 .../clusters/grisou/nodes/grisou-14.json      |  4 ----
 .../clusters/grisou/nodes/grisou-15.json      |  4 ----
 .../clusters/grisou/nodes/grisou-16.json      |  4 ----
 .../clusters/grisou/nodes/grisou-17.json      |  4 ----
 .../clusters/grisou/nodes/grisou-18.json      |  4 ----
 .../clusters/grisou/nodes/grisou-19.json      |  4 ----
 .../nancy/clusters/grisou/nodes/grisou-2.json |  4 ----
 .../clusters/grisou/nodes/grisou-20.json      |  4 ----
 .../clusters/grisou/nodes/grisou-21.json      |  4 ----
 .../clusters/grisou/nodes/grisou-22.json      |  4 ----
 .../clusters/grisou/nodes/grisou-23.json      |  4 ----
 .../clusters/grisou/nodes/grisou-24.json      |  4 ----
 .../clusters/grisou/nodes/grisou-25.json      |  4 ----
 .../clusters/grisou/nodes/grisou-26.json      |  4 ----
 .../clusters/grisou/nodes/grisou-27.json      |  4 ----
 .../clusters/grisou/nodes/grisou-28.json      |  4 ----
 .../clusters/grisou/nodes/grisou-29.json      |  4 ----
 .../nancy/clusters/grisou/nodes/grisou-3.json |  4 ----
 .../clusters/grisou/nodes/grisou-30.json      |  4 ----
 .../clusters/grisou/nodes/grisou-31.json      |  4 ----
 .../clusters/grisou/nodes/grisou-32.json      |  4 ----
 .../clusters/grisou/nodes/grisou-33.json      |  4 ----
 .../clusters/grisou/nodes/grisou-34.json      |  4 ----
 .../clusters/grisou/nodes/grisou-35.json      |  4 ----
 .../clusters/grisou/nodes/grisou-36.json      |  4 ----
 .../clusters/grisou/nodes/grisou-37.json      |  4 ----
 .../clusters/grisou/nodes/grisou-38.json      |  4 ----
 .../clusters/grisou/nodes/grisou-39.json      |  4 ----
 .../nancy/clusters/grisou/nodes/grisou-4.json |  4 ----
 .../clusters/grisou/nodes/grisou-40.json      |  4 ----
 .../clusters/grisou/nodes/grisou-41.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-42.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-43.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-44.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-45.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-46.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-47.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-48.json      | 10 ----------
 .../clusters/grisou/nodes/grisou-49.json      | 10 ----------
 .../nancy/clusters/grisou/nodes/grisou-5.json |  4 ----
 .../clusters/grisou/nodes/grisou-50.json      |  6 ------
 .../clusters/grisou/nodes/grisou-51.json      |  6 ------
 .../nancy/clusters/grisou/nodes/grisou-6.json |  4 ----
 .../nancy/clusters/grisou/nodes/grisou-7.json |  4 ----
 .../nancy/clusters/grisou/nodes/grisou-8.json |  4 ----
 .../nancy/clusters/grisou/nodes/grisou-9.json |  4 ----
 .../sites/nancy/clusters/grisou/grisou.rb     | 20 -------------------
 52 files changed, 282 deletions(-)

diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
index 8192e2f09cd..5d6573675e9 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
index 070c8dfb3e8..1471568c233 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
index aeaff0ec93f..559ae78945b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
index 1525a9a1628..908b7e6c6b5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
index 1488f80a3b3..c5304aacb40 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
index a67e3de89a8..9b26d78758c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
index 4cac61e29c4..ad211c22200 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
index 77574623729..12c9fbf3f88 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
index c30342713fe..3f1ae0db97b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
index adda8d1d6a8..981c857e06c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
index e6e9fa4abce..6128574c5ac 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
index e1c1914eef7..d23baf6d5ad 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
index 8c18ca7b1b6..dc330d3401e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
index 9fc83dc5e2c..5c2f2f41d83 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
index d983ce9dada..c652399da27 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
index f1086250e95..2b011f684d5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
index 342b2a5c68e..14d55e6130b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
index 9ed49d8dbf4..cdbeefdf26a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
index 002c3667467..d6b3776eb2d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
index a6574908f30..0e14a92e858 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
index 2c0c33af16b..e6a408740cc 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
index 78e78499489..3ac6a54f537 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
index 3e701adbe92..fb1d77100e5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
index e23a5a60807..d5472e484ed 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
index 9dd1d407af4..a52b6965a0a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
index ae0e0635377..153b81c8c1e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
index 772089e5e26..c1b3dabc60d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
index 029668d0067..d55cdc5ec6e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
index 83e2690e5f3..9a9ff4bcfcb 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
index 47a69c5833b..5f1bc4d80ff 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
index c7ace7b9057..8c9aa0f91b2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
index 66799a324a2..909d15b2f06 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
index 78bd2f1f0d0..b691fce1aac 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
index 3f322e0fa09..ee5d0c9f956 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
index e562250c374..0af0deb7349 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
index 1b216d21221..4c4419de3b1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
index f50ffc3d35b..af42d6f0454 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
index d50c7c4a59f..8ff330a9a35 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
index 5b624adbff4..6abe8d71f4d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
index 4e065f317e8..10a1f6eb679 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
index a45bb0ab19b..16f4208be70 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
index b478ae0b03a..6414bb42a1d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
index 5fbb6289fa8..0b4266e1120 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
index 1178f61d7ad..fbf25e58f11 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -103,8 +97,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +111,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
index eead68dad9a..5ccee4c12d3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index a7e2be931ff..e74b2fd1b3a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index 476d6274414..cf8400054d9 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -55,8 +55,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -71,8 +69,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -87,8 +83,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
index 719574fdad1..8963bcf9842 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
index cf028fdd39d..4b6afb0243c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
index 25e4fcc2f52..ab2b89fde62 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
index 9ffe6130123..b26fa5ca838 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -103,8 +103,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
@@ -119,8 +117,6 @@
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "Intel Corporation"
     },
     {
diff --git a/generators/input/sites/nancy/clusters/grisou/grisou.rb b/generators/input/sites/nancy/clusters/grisou/grisou.rb
index 7dc74e0df97..c915465b388 100644
--- a/generators/input/sites/nancy/clusters/grisou/grisou.rb
+++ b/generators/input/sites/nancy/clusters/grisou/grisou.rb
@@ -154,8 +154,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth4'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth4'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
@@ -170,8 +168,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth5'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth5'),
         },
         {
           :interface            => 'Ethernet',
@@ -218,8 +214,6 @@ site :nancy do |site_uid|
           :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth1'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
@@ -234,8 +228,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth2'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
@@ -250,8 +242,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth3'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth3'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
@@ -266,8 +256,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth4'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth4'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
@@ -282,8 +270,6 @@ site :nancy do |site_uid|
           :model            => 'I350 Gigabit Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth5'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth5'),
         },
         {
           :interface            => 'Ethernet',
@@ -330,8 +316,6 @@ site :nancy do |site_uid|
           :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth1'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
@@ -346,8 +330,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth4'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth4'),
         },
         {
           :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
@@ -362,8 +344,6 @@ site :nancy do |site_uid|
           :model            => 'Ethernet 10G 2P X520 Adapter',
           :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
           :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth5'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth5'),
         },
         {
           :interface            => 'Ethernet',
-- 
GitLab