[grenoble] Remove retired nodes from network description

data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json

@@ -106,14 +106,17 @@
         {
         },
         {
+          "kind": "other",
           "port": "eth3",
           "uid": "digsed"
         },
         {
+          "kind": "other",
           "port": "bmc",
           "uid": "digsed"
         },
         {
+          "kind": "other",
           "port": "eth2",
           "uid": "digsed"
         }
@@ -203,8 +206,6 @@
           "uid": "genepi-16"
         },
         {
-          "port": "eth1",
-          "uid": "genepi-34"
         },
         {
           "port": "eth1",
@@ -231,8 +232,6 @@
           "uid": "genepi-22"
         },
         {
-          "port": "eth1",
-          "uid": "genepi-28"
         },
         {
           "port": "eth1",
@@ -288,8 +287,6 @@
           "uid": "genepi-29"
         },
         {
-          "port": "eth1",
-          "uid": "genepi-27"
         },
         {
           "port": "eth1",

data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json

@@ -46,7 +46,6 @@
           "uid": "edel-26"
         },
         {
-          "uid": "edel-27"
         },
         {
           "uid": "edel-28"

data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json

@@ -46,7 +46,6 @@
           "uid": "edel-44"
         },
         {
-          "uid": "edel-45"
         },
         {
           "uid": "edel-46"
@@ -73,7 +72,6 @@
           "uid": "edel-53"
         },
         {
-          "uid": "edel-54"
         },
         {
         },

data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json

@@ -40,7 +40,6 @@
           "uid": "edel-60"
         },
         {
-          "uid": "edel-61"
         },
         {
           "uid": "edel-62"

grid5000-all.json

@@ -21144,14 +21144,17 @@
                 },
                 "25": null,
                 "26": {
+                  "kind": "other",
                   "port": "eth3",
                   "uid": "digsed"
                 },
                 "27": {
+                  "kind": "other",
                   "port": "bmc",
                   "uid": "digsed"
                 },
                 "28": {
+                  "kind": "other",
                   "port": "eth2",
                   "uid": "digsed"
                 },
@@ -21227,10 +21230,6 @@
                   "port": "eth1",
                   "uid": "genepi-16"
                 },
-                "26": {
-                  "port": "eth1",
-                  "uid": "genepi-34"
-                },
                 "27": {
                   "port": "eth1",
                   "uid": "genepi-18"
@@ -21260,10 +21259,6 @@
                   "port": "eth1",
                   "uid": "genepi-22"
                 },
-                "33": {
-                  "port": "eth1",
-                  "uid": "genepi-28"
-                },
                 "34": {
                   "port": "eth1",
                   "uid": "genepi-32"
@@ -21415,10 +21410,6 @@
                   "port": "eth0",
                   "uid": "grimage-8"
                 },
-                "4": {
-                  "port": "eth1",
-                  "uid": "genepi-27"
-                },
                 "5": {
                   "port": "eth1",
                   "uid": "genepi-33"
@@ -21647,7 +21638,6 @@
                 "10": "edel-24",
                 "11": "edel-25",
                 "12": "edel-26",
-                "13": "edel-27",
                 "14": "edel-28",
                 "15": "edel-29",
                 "16": "edel-30",
@@ -21719,7 +21709,6 @@
                 "10": "edel-42",
                 "11": "edel-43",
                 "12": "edel-44",
-                "13": "edel-45",
                 "14": "edel-46",
                 "15": "edel-47",
                 "16": "edel-48",
@@ -21728,7 +21717,6 @@
                 "19": "edel-51",
                 "20": "edel-52",
                 "21": "edel-53",
-                "22": "edel-54",
                 "25": {
                   "aggregation": "trunk",
                   "kind": "router",
@@ -21789,7 +21777,6 @@
               "port": "eth0",
               "ports": {
                 "10": "edel-60",
-                "11": "edel-61",
                 "12": "edel-62",
                 "13": "edel-63",
                 "14": "edel-64",

input/grid5000/sites/grenoble/networks/gw-grenoble.yaml

@@ -126,12 +126,15 @@ gw-grenoble:
         26:
           uid: digsed
           port: eth3
+          kind: other
         27:
           uid: digsed
           port: bmc
+          kind: other
         28:
           uid: digsed
           port: eth2
+          kind: other
     3:
       snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
       kavlan_pattern: "%LINECARD%:%PORT%"
@@ -183,9 +186,6 @@ gw-grenoble:
         25:
           uid: genepi-16
           port: eth1
-        26:
-          uid: genepi-34
-          port: eth1
         27:
           uid: genepi-18
           port: eth1
@@ -204,9 +204,6 @@ gw-grenoble:
         32:
           uid: genepi-22
           port: eth1
-        33:
-          uid: genepi-28
-          port: eth1
         34:
           uid: genepi-32
           port: eth1
@@ -241,9 +238,6 @@ gw-grenoble:
         3:
           uid: genepi-29
           port: eth1
-        4:
-          uid: genepi-27
-          port: eth1
         5:
           uid: genepi-33
           port: eth1

input/grid5000/sites/grenoble/networks/sw-edel-2.yaml

@@ -36,7 +36,6 @@ sw-edel-2:
         10: edel-24
         11: edel-25
         12: edel-26
-        13: edel-27
         14: edel-28
         15: edel-29
         16: edel-30

input/grid5000/sites/grenoble/networks/sw-edel-3.yaml

@@ -36,7 +36,6 @@ sw-edel-3:
         10: edel-42
         11: edel-43
         12: edel-44
-        13: edel-45
         14: edel-46
         15: edel-47
         16: edel-48
@@ -45,7 +44,6 @@ sw-edel-3:
         19: edel-51
         20: edel-52
         21: edel-53
-        22: edel-54
         25:
           uid: gw-grenoble
           port: "2:7"

input/grid5000/sites/grenoble/networks/sw-edel-4.yaml

@@ -34,7 +34,6 @@ sw-edel-4:
         8: edel-58
         9: edel-59
         10: edel-60
-        11: edel-61
         12: edel-62
         13: edel-63
         14: edel-64