[grenoble] Regenerate output

jonglezb · jonglezb · commit 272f5a903b84 · 2021-01-07T11:24:52.000+01:00
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-1.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 1",
+      "switch_port": "ethernet1/1/1:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-10.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 10",
+      "switch_port": "ethernet1/1/10:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-11.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 11",
+      "switch_port": "ethernet1/1/11:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-12.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 12",
+      "switch_port": "ethernet1/1/12:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-13.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 13",
+      "switch_port": "ethernet1/1/13:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-14.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 14",
+      "switch_port": "ethernet1/1/14:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-15.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 15",
+      "switch_port": "ethernet1/1/15:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-16.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 16",
+      "switch_port": "ethernet1/1/16:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-17.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 17",
+      "switch_port": "ethernet1/1/17:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-18.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 18",
+      "switch_port": "ethernet1/1/18:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-19.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 19",
+      "switch_port": "ethernet1/1/19:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-2.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 2",
+      "switch_port": "ethernet1/1/2:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-20.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 20",
+      "switch_port": "ethernet1/1/20:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-21.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 21",
+      "switch_port": "ethernet1/1/21:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-22.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 22",
+      "switch_port": "ethernet1/1/22:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-23.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 23",
+      "switch_port": "ethernet1/1/23:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-24.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 24",
+      "switch_port": "ethernet1/1/24:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-25.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 25",
+      "switch_port": "ethernet1/1/25:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-26.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 26",
+      "switch_port": "ethernet1/1/26:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-27.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 27",
+      "switch_port": "ethernet1/1/27:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-28.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 28",
+      "switch_port": "ethernet1/1/28:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-29.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 29",
+      "switch_port": "ethernet1/1/29:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-3.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 3",
+      "switch_port": "ethernet1/1/3:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-30.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 30",
+      "switch_port": "ethernet1/1/30:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-31.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 31",
+      "switch_port": "ethernet1/1/31:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-32.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 32",
+      "switch_port": "ethernet1/1/32:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-4.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 4",
+      "switch_port": "ethernet1/1/4:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-5.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 5",
+      "switch_port": "ethernet1/1/5:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-6.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 6",
+      "switch_port": "ethernet1/1/6:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-7.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 7",
+      "switch_port": "ethernet1/1/7:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-8.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 8",
+      "switch_port": "ethernet1/1/8:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json
@@ -85,7 +85,7 @@
       "network_address": "dahu-9.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
-      "switch_port": "X670V-48x Port 9",
+      "switch_port": "ethernet1/1/9:1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/drac/drac.json b/data/grid5000/sites/grenoble/clusters/drac/drac.json
@@ -3,7 +3,28 @@
   "exotic": true,
   "kavlan": true,
   "metrics": [
-
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    }
   ],
   "model": "IBM PowerNV S822LC (8335-GTB)",
   "queues": [
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-1.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/37:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-10.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/46:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-11.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/47:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-12.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/48:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-2.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/38:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-3.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/39:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-4.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/40:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-5.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/41:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -122,7 +122,7 @@
       "name": "enP1p1s0f0",
       "network_address": "drac-6.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-new",
+      "switch": "gw",
       "switch_port": "ethernet1/1/42:1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-new.json b/data/grid5000/sites/grenoble/network_equipments/gw-new.json
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`"network_address": "dahu-1.grenoble.grid5000.fr",`
`86`	`86`	`"rate": 10000000000,`
`87`	`87`	`"switch": "gw",`
`88`		`- "switch_port": "X670V-48x Port 1",`
	`88`	`+ "switch_port": "ethernet1/1/1:1",`
`89`	`89`	`"vendor": "Intel"`
`90`	`90`	`},`
`91`	`91`	`{`