[grenoble] [network] Add sw-ibm (temporary switch for drac) and necessary topology

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-1.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "13",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-10.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "22",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-11.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "23",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-12.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "24",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-2.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "14",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-3.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "15",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-4.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "16",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-5.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "17",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-6.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "18",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-7.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "19",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-8.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "20",
       "vendor": "Broadcom"
     },
     {

data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json

@@ -88,8 +88,8 @@
       "name": "enP1p1s0f3",
       "network_address": "drac-9.grenoble.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-ibm",
+      "switch_port": "21",
       "vendor": "Broadcom"
     },
     {

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

@@ -265,21 +265,18 @@
           "uid": "dighyp2"
         },
         {
-          "kind": "server",
-          "snmp_name": "X670V-48x Port 43",
-          "uid": "digsed"
         },
         {
-          "kind": "server",
-          "snmp_name": "X670V-48x Port 44",
-          "uid": "digsed"
         },
         {
-          "kind": "server",
+          "kind": "switch",
           "snmp_name": "X670V-48x Port 45",
-          "uid": "digwatt"
+          "uid": "sw-ibm"
         },
         {
+          "kind": "server",
+          "snmp_name": "X670V-48x Port 46",
+          "uid": "digwatt"
         },
         {
         },

data/grid5000/sites/grenoble/network_equipments/sw-ibm.json

+{
+  "kind": "switch",
+  "linecards": [
+    {
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "13",
+          "uid": "drac-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "14",
+          "uid": "drac-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "15",
+          "uid": "drac-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "16",
+          "uid": "drac-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "17",
+          "uid": "drac-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "18",
+          "uid": "drac-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "19",
+          "uid": "drac-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "20",
+          "uid": "drac-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "21",
+          "uid": "drac-9"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "22",
+          "uid": "drac-10"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "23",
+          "uid": "drac-11"
+        },
+        {
+          "kind": "node",
+          "port": "eth3",
+          "snmp_name": "24",
+          "uid": "drac-12"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "router",
+          "rate": 10000000000,
+          "snmp_name": "52",
+          "uid": "gw"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%PORT%"
+    }
+  ],
+  "model": "IBM RackSwitch G8052",
+  "role": "production",
+  "site": "grenoble",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-ibm",
+  "warranty": "expired"
+}
\ No newline at end of file

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

@@ -129,13 +129,10 @@ gw:
         42:
           uid: dighyp2
           kind: server
-        43:
-          uid: digsed
-          kind: server
-        44:
-          uid: digsed
-          kind: server
         45:
+          uid: sw-ibm
+          kind: switch
+        46:
           uid: digwatt
           kind: server
         48:

input/grid5000/sites/grenoble/networks/sw-ibm.yaml

+---
+sw-ibm:
+  role: production
+  model: IBM RackSwitch G8052
+  kind: switch
+  site: grenoble
+  warranty: expired
+  snmp_community: public
+  linecards:
+    0:
+      snmp_pattern: "%PORT%"
+      kind: node
+      rate: 1000000000
+      ports:
+        13: drac-1-eth3
+        14: drac-2-eth3
+        15: drac-3-eth3
+        16: drac-4-eth3
+        17: drac-5-eth3
+        18: drac-6-eth3
+        19: drac-7-eth3
+        20: drac-8-eth3
+        21: drac-9-eth3
+        22: drac-10-eth3
+        23: drac-11-eth3
+        24: drac-12-eth3
+        52:
+          uid: gw
+          kind: router
+          rate: 10000000000