[nancy][network] move gw-next to DCML

Signed-off-by: PARISOT Clement <clement.parisot@inria.fr>

data/grid5000/sites/nancy/clusters/grostiti/grostiti.json

@@ -316,94 +316,6 @@
         "port": 9100,
         "protocol": "prometheus"
       }
-    },
-    {
-      "description": "Input byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_bytes_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_bytes_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input packet counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_packets_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output packet counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_packets_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input counter of discarded packets for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_packets_discard_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output counter of discarded packets for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_packets_discard_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input counter of packet errors for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_packets_error_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output counter of packet errors for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_packets_error_total",
-      "period": 15000,
-      "source": {
-        "protocol": "network_equipment"
-      }
     }
   ],
   "model": "Dell PowerEdge R930",

data/grid5000/sites/nancy/clusters/grostiti/nodes/grostiti-1.json

@@ -335,8 +335,8 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": "sgrvingt",
-      "switch_port": "TenGigabitEthernet 1/44",
+      "switch": "gw-next",
+      "switch_port": "1/1/31",
       "vendor": "Intel"
     },
     {

data/grid5000/sites/nancy/network_equipments/gw-next.json

@@ -32,6 +32,9 @@
         {
         },
         {
+          "kind": "server",
+          "snmp_name": "1/1/8",
+          "uid": "grvingt-srv"
         },
         {
         },
@@ -78,6 +81,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/31",
+          "uid": "grostiti-1"
         },
         {
         },
@@ -118,6 +125,16 @@
           "rate": 40000000000,
           "snmp_name": "1/1/49",
           "uid": "sgros1"
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 40000000000,
+          "snmp_name": "1/1/52",
+          "uid": "sgrvingt"
         }
       ],
       "rate": 10000000000,

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

@@ -515,9 +515,6 @@
           "uid": "graffiti-3"
         },
         {
-          "kind": "switch",
-          "snmp_name": "Ethernet6/41",
-          "uid": "sgrvingt"
         },
         {
         },

data/grid5000/sites/nancy/network_equipments/sgrvingt.json

@@ -264,15 +264,8 @@
           "uid": "grvingt-42"
         },
         {
-          "kind": "server",
-          "snmp_name": "TenGigabitEthernet 1/43",
-          "uid": "grvingt-srv"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "TenGigabitEthernet 1/44",
-          "uid": "grostiti-1"
         },
         {
         },
@@ -289,9 +282,22 @@
           "uid": "grvingt-45"
         },
         {
-          "kind": "router",
-          "snmp_name": "TenGigabitEthernet 1/48",
-          "uid": "gw"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 40000000000,
+          "snmp_name": "TenGigabitEthernet 1/54",
+          "uid": "gw-next"
         }
       ],
       "rate": 10000000000,

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

@@ -197,9 +197,6 @@ gw:
           uid: graffiti-1-eth2
         40:
           uid: graffiti-3-eth2
-        41:
-          uid: sgrvingt
-          kind: switch
         51:
           uid: port-channel3
           kind: channel

input/grid5000/sites/nancy/networks/gw-next.yaml

@@ -18,7 +18,16 @@ gw-next:
       rate: 10_000_000_000
       kind: node
       ports:
+        8:
+          uid: grvingt-srv
+          kind: server
+        31:
+          uid: grostiti-1
         49:
           uid: sgros1
           kind: switch
           rate: 40_000_000_000
+        52:
+          uid: sgrvingt
+          kind: switch
+          rate: 40_000_000_000

input/grid5000/sites/nancy/networks/sgrvingt.yaml

@@ -106,15 +106,12 @@ sgrvingt:
         40: grvingt-2
         41: grvingt-41
         42: grvingt-42
-        43:
-          uid: grvingt-srv
-          kind: server
-        44: grostiti-1
         46: grvingt-46
         47: grvingt-45
-        48:
-          uid: gw
-          kind: router
+        54:
+          uid: gw-next
+          rate: 40_000_000_000
+          kind: switch
     49:
       snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
       kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"