diff --git a/data/grid5000/network_equipments/renater-grenoble.json b/data/grid5000/network_equipments/renater-grenoble.json
index b8c0c819ef84d4288703c2438289c65b4536fe3b..8331af160605685a4ced2080d53363297185e419 100644
--- a/data/grid5000/network_equipments/renater-grenoble.json
+++ b/data/grid5000/network_equipments/renater-grenoble.json
@@ -16,7 +16,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-grenoble",
- "weathermap": {
- }
+ "uid": "renater-grenoble"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-lille.json b/data/grid5000/network_equipments/renater-lille.json
index 64e93843896a9729fdb9399eb2b6f3b697d7b596..dfa45dedf7f7b604c76cb6e30dd8e0858d22d20a 100644
--- a/data/grid5000/network_equipments/renater-lille.json
+++ b/data/grid5000/network_equipments/renater-lille.json
@@ -16,7 +16,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-lille",
- "weathermap": {
- }
+ "uid": "renater-lille"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-luxembourg.json b/data/grid5000/network_equipments/renater-luxembourg.json
index a226b2b798f0b2e75e71a617e4c0ec4b74e8d9c5..9af7e0c65b27d24560c0fb6174c3c230c630e851 100644
--- a/data/grid5000/network_equipments/renater-luxembourg.json
+++ b/data/grid5000/network_equipments/renater-luxembourg.json
@@ -16,7 +16,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-luxembourg",
- "weathermap": {
- }
+ "uid": "renater-luxembourg"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-lyon.json b/data/grid5000/network_equipments/renater-lyon.json
index f7776be7faf1a0190c28e9803e80e26914a6114b..0c50462d4d6af55be7cec85df05e859c6f09aec1 100644
--- a/data/grid5000/network_equipments/renater-lyon.json
+++ b/data/grid5000/network_equipments/renater-lyon.json
@@ -25,7 +25,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-lyon",
- "weathermap": {
- }
+ "uid": "renater-lyon"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-nancy.json b/data/grid5000/network_equipments/renater-nancy.json
index d8acbe27e74fe04024be2e077fd122852ec012be..78bb6bccf46393e09a36636a8b2c9b15c8574152 100644
--- a/data/grid5000/network_equipments/renater-nancy.json
+++ b/data/grid5000/network_equipments/renater-nancy.json
@@ -19,7 +19,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-nancy",
- "weathermap": {
- }
+ "uid": "renater-nancy"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-nantes.json b/data/grid5000/network_equipments/renater-nantes.json
index 047dab1f5e0238aa710b867ea4d664417845ab42..59b515d3bb7f31d428be379fc8d8ee56bb1d2c52 100644
--- a/data/grid5000/network_equipments/renater-nantes.json
+++ b/data/grid5000/network_equipments/renater-nantes.json
@@ -19,7 +19,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-nantes",
- "weathermap": {
- }
+ "uid": "renater-nantes"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-paris.json b/data/grid5000/network_equipments/renater-paris.json
index 7fcb326a4912d5e5206f052256bec11a642004e3..7ef133bf3e82cb036e3bd7939bd0879e6ccff53d 100644
--- a/data/grid5000/network_equipments/renater-paris.json
+++ b/data/grid5000/network_equipments/renater-paris.json
@@ -17,7 +17,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-paris",
- "weathermap": {
- }
+ "uid": "renater-paris"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-rennes.json b/data/grid5000/network_equipments/renater-rennes.json
index c5835866f56bf0a02fa6dcffc888c911cae36cc4..7581488bdfaca073ca1b27755b7d49e73e20d016 100644
--- a/data/grid5000/network_equipments/renater-rennes.json
+++ b/data/grid5000/network_equipments/renater-rennes.json
@@ -16,7 +16,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-rennes",
- "weathermap": {
- }
+ "uid": "renater-rennes"
}
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-sophia.json b/data/grid5000/network_equipments/renater-sophia.json
index 47aa61b91508f2f2ae2445940d0afbbaaa272759..a5128035f0804e53efe698e200200933b6cbb09a 100644
--- a/data/grid5000/network_equipments/renater-sophia.json
+++ b/data/grid5000/network_equipments/renater-sophia.json
@@ -16,7 +16,5 @@
}
],
"type": "network_equipment",
- "uid": "renater-sophia",
- "weathermap": {
- }
+ "uid": "renater-sophia"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index ac7638eb43cd4208fea41c8eca68ae54e390ff25..65e066db624c9e017359e9f748533c577349510a 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -1,241 +1,282 @@
{
"alias": [
- "sw-imag"
+ "sw-imag",
+ "gw-grenoble"
],
"backplane_bps": 800000000000,
+ "ip": "172.16.31.254",
"kind": "router",
"linecards": [
{
"backplane_bps": 48000000000,
"kavlan_pattern": "%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 1",
"uid": "dahu-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 2",
"uid": "dahu-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 3",
"uid": "dahu-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 4",
"uid": "dahu-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 5",
"uid": "dahu-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 6",
"uid": "dahu-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 7",
"uid": "dahu-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 8",
"uid": "dahu-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 9",
"uid": "dahu-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 10",
"uid": "dahu-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 11",
"uid": "dahu-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 12",
"uid": "dahu-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 13",
"uid": "dahu-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 14",
"uid": "dahu-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 15",
"uid": "dahu-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 16",
"uid": "dahu-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 17",
"uid": "dahu-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 18",
"uid": "dahu-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 19",
"uid": "dahu-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 20",
"uid": "dahu-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 21",
"uid": "dahu-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 22",
"uid": "dahu-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 23",
"uid": "dahu-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 24",
"uid": "dahu-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 25",
"uid": "dahu-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 26",
"uid": "dahu-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 27",
"uid": "dahu-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 28",
"uid": "dahu-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 29",
"uid": "dahu-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 30",
"uid": "dahu-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 31",
"uid": "dahu-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 32",
"uid": "dahu-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 33",
"uid": "yeti-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 34",
"uid": "yeti-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 35",
"uid": "yeti-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 36",
"uid": "yeti-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 37",
"uid": "troll-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 38",
"uid": "troll-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 39",
"uid": "troll-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "X670V-48x Port 40",
"uid": "troll-4"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "X670V-48x Port 41",
"uid": "dighyp1"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "X670V-48x Port 42",
"uid": "dighyp2"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "X670V-48x Port 43",
"uid": "digsed"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "X670V-48x Port 44",
"uid": "digsed"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "X670V-48x Port 45",
"uid": "digwatt"
},
{
@@ -243,8 +284,8 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "backbone",
+ "snmp_name": "X670V-48x Port 48",
"uid": "renater5"
}
],
@@ -253,12 +294,7 @@
}
],
"model": "ExtremeNetworks",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "grenoble",
"snmp_community": "public",
"type": "network_equipment",
@@ -341,7 +377,5 @@
"name": "kavlan-11"
}
},
- "warranty": "expired",
- "weathermap": {
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index 72b9dfadc50e80be44ea655cba11fab2672c50fe..85793b2ffeea70145cd6a410147ffd531b44975a 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -1,5 +1,14 @@
{
"backplane_bps": 36000000000000,
+ "channels": {
+ "port-channel1": {
+ "kind": "router",
+ "port": "port-channel1",
+ "rate": 200000000000,
+ "uid": "sw-chiclet-2"
+ }
+ },
+ "ip": "172.17.47.221",
"kind": "switch",
"linecards": [
{
@@ -7,168 +16,200 @@
{
"backplane_bps": 36000000000000,
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "virtual",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/1",
"uid": "chifflot-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/2",
"uid": "chifflot-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/3",
"uid": "chifflot-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/4",
"uid": "chifflot-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/5",
"uid": "chifflot-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/6",
"uid": "chifflot-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/7",
"uid": "chifflot-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/8",
"uid": "chifflot-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/9",
"uid": "chiclet-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/10",
"uid": "chiclet-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/11",
"uid": "chiclet-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/12",
"uid": "chiclet-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/13",
"uid": "chiclet-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/14",
"uid": "chiclet-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/15",
"uid": "chiclet-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/16",
"uid": "chiclet-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/17",
"uid": "chifflot-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/18",
"uid": "chifflot-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/19",
"uid": "chifflot-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/20",
"uid": "chifflot-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/21",
"uid": "chifflot-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/22",
"uid": "chifflot-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/23",
"uid": "chifflot-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/24",
"uid": "chifflot-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/25",
"uid": "chiclet-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/26",
"uid": "chiclet-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/27",
"uid": "chiclet-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/28",
"uid": "chiclet-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/29",
"uid": "chiclet-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/30",
"uid": "chiclet-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/31",
"uid": "chiclet-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/32",
"uid": "chiclet-8"
},
{
@@ -212,18 +253,16 @@
{
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/52",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-2"
+ "snmp_name": "Ethernet1/53",
+ "uid": "port-channel1"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/51",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-2"
+ "snmp_name": "Ethernet1/54",
+ "uid": "port-channel1"
}
],
"rate": 25000000000,
@@ -231,17 +270,10 @@
}
],
"model": "cisco 93180YC-EX",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-chiclet-1",
- "warranty": "2021-11-30",
- "weathermap": {
- }
+ "warranty": "2021-11-30"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index 5cc77854efe179485dc1358553dca19eab633101..714c2dfb236ce72901d8d42cfa79525b72404880 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -1,5 +1,30 @@
{
+ "alias": [
+ {
+ "ip": "172.16.47.254",
+ "name": "gw"
+ },
+ {
+ "ip": "172.17.47.254",
+ "name": "gw-adm"
+ }
+ ],
"backplane_bps": 36000000000000,
+ "channels": {
+ "port-channel1": {
+ "kind": "switch",
+ "port": "port-channel1",
+ "rate": 200000000000,
+ "uid": "sw-chiclet-1"
+ },
+ "port-channel2": {
+ "kind": "switch",
+ "port": "port-channel1",
+ "rate": 200000000000,
+ "uid": "sw-chiclet-3"
+ }
+ },
+ "ip": "172.17.47.222",
"kind": "router",
"linecards": [
{
@@ -7,8 +32,7 @@
{
"backplane_bps": 36000000000000,
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "virtual",
- "port": "eth0",
+ "kind": "other",
"ports": [
{
},
@@ -77,15 +101,16 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "backbone",
+ "snmp_name": "Ethernet1/33",
"uid": "renater5-FON"
},
{
},
{
"kind": "other",
- "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "Ethernet1/35",
"uid": "labo"
},
{
@@ -119,32 +144,28 @@
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/54",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-1"
+ "snmp_name": "Ethernet1/51",
+ "uid": "port-channel1"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/53",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-1"
+ "snmp_name": "Ethernet1/52",
+ "uid": "port-channel1"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/53",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-3"
+ "snmp_name": "Ethernet1/53",
+ "uid": "port-channel2"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/54",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-3"
+ "snmp_name": "Ethernet1/54",
+ "uid": "port-channel2"
}
],
"rate": 10000000000,
@@ -152,12 +173,7 @@
}
],
"model": "cisco 93180YC-EX",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
@@ -240,7 +256,5 @@
"name": "kavlan-12"
}
},
- "warranty": "2021-11-30",
- "weathermap": {
- }
+ "warranty": "2021-11-30"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
index 25324ae44cea5004b59e7b487d92f1a0c8309c5c..1acefc2852e447fa38b1218d2eb31e8d55ebaac8 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -1,5 +1,14 @@
{
"backplane_bps": 36000000000000,
+ "channels": {
+ "port-channel1": {
+ "kind": "router",
+ "port": "port-channel2",
+ "rate": 200000000000,
+ "uid": "sw-chiclet-2"
+ }
+ },
+ "ip": "172.17.47.223",
"kind": "switch",
"linecards": [
{
@@ -7,83 +16,98 @@
{
"backplane_bps": 36000000000000,
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "virtual",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/1",
"uid": "chetemi-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/2",
"uid": "chetemi-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/3",
"uid": "chetemi-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/4",
"uid": "chetemi-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/5",
"uid": "chetemi-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/6",
"uid": "chetemi-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/7",
"uid": "chetemi-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/8",
"uid": "chetemi-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/9",
"uid": "chetemi-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/10",
"uid": "chetemi-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/11",
"uid": "chetemi-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/12",
"uid": "chetemi-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/13",
"uid": "chetemi-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/14",
"uid": "chetemi-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/15",
"uid": "chetemi-15"
},
{
@@ -91,156 +115,187 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/17",
"uid": "chifflet-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/18",
"uid": "chifflet-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/19",
"uid": "chifflet-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/20",
"uid": "chifflet-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/21",
"uid": "chifflet-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/22",
"uid": "chifflet-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/23",
"uid": "chifflet-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/24",
"uid": "chifflet-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/25",
"uid": "chetemi-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/26",
"uid": "chetemi-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/27",
"uid": "chetemi-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/28",
"uid": "chetemi-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/29",
"uid": "chetemi-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/30",
"uid": "chetemi-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/31",
"uid": "chetemi-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/32",
"uid": "chetemi-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/33",
"uid": "chetemi-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/34",
"uid": "chetemi-10"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/35",
"uid": "chetemi-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/36",
"uid": "chetemi-12"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/37",
"uid": "chetemi-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/38",
"uid": "chetemi-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/39",
"uid": "chetemi-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/40",
"uid": "chifflet-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/41",
"uid": "chifflet-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/42",
"uid": "chifflet-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/43",
"uid": "chifflet-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/44",
"uid": "chifflet-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/45",
"uid": "chifflet-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/46",
"uid": "chifflet-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/47",
"uid": "chifflet-8"
},
{
@@ -254,18 +309,16 @@
{
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/53",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-2"
+ "snmp_name": "Ethernet1/53",
+ "uid": "port-channel1"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/54",
+ "kind": "channel",
"rate": 100000000000,
- "uid": "sw-chiclet-2"
+ "snmp_name": "Ethernet1/54",
+ "uid": "port-channel1"
}
],
"rate": 10000000000,
@@ -273,17 +326,10 @@
}
],
"model": "cisco 93180YC-EX",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "lille",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sw-chiclet-3",
- "warranty": "2021-11-30",
- "weathermap": {
- }
+ "warranty": "2021-11-30"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
index 53e955a41072ee8ae262055995a68ae4d5ecaedc..c953f3bdb1f3acae54828a4ca6c37cc2bde289e3 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-12.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/12",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-12-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/24",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
index 549b0a7dbcb3d27e2e4c5a11778189933043bce5..f815317cfd0587d0a13d0e5502c4875c614dfb97 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-15.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/15",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-15-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/27",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
index dacdc97920f6d63550c7af5497221a26daa4d79a..38f9279e78ee330720afbc7ffa7c90dcf5a012cc 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-16.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/16",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-16-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/28",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
index a5c924a7c9a128be2dce79b93c21faac63b49733..54b8f07cbe7dd67d012e7614c394c2a55fd5f1d4 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-18.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/18",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-18-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/30",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
index 301326c39ee69f97fc8bf9d0411aff46981c6926..778715150d62969d3004d39a3225570b41e4b823 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-2.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/2",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-2-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet1/25",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
index 9a3bb73f8f0eb9a1a38e4df953e4b500a70fe5ef..027f44bc836c5c5a92b543807ca41bf5425f43af 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-20.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/20",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-20-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/32",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
index 09766a730061303f723b68811071497bd8c2b791..7ed83019492fbfb9192e33b9b4607bc9f6173ea2 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-21.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/21",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-21-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/33",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
index 723ac00254a268d147dfbf1068316ce2bc5703e9..a4e6b6302c986df7ff4908940c5234e17c04ce6d 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-3.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/3",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-3-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet1/26",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
index 0cac1a7d30aea46b2ba26237f0979799f7fad765..f9120920b01858a9c613ed8cdb5ab08046ba0604 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-4.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/4",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-4-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet1/27",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
index 71e386bd57845eae6ebb8c210db36290903ec6aa..dd0905b3143734058f76c265f684e2db8ce2f2dc 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-6.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/6",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-6-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet1/29",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
index 255b5b35f219c2480191086cdc404714bd54dbf8..fe9005d01268e70cc5400e6884d5237a48e4b8f2 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "granduc-9.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet2/9",
"vendor": "Broadcom"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "granduc-9-eth1.luxembourg.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-luxembourg",
+ "switch": "gw",
"switch_port": "GigabitEthernet1/32",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/gw.json
similarity index 76%
rename from data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
rename to data/grid5000/sites/luxembourg/network_equipments/gw.json
index c2b40161976f4cf2be7d0f9a638e9a71db4ed0ae..f2860d0bee081ab29ea0b5312a7d3297d302dc5c 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw.json
@@ -1,5 +1,17 @@
{
+ "alias": [
+ "gw-luxembourg"
+ ],
"backplane_bps": 720000000000,
+ "channels": {
+ "Port-channel4": {
+ "kind": "switch",
+ "port": "port-channel4",
+ "rate": 20000000000,
+ "uid": "ul-grid5000-sw02"
+ }
+ },
+ "ip": "172.16.191.254",
"kind": "router",
"linecards": [
{
@@ -62,16 +74,19 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet1/25",
"uid": "granduc-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet1/26",
"uid": "granduc-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet1/27",
"uid": "granduc-4"
},
{
@@ -79,6 +94,7 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet1/29",
"uid": "granduc-6"
},
{
@@ -88,6 +104,7 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet1/32",
"uid": "granduc-9"
},
{
@@ -95,28 +112,28 @@
{
},
{
- "kind": "other",
- "port": "eth1",
- "uid": "cronos"
+ "kind": "server",
+ "snmp_name": "GigabitEthernet1/35",
+ "uid": "cronos-eth1"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "GigabitEthernet1/36",
"uid": "zeus"
},
{
- "kind": "other",
- "port": "eth2",
- "uid": "cronos"
+ "kind": "server",
+ "snmp_name": "GigabitEthernet1/37",
+ "uid": "cronos-eth2"
},
{
},
{
},
{
- "kind": "other",
- "port": "eth1",
- "uid": "zeus"
+ "kind": "server",
+ "snmp_name": "GigabitEthernet1/40",
+ "uid": "zeus-eth1"
},
{
},
@@ -150,16 +167,19 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/2",
"uid": "granduc-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/3",
"uid": "granduc-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/4",
"uid": "granduc-4"
},
{
@@ -167,6 +187,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/6",
"uid": "granduc-6"
},
{
@@ -176,6 +197,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/9",
"uid": "granduc-9"
},
{
@@ -185,6 +207,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/12",
"uid": "granduc-12"
},
{
@@ -194,11 +217,13 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/15",
"uid": "granduc-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/16",
"uid": "granduc-16"
},
{
@@ -206,6 +231,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/18",
"uid": "granduc-18"
},
{
@@ -213,11 +239,13 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/20",
"uid": "granduc-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet2/21",
"uid": "granduc-21"
},
{
@@ -227,6 +255,7 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet2/24",
"uid": "granduc-12"
},
{
@@ -236,11 +265,13 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet2/27",
"uid": "granduc-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet2/28",
"uid": "granduc-16"
},
{
@@ -248,6 +279,7 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet2/30",
"uid": "granduc-18"
},
{
@@ -255,11 +287,13 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet2/32",
"uid": "granduc-20"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "GigabitEthernet2/33",
"uid": "granduc-21"
},
{
@@ -283,8 +317,8 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "GigabitEthernet2/44",
"uid": "cronos"
},
{
@@ -302,21 +336,19 @@
{
"backplane_bps": 40000000000,
"kavlan_pattern": "Ti%LINECARD%/%PORT%",
- "kind": "switch",
+ "kind": "channel",
"ports": [
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/30",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet3/1",
+ "uid": "Port-channel4"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/32",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet3/2",
+ "uid": "Port-channel4"
}
],
"rate": 10000000000,
@@ -327,7 +359,7 @@
{
"backplane_bps": 40000000000,
"kavlan_pattern": "Ti%LINECARD%/%PORT%",
- "kind": "virtual",
+ "kind": "backbone",
"ports": [
{
},
@@ -338,8 +370,9 @@
{
},
{
- "kind": "virtual",
+ "kind": "backbone",
"rate": 10000000000,
+ "snmp_name": "TenGigabitEthernet5/4",
"uid": "renater-luxembourg"
}
],
@@ -348,16 +381,11 @@
}
],
"model": "cisco WS-C6506-E",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "luxembourg",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "gw-luxembourg",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
@@ -446,7 +474,5 @@
"name": "kavlan-20"
}
},
- "warranty": "2018-12-01",
- "weathermap": {
- }
+ "warranty": "2018-12-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
index c39ecbec10fba5dbec317b396f242ef606803a22..c44f9d01129c7ace6f3414a51b988985a3c6868f 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
@@ -1,5 +1,17 @@
{
+ "alias": [
+ "m1000-mxl1"
+ ],
"backplane_bps": 1407374880000,
+ "channels": {
+ "Port-channel 5": {
+ "kind": "switch",
+ "port": "port-channel5",
+ "rate": 4000000000,
+ "uid": "ul-grid5000-sw02"
+ }
+ },
+ "ip": "172.17.191.251",
"kind": "switch",
"linecards": [
{
@@ -11,56 +23,67 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/1",
"uid": "petitprince-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/2",
"uid": "petitprince-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/3",
"uid": "petitprince-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/4",
"uid": "petitprince-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/5",
"uid": "petitprince-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/6",
"uid": "petitprince-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/7",
"uid": "petitprince-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/8",
"uid": "petitprince-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/9",
"uid": "petitprince-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/10",
"uid": "petitprince-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/11",
"uid": "petitprince-11"
},
{
@@ -68,21 +91,25 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/13",
"uid": "petitprince-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/14",
"uid": "petitprince-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/15",
"uid": "petitprince-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/16",
"uid": "petitprince-16"
},
{
@@ -118,28 +145,24 @@
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/33",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/33",
+ "uid": "Port-channel 5"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/34",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/34",
+ "uid": "Port-channel 5"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/35",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/35",
+ "uid": "Port-channel 5"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/36",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/36",
+ "uid": "Port-channel 5"
}
],
"rate": 10000000000,
@@ -147,26 +170,10 @@
}
],
"model": "Force10 MXL",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "luxembourg",
"snmp_community": "public",
"type": "network_equipment",
"uid": "mxl1",
- "vlans": {
- "vlan101": {
- "addresses": [
- "172.17.191.251"
- ],
- "administrative": true
- }
- },
- "warranty": "expired",
- "weathermap": {
- "use_cacti": "yes"
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
index e9e7ffebcf330ac7571fdcf051147b8ec188211b..dd9dee6733122b6c8d7e58982ca92596ca6750dc 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
@@ -1,5 +1,17 @@
{
+ "alias": [
+ "m1000-mxl2"
+ ],
"backplane_bps": 1407374880000,
+ "channels": {
+ "Port-channel 6": {
+ "kind": "switch",
+ "port": "port-channel6",
+ "rate": 4000000000,
+ "uid": "ul-grid5000-sw02"
+ }
+ },
+ "ip": "172.17.191.252",
"kind": "switch",
"linecards": [
{
@@ -11,56 +23,67 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/1",
"uid": "petitprince-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/2",
"uid": "petitprince-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/3",
"uid": "petitprince-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/4",
"uid": "petitprince-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/5",
"uid": "petitprince-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/6",
"uid": "petitprince-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/7",
"uid": "petitprince-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/8",
"uid": "petitprince-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/9",
"uid": "petitprince-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/10",
"uid": "petitprince-10"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/11",
"uid": "petitprince-11"
},
{
@@ -68,21 +91,25 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/13",
"uid": "petitprince-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/14",
"uid": "petitprince-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/15",
"uid": "petitprince-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/16",
"uid": "petitprince-16"
},
{
@@ -118,28 +145,24 @@
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/37",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/33",
+ "uid": "Port-channel 6"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/38",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/34",
+ "uid": "Port-channel 6"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/39",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/35",
+ "uid": "Port-channel 6"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/40",
- "uid": "ul-grid5000-sw02"
+ "kind": "channel",
+ "snmp_name": "TenGigabitEthernet 0/36",
+ "uid": "Port-channel 6"
}
],
"rate": 10000000000,
@@ -147,26 +170,10 @@
}
],
"model": "Force10 MXL",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "luxembourg",
"snmp_community": "public",
"type": "network_equipment",
"uid": "mxl2",
- "vlans": {
- "vlan101": {
- "addresses": [
- "172.17.191.252"
- ],
- "administrative": true
- }
- },
- "warranty": "expired",
- "weathermap": {
- "use_cacti": "yes"
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
index 59b7334db58a52a11263c5179b55cebb9697a96a..8300d3bd44ad3162d2bdd96490c36058679eb37d 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -1,5 +1,32 @@
{
"backplane_bps": 1040000000000,
+ "channels": {
+ "port-channel4": {
+ "kind": "router",
+ "port": "Port-channel4",
+ "rate": 20000000000,
+ "uid": "gw"
+ },
+ "port-channel5": {
+ "kind": "switch",
+ "port": "Port-channel 5",
+ "rate": 40000000000,
+ "uid": "mxl1"
+ },
+ "port-channel6": {
+ "kind": "switch",
+ "port": "Port-channel 6",
+ "rate": 40000000000,
+ "uid": "mxl2"
+ },
+ "port-channel7": {
+ "kind": "server",
+ "port": "NA",
+ "rate": 20000000000,
+ "uid": "srv-data"
+ }
+ },
+ "ip": "172.17.191.253",
"kind": "switch",
"linecards": [
{
@@ -17,16 +44,19 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/3",
"uid": "granduc-2"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/4",
"uid": "granduc-3"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/5",
"uid": "granduc-4"
},
{
@@ -34,6 +64,7 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/7",
"uid": "granduc-6"
},
{
@@ -43,6 +74,7 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/10",
"uid": "granduc-9"
},
{
@@ -52,6 +84,7 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/13",
"uid": "granduc-12"
},
{
@@ -61,11 +94,13 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/16",
"uid": "granduc-15"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/17",
"uid": "granduc-16"
},
{
@@ -73,6 +108,7 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/19",
"uid": "granduc-18"
},
{
@@ -80,11 +116,13 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/21",
"uid": "granduc-20"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet1/22",
"uid": "granduc-21"
},
{
@@ -92,8 +130,14 @@
{
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/25",
+ "uid": "port-channel7"
},
{
+ "kind": "channel",
+ "snmp_name": "Ethernet1/26",
+ "uid": "port-channel7"
},
{
},
@@ -102,66 +146,56 @@
{
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Te3/1",
- "uid": "gw-luxembourg"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/30",
+ "uid": "port-channel4"
},
{
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Te3/2",
- "uid": "gw-luxembourg"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/32",
+ "uid": "port-channel4"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/33",
- "uid": "mxl1"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/33",
+ "uid": "port-channel5"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/34",
- "uid": "mxl1"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/34",
+ "uid": "port-channel5"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/35",
- "uid": "mxl1"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/35",
+ "uid": "port-channel5"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/36",
- "uid": "mxl1"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/36",
+ "uid": "port-channel5"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/33",
- "uid": "mxl2"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/37",
+ "uid": "port-channel6"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/34",
- "uid": "mxl2"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/38",
+ "uid": "port-channel6"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/35",
- "uid": "mxl2"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/39",
+ "uid": "port-channel6"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Te0/36",
- "uid": "mxl2"
+ "kind": "channel",
+ "snmp_name": "Ethernet1/40",
+ "uid": "port-channel6"
}
],
"rate": 10000000000,
@@ -169,26 +203,10 @@
}
],
"model": "cisco N5K-C5020P-BF",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "luxembourg",
"snmp_community": "public",
"type": "network_equipment",
"uid": "ul-grid5000-sw02",
- "vlans": {
- "vlan101": {
- "addresses": [
- "172.17.191.253"
- ],
- "administrative": true
- }
- },
- "warranty": "expired",
- "weathermap": {
- "use_cacti": "yes"
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index da02977b89063b6941a0e86750ea204d71862029..62e58cf8dc236b629af046749e7d65cb48b940cc 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -136,7 +136,7 @@
"name": "enp1s0f0",
"network_address": "gemini-1.lyon.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-lyon",
+ "switch": "gw",
"switch_port": "ethernet1/1/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index f32ac42f9720ff3f4af968726fcfc0e9ad702581..2172eb717d141524c8057d56f289f015faba9cb9 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -136,7 +136,7 @@
"name": "enp1s0f0",
"network_address": "gemini-2.lyon.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-lyon",
+ "switch": "gw",
"switch_port": "ethernet1/1/2",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index ecef64440f916f4845718d0d48f7985399293055..c10174110059c913d7e8492b1955800ad86ac280 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -1,87 +1,108 @@
{
+ "alias": [
+ "force10-adm",
+ "staurus",
+ "sorion",
+ "shercule"
+ ],
"backplane_bps": 1280000000000,
+ "ip": "172.17.63.253",
"kind": "switch",
"linecards": [
{
"kavlan_pattern": "%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/1",
"uid": "taurus-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/2",
"uid": "taurus-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/3",
"uid": "taurus-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/4",
"uid": "taurus-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/5",
"uid": "taurus-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/6",
"uid": "taurus-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/7",
"uid": "taurus-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/8",
"uid": "taurus-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/9",
"uid": "taurus-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/10",
"uid": "taurus-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/11",
"uid": "taurus-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/12",
"uid": "taurus-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/13",
"uid": "taurus-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/14",
"uid": "taurus-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/15",
"uid": "taurus-15"
},
{
@@ -89,171 +110,202 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/17",
"uid": "orion-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/18",
"uid": "orion-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/19",
"uid": "orion-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/20",
"uid": "orion-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/21",
"uid": "hercule-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/22",
"uid": "hercule-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/23",
"uid": "hercule-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 0/24",
"uid": "hercule-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/25",
"uid": "nova-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/26",
"uid": "nova-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/27",
"uid": "nova-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/28",
"uid": "nova-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/29",
"uid": "nova-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/30",
"uid": "nova-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/31",
"uid": "nova-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/32",
"uid": "nova-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/33",
"uid": "nova-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/34",
"uid": "nova-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/35",
"uid": "nova-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/36",
"uid": "nova-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/37",
"uid": "nova-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/38",
"uid": "nova-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/39",
"uid": "nova-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/40",
"uid": "nova-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/41",
"uid": "nova-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/42",
"uid": "nova-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/43",
"uid": "nova-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/44",
"uid": "nova-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/45",
"uid": "nova-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/46",
"uid": "nova-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/47",
"uid": "nova-23"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 0/48",
"uid": "castor"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 0/49",
"uid": "pollux"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 0/50",
"uid": "procyon"
},
{
@@ -277,7 +329,8 @@
{
"kind": "router",
"port": "0:25",
- "uid": "gw-lyon"
+ "snmp_name": "fortyGigE 0/60",
+ "uid": "gw"
}
],
"rate": 10000000000,
@@ -285,26 +338,11 @@
}
],
"model": "Force10 S4810",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"serial": "FGSN9T1",
"site": "lyon",
"snmp_community": "public",
"type": "network_equipment",
"uid": "force10",
- "vlans": {
- "vlan101": {
- "addresses": [
- "172.17.63.253"
- ],
- "administrative": true
- }
- },
- "warranty": "2017-07-01",
- "weathermap": {
- }
+ "warranty": "2017-07-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json b/data/grid5000/sites/lyon/network_equipments/gw.json
similarity index 82%
rename from data/grid5000/sites/lyon/network_equipments/gw-lyon.json
rename to data/grid5000/sites/lyon/network_equipments/gw.json
index b0803b88ee0c02f1e1d48dddb5a4e3da6952365f..c9e4c13a247433eabf67cfa3866192e5cafe0953 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -1,5 +1,11 @@
{
+ "alias": [
+ "gw-lyon",
+ "router",
+ "sgemini"
+ ],
"backplane_bps": 960000000000,
+ "ip": "172.16.63.254",
"kind": "router",
"linecards": [
{
@@ -7,18 +13,19 @@
{
"kavlan_pattern": "%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet1/1/1",
"uid": "gemini-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet1/1/2",
"uid": "gemini-2"
},
{
@@ -56,23 +63,24 @@
{
},
{
- "kind": "other",
- "port": "eno1",
+ "kind": "server",
+ "snmp_name": "ethernet1/1/20",
"uid": "albireo-a"
},
{
- "kind": "other",
- "port": "eno1",
+ "kind": "server",
+ "snmp_name": "ethernet1/1/21",
"uid": "albireo-b"
},
{
- "kind": "other",
- "port": "ens3f1",
+ "kind": "server",
+ "snmp_name": "ethernet1/1/22",
"uid": "alcor"
},
{
"kind": "switch",
"port": "2",
+ "snmp_name": "ethernet1/1/23",
"uid": "salome"
},
{
@@ -80,6 +88,7 @@
{
"kind": "switch",
"port": "0:60",
+ "snmp_name": "ethernet1/1/25",
"uid": "force10"
},
{
@@ -91,9 +100,8 @@
{
},
{
- "kind": "virtual",
- "port": "eth0",
- "site": "renater",
+ "kind": "backbone",
+ "snmp_name": "ethernet1/1/30",
"uid": "renater-lyon"
}
],
@@ -102,17 +110,12 @@
}
],
"model": "Dell EMC S4128F-ON",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"serial": "J9J1PK2",
"site": "lyon",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "gw-lyon",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
@@ -192,7 +195,5 @@
"name": "kavlan-13"
}
},
- "warranty": "2024-08-15",
- "weathermap": {
- }
+ "warranty": "2024-08-15"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index 07441c00bb51ffc623dc5e5ca36f1f12eb58a1f1..ad0667fc28adf688278c83e568392e040715492c 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -1,5 +1,9 @@
{
+ "alias": [
+ "ssagittaire"
+ ],
"backplane_bps": 136000000000,
+ "ip": "172.17.63.250",
"kind": "switch",
"linecards": [
{
@@ -14,13 +18,15 @@
{
"kind": "router",
"port": "0:23",
- "uid": "gw-lyon"
+ "snmp_name": "ethernet 2",
+ "uid": "gw"
},
{
},
{
"kind": "other",
"port": "eth1",
+ "snmp_name": "ethernet 4",
"uid": "sw-admin"
},
{
@@ -58,111 +64,133 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 21",
"uid": "sagittaire-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 22",
"uid": "sagittaire-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 23",
"uid": "sagittaire-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 24",
"uid": "sagittaire-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 25",
"uid": "sagittaire-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 26",
"uid": "sagittaire-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 27",
"uid": "sagittaire-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 28",
"uid": "sagittaire-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 29",
"uid": "sagittaire-12"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 30",
"uid": "sagittaire-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 31",
"uid": "sagittaire-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 32",
"uid": "sagittaire-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 33",
"uid": "sagittaire-16"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 34",
"uid": "sagittaire-17"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 35",
"uid": "sagittaire-18"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 36",
"uid": "sagittaire-19"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 37",
"uid": "sagittaire-20"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 38",
"uid": "sagittaire-24"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 39",
"uid": "sagittaire-27"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 40",
"uid": "sagittaire-29"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 41",
"uid": "sagittaire-30"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 42",
"uid": "sagittaire-31"
}
],
@@ -171,26 +199,11 @@
}
],
"model": "FESX448+2XG-PREM",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"serial": "FL37068284",
"site": "lyon",
"snmp_community": "public",
"type": "network_equipment",
"uid": "salome",
- "vlans": {
- "vlan101": {
- "addresses": [
- "172.17.63.250"
- ],
- "administrative": true
- }
- },
- "warranty": "expired",
- "weathermap": {
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index 52e05ec3af428bce7b4589bd5ec107390b50b142..0fe1a32051781737397dcf52ceaf06cd15ad388d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/39",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index 99aaab94eed2180debba6b4e03dec4a7946ed476..7cc402cc060f015bd2dfd861996a8d8e8a2fa42a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-10.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/44",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index ef8480c5d9b7bfcfd84a192bebe041abee1a0333..d4476fe3ad5fe91005613d224d0d1be72faed557 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-11.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/43",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index 936aca3d3a77184e1f1601a3b0b0c29d9b402c6b..8092c155d40b4cf9fd2d35c108a6089b78bd9d46 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-12.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/45",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index 0132aafe46c2598e9969fb217f122da1fa61a14b..9491a8e0408df18b55fad4de0da79a79a8a0ee16 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-13.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/41",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index 0a7d98f2acfe120977e139b6a01c60f2c56efdb2..ea0bc957ebd79f72828d2a1bb0a473fbcdb611d2 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/36",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index 46f003b7e42fe89f83eb516186622b2e22ffd89e..f5054d6f77d6b9270d140ab6e1154f968e80105a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/40",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index ceff78042a78c89384a15f86b17d17cc5c6299f1..5c6bc98f2a092e73a0810ef7da261612478c104a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/48",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index 8e965b1be8b2aa0ab30905457e051442677a705f..a0218f419eb9dd3a3c80ea0304a4a68bcdb86707 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/37",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index 3113e7dd4224bc19969afadd23610ca34a9b8e92..7d81cf0854dd080d88cb038c8cdde8588fca5e98 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-6.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/38",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index 5e7a3a55253e5789feff5f53f82666d62d8abfe6..c0d95eb8d9208c8561c234f5c0080e5974017989 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-7.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index 0a609d19d6c4de2a02c5b2ec1703fb0e3a6b842f..b3a8aa4231859aba383e2bf636f55b27bf9a815c 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-8.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/34",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index 3b4affe1c74a1b2ddd3dccee0529f43be4e128dd..d245ed87225f212c23167c2063916dff04990b8f 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -133,7 +133,7 @@
"name": "ens4f0",
"network_address": "graffiti-9.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/46",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
index 6a9cbfafa0b758adda1606953a5d1fd786b8223d..f04414c8fcdee59a7066629657260f34f4c85b83 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
index 070ba4353fdb9f7dd4f936f7aaa4ed9d19c01845..dd9995516fa2033a0aa773cbbafcb7804993b3ec 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-10.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/10",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
index 97199968a56e0db0ceba2a3f1b3b0a090071bc2a..cd825b0171fa6aa355eb2964382716f324fd98f0 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-11.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
index 0cbeb53147c7713cae74a4d0d37f1244964667c0..a40a28f1057ef62c65dd5d2f4469809840541481 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-12.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/12",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
index 0c719842aa45eb82b593146016abd5d419d2d28e..e4eff2dc471e4bb9e6baccbd080791a44055e2f7 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-13.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
index 20d028505a12ccbf47d4ec887090e39c4d1a33b9..db9918dacea9a9d73eb3b3d69f206280e957dfb9 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-14.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
index 5ccc07555d14fb77d7900146f65be4582108f5e7..b6a1bf5d68a243026141309bedb406936c155eda 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-15.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/15",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
index 53cc3cc9fadc07e806d23db670a55d4a918951cf..3910d1119e92bfac5abc9c53771de5335650a0e2 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-16.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/16",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
index 5d1d7af1b32dc19f6a722538d604fb5d82f9b395..ee1107f4563714c406462ac22bed5267f349901e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/2",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
index 77b124dd19704fbd08958858d4062812f07201e1..2beb6aa1190845059e17f9fb1100ae224a002d40 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/3",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
index a732c603a2c0632f095432c3bba0d781f5efd32e..8827ed3547e7abce62dfaab5cc29dcefe4c8a331 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/4",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
index 54aecc529155fb29be400f3007dd80d95d07d1f7..894e54db6fe289230cf12ae18f1383f4d4db661c 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/5",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
index 5d1165ffe32034cf83b1e09b6fdfc12414b5aee7..11df9be1a9be1c9520abd04c4a8c1794c7644a07 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-6.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/6",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
index 53e427044d0cdf860763a9cc416bb264b8a2d925..962a2dde41433fb45352bf0ced619f149e2217e1 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-7.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/7",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
index e92efb173faee12a507508cb84e78561cca3257d..bff64786971deec33a2867ac6d1a0e23aa443964 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-8.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/8",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
index deb49f82ee1cd5a5a9a391ed95c7683e38d81a00..c56cdc276f25edab684480d2fefe315b118188ad 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "graoully-9.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/9",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
index 972bce04dfb066ced6ad00381727b2cb5beff352..bd0b47884a233eab451029ba6cc4f0453a53b50d 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "graphique-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/25",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
index 15a90b46971a08390e0dcef46b39d5b827014d79..2c8b175c24626b9e3646521176388db916fd57e6 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "graphique-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/24",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
index c392b38364b1a770f05b52bd6a91007c007e1bd2..39306425ef9f0e856ec0272a5aa4695e5b4714d3 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "graphique-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/23",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
index d01dae5d2330d0582c72a9fb19f68ddd6ce726d2..f5e2fdf3679be82f035138aedec6376106d8a478 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "graphique-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/21",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
index e2a80887d9bea7fab5e40f4ffc67ca4da6f3a8d6..f8ec68b1c9ca7e10f555f1d3d06059e4e6eaeb12 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "graphique-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/22",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
index dca6e84d88b4973bef657723ac679a071f2580f8..9cfd4f6b79305e9ea88984bf972c94dcd1d61d62 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "graphique-6.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/26",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
index a04aa2feb1e634dd77a382b1c5c8d1627b57235e..5218d4c00cd34ff6dceb55725d1be8b3e3013a49 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
@@ -72,7 +72,7 @@
"name": "eno1",
"network_address": "graphite-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
index 32de29b523e9cb341759ca540e0136402e35796b..e092e5ce1e0a0a020055646a280220a82421d1b8 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
@@ -72,7 +72,7 @@
"name": "eno1",
"network_address": "graphite-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/18",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
index 22f6b67d2c7938c8fce5556e8115679cf91960ee..6683126d2463f3294244cc08bf556582d2e2e25c 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
@@ -72,7 +72,7 @@
"name": "eno1",
"network_address": "graphite-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/19",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
index 53526864681c81fd65b6e2cf96c336713b1d292d..20422a18c4581729c03eefa1298c6945f205b803 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
@@ -72,7 +72,7 @@
"name": "eno1",
"network_address": "graphite-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/20",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
index 21de5466f89f067e45fc6949f630f2b54afde38e..f5157186b775706bc30337367c8c5a7abc401c9f 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-1.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/47",
+ "switch_port": "GigabitEthernet1/0/47",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
index f50f6c641b24ff57def14d802fd479933e78580b..904ba80a11cc4732c70a90affe1892982b42d17c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-10.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/44",
+ "switch_port": "GigabitEthernet1/0/44",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
index 60e35dc3e18f49471c9f297f1dcba82d6dd40d49..80116a68a4a6d825c62edcc69ef5e8002327b6ab 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-11.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/5",
+ "switch_port": "GigabitEthernet1/0/5",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
index 06e91bcb0dd873c288abaa38a4558e3c59486149..158f9b334dca5005b32714d95afac045a4dc0264 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-12.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/6",
+ "switch_port": "GigabitEthernet1/0/6",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
index 4b77134e6dd9f508a435f0c1861c75ceb46ef0fd..fb4728e83c7c603aa87f0cdf859a59a05eb8beb8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-13.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/41",
+ "switch_port": "GigabitEthernet1/0/41",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
index 0c3c4a7657eb3c65490ef1d3352667148873f203..a55183dd64649a1d5d29ea4e36be1e67a2f8e2e6 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-14.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/42",
+ "switch_port": "GigabitEthernet1/0/42",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
index fcf0bffd401ed93ec84b3c616a7531ee15b04c79..8b08d996e9d9a14d131f2188e50a77e04f4d3ede 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-15.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/7",
+ "switch_port": "GigabitEthernet1/0/7",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
index 134b4eadbf0b8b0abe83597a0a4e74886d14d9fe..9d871969328bc95c45bd0fee27c13b7c76b88c1a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-16.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/8",
+ "switch_port": "GigabitEthernet1/0/8",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
index bd339528419eb70120a12d1e9f92cdc954c5b67e..4e0b65031d8a68675258ac8682af19eaaca30cee 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-17.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/39",
+ "switch_port": "GigabitEthernet1/0/39",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
index d626eb355fa25061320b50da33dbc2f6549e86da..4ba36aec9d21ee9fee5872aafb7e457ad006800c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-18.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/40",
+ "switch_port": "GigabitEthernet1/0/40",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
index a0339b2e8edbfdf45f225703ccb7ba5941010af2..0514dd47234f783ad727141f738a7402489a7ac8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-19.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/9",
+ "switch_port": "GigabitEthernet1/0/9",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
index d5af2e5b6010bf7dc11e14c28357956e93465cec..61ef2a3efaa2a7d9e5697680e2aa1471755559aa 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-2.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/48",
+ "switch_port": "GigabitEthernet1/0/48",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
index f2c6bca82e05c060b9a5ce13a756274051af1300..6f87ed8370aa13c311326f5ef71081e28a750105 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-20.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/10",
+ "switch_port": "GigabitEthernet1/0/10",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
index 252f9e58d555e04c2549b2c1304b13d9e361f510..d185fb05d82a8d68a42dfbb6779bb5089fe80a8c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-21.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/37",
+ "switch_port": "GigabitEthernet1/0/37",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
index 049a1ae0f3254dd5f04d8bc700a125b3b1f504b6..0a411fe2d253564f7fb3de5f11b2e316780527a6 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-22.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/38",
+ "switch_port": "GigabitEthernet1/0/38",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
index 3c56f50b3645dd9118ca4d00ee06eb083eca576e..185569ca8477e404fdb9a0f2ea602032258a84b6 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-23.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/11",
+ "switch_port": "GigabitEthernet1/0/11",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
index 453303c52ca6f1767371c0fba7fd66e2f1771d0c..e6a6ded26f8d7a47c42fdd129c7e99d569deedd5 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-24.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/12",
+ "switch_port": "GigabitEthernet1/0/12",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
index 4b42f29ddf741bfd8f646e85e3f543c95982e114..1a7517e1e6918f4d95b18817385b413f19a45665 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-25.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/35",
+ "switch_port": "GigabitEthernet1/0/35",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
index 9fcb5ff77b8dbdc005580b293d0bf8205471f210..03325ea8848a645c29c3f3af9aabc83f91cebd7b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-26.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/36",
+ "switch_port": "GigabitEthernet1/0/36",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
index 8d02c3daa28f64f02571fb8267d44d25f16d53c1..2eaf8c802728953f1cc59eb764637f211e49ece0 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-27.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/13",
+ "switch_port": "GigabitEthernet1/0/13",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
index 45a6c8550f536488db3161d183832c3cd7fa74d4..ac55dd3a001348da17ff8a3f0a5be899117db4df 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-28.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/14",
+ "switch_port": "GigabitEthernet1/0/14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
index ff65a8854e8a0253fc587afef84d77aefbb7860b..08e50be5ba86a5a9fef3c479a58cde217215bb29 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-29.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/33",
+ "switch_port": "GigabitEthernet1/0/33",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
index 708ab8960b3080d2f2b01827b131a6f4281125f9..43c589d3529af66ffdf64bc03429d1471696ab7d 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-3.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/1",
+ "switch_port": "GigabitEthernet1/0/1",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
index b3942fd32b8124809a222531ac867915f63d544b..ee04d35bbeacc71faa18218c4dd7434461b1e9ae 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-30.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/34",
+ "switch_port": "GigabitEthernet1/0/34",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
index 615a544ce45e3536adb452fa225b4e302d25f93f..21cb7c6ccdf170d754583d4bc66ae2b63566140a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-31.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/15",
+ "switch_port": "GigabitEthernet1/0/15",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
index 17cfa684f8296520e3e499af42e341801e70981e..e2b4e731d69000390195f26360e250c27fb90e63 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-32.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/16",
+ "switch_port": "GigabitEthernet1/0/16",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
index a336e031393035cb857cb5819d90b00b9b42ee37..258580e94144b6e22df4b84dd147f9dc36d0a670 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-33.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/31",
+ "switch_port": "GigabitEthernet1/0/31",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
index b7f1df315e4548406b12b2341f49fe5347f72f65..6c683347f60109d61501340237343c5697016532 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-34.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/32",
+ "switch_port": "GigabitEthernet1/0/32",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
index 0fd8d368d61b138c635dcec7f2ae0bdd3bb09c4a..04ac31c82d0f180a0734451dc3e0da0eb100aad3 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-35.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/17",
+ "switch_port": "GigabitEthernet1/0/17",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
index 2746ee52f82bdf413d22fc26027bd94049e4aa1b..feb7d07f761bfa9ab09c1031af80392bcb071c9e 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-36.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/18",
+ "switch_port": "GigabitEthernet1/0/18",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
index 5c09a67dd7fb4ab10bbe298d665c4f6e7c6cb2a9..1bdb65dae4fad2bdc61d98741bea6c6268c4263e 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-37.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/29",
+ "switch_port": "GigabitEthernet1/0/29",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
index 16f3a7a8b18456162ab35769e351084aad6cf694..a0a568716c16e174f7ae0fbd7d0198bfaf48587d 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-38.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/30",
+ "switch_port": "GigabitEthernet1/0/30",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
index 401247208966021afaae46a49371febfc4f1075b..d18317e02f2c654706c93ec9be96ee3219fc1873 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-39.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/19",
+ "switch_port": "GigabitEthernet1/0/19",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
index 6a267a738a5c38c0e3f21f1ea9860371872ceab6..1eabd248f68222d11a89b13ae6e1f205c12d2d48 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-4.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/2",
+ "switch_port": "GigabitEthernet1/0/2",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
index 0ee71cabd68b7ecae1cfebe487e9051c277ace06..52b13e37e7116245f80332d4ec56dec66b4d77e4 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-40.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/20",
+ "switch_port": "GigabitEthernet1/0/20",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
index 6ca3b1c3fe5f4b478fb09dfab662c645acdee3bf..c9d858217a742cdaae00b65fe42ce6c87f4fcd4b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-41.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/27",
+ "switch_port": "GigabitEthernet1/0/27",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
index 6c2135f835013f99b3e9fb4e189e744da8d19b11..70892ae16eb26e4529f00412181e3e71de25124f 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-42.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/28",
+ "switch_port": "GigabitEthernet1/0/28",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
index 174b59a0a526185ef20e3e54ea5ec9a0d1b4e7da..8d658ec5314ae3362c93f3c91ea40ed1a0d01af7 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-43.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/21",
+ "switch_port": "GigabitEthernet1/0/21",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
index 3a0dd0e02be3edbe46ab05a5e5776ab0f0d3168f..754a4f4a978bd498b006ef1e8e8e9ce11ffdb999 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-44.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/22",
+ "switch_port": "GigabitEthernet1/0/22",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
index 4891ac2a1938aea4b341dccc6c852c6d583a0ca1..639bf7d1f0152b6285911b310825038b09d5f866 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-45.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/25",
+ "switch_port": "GigabitEthernet1/0/25",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
index 67006f9fe6f570019f6043e307c974923865a37d..a46ea766b9f1b3298ab5dfbd2d63a3479ff1479b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-46.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/26",
+ "switch_port": "GigabitEthernet1/0/26",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
index 2ede002927df7111f0246e25f87905fa4ac4725b..4f0457b4f5b8079387a921a8622260f487243fdc 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-47.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/23",
+ "switch_port": "GigabitEthernet1/0/23",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
index b3f6799e782ed39a0457aef45399757376f8bb91..cce981456eda76463e96a2065445fb1013de36c7 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-48.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/24",
+ "switch_port": "GigabitEthernet1/0/24",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
index cc857768f6f0e4a68be187a5d8c267de121d6971..3098d7c00a92156b680139bb6e484c98fc681432 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-5.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/45",
+ "switch_port": "GigabitEthernet1/0/45",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
index fb89f32a945a35e23bfc4af586360503f3f0874d..0ceb46a3566bb7e8ee083c8fcd0a4b4d22c839f8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-6.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/46",
+ "switch_port": "GigabitEthernet1/0/46",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
index 23746493b768017d43eab49629acf03374f37b78..cbd2de6f09a41a8c8a567304064615bb29b719cc 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-7.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/3",
+ "switch_port": "GigabitEthernet1/0/3",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
index 4597675e2f881ffbbabdabff6faa16ae86415623..c9b925beed6f1891ec28b8f2c259aca73b1239d9 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-8.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/4",
+ "switch_port": "GigabitEthernet1/0/4",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
index f4049c605e07c7e0573dcdac9d71656db3ba161d..3a49f1152c4248a683eb48d12593d8d7c89269ff 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
@@ -63,7 +63,7 @@
"network_address": "grcinq-9.nancy.grid5000.fr",
"rate": 1000000000,
"switch": "sgrcinq",
- "switch_port": "GigabitEthernet 1/0/43",
+ "switch_port": "GigabitEthernet1/0/43",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
index c4948223a3955e03e788f1a8d52cf588036b5a4a..499cb13de5b3b6378bb593c90786aac52f95d4b9 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
index d2770d603c369bff3e084e788aef8120aea73c61..e1c5f675784049d09c8c93be705a6c814b4a867a 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-10.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/10",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
index 6e76c709bd7493bcfdf080f246031cc7903339b3..46174b5cbdfe747ac88dc2edb50899deda88e626 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-11.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
index 64a33ca873177e061223c9fcfb369c869109eed9..f232f05d9dae308547c9057286bd802ee546d92c 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-12.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/12",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
index 0a902054ce725d1f7b90ba9f5fabf13192709f0c..93ee93a4e4696d4aea15cc24d31997d0e258d8fc 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-13.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
index 0e350f2ed02093dd9238c5cea885c39e0e2f5cea..20fcb68c106bc4f96000d942e67d214a723129a1 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-14.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
index c68c1be555882c418831db38defc96bb4139579b..b75d714d239db497a31c6c858d61755afaadda57 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/2",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
index 4f1f5be8467cd7e28e8afa254ed0be085996f3ce..bd51df05bc4eb66883501a4947b1bb7fa217ae05 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/3",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
index 960abbbc26484fbfd2c3aa360e9df292a2fb7082..11805906f07de7950a0e86405b0cc66a8c44152b 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/4",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
index 09bbf5c3c134ca60829e22e7d4f54b6ee708ba0c..134ca0026cd0148ade0d5763c5a268bed4008e91 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/5",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
index dfd3777b803b295440ba146bf7404f32db9b62fe..417b80fdf2963b42d54c1c82044e4f184d23c9fa 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-6.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/6",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
index f1724786b3b48874ead727ca9d1bafb1f9665388..2d14b954ec2be5aa967225459771c3d2f3ff964c 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-7.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/7",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
index 7ea6f846553c61ea6060eaa1f214ccbb858e633e..eea977b028d368caf4a75110f72e5c90feb12387 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-8.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/8",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
index eeae52d83656cf6d69deb48914b81aae616f81a5..3c48c49a70ee5efd0458e59802cbd9b02af6ebac 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "grele-9.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/9",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
index bd5c10007820554ce12e2d2ae8e4e62c094500bf..b6064200817e85b0f11a61d7b1a62fe815c06cb2 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "grimani-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/46",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
index 6843d3e2e5927f1e27be6bc0f66614aec57d0bd8..5ceba43d802ff439f43834fd178e4cc5e42e2e77 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "grimani-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/47",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
index 31572f8bf1f48ff0dfa9d00eea0245fb06286766..3a92a80cad78d6796ea69c5d1e8075100797407d 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "grimani-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/48",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
index a2f8451601a8bed56955688dd296578077f9dde7..b7f691c6bdaa9a421d0072fa9364f921dcfa63f7 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "grimani-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/43",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
index 738b5e617635d92a0a7a3ae49a8f09dcd9d8aa9a..26d3ec7b6f125f739916df3d1a5d626778ebca88 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "grimani-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/45",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
index 76fdb4a2a62a6cac793838799b6d9168c788b8c3..db9a177fcb3cd7113e737d85257f61f2cb3f808f 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
@@ -83,7 +83,7 @@
"name": "eno1",
"network_address": "grimani-6.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/44",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index 96e5a5814d69935626e5a88839683c842e2125f1..4e38f7acc7f59deadf0f8d8d85b3da12cc84f299 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/41",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-1-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/41",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-1-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/41",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-1-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/41",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index 7fc6307d61b074c34e125310c3134b0b3a28b273..b5edb9c8f133ca6fb8868f3c01cf60d3925ea02f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/42",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-2-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/42",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-2-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/42",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-2-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/42",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index f7bd0385c0204e0915b46a04ac61650be2cab9b0..814a1ea574eaa77ba3a1986fd829fac5fac6a831 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/43",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-3-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/43",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-3-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/43",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-3-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/43",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index eabd0d3cec04d5afabf610f7c2e0e37291e88d1e..6ad71744108ef2d093244d7922ed2d33f76b5881 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/44",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-4-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/44",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-4-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/44",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-4-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/44",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index 6d2e3f3ca7247118027ad9ec743ffe2aa1023bff..f65b49f1707efd97e88b57eefed571dd270ffa11 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/45",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-5-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/45",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-5-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/45",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-5-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/45",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index 599c615f6723078ac3e65079bafb3a56051fe95e..2f1fc7c086e3da8c380352ba2f297159c49d1769 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-6.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/46",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-6-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/46",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-6-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/46",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-6-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/46",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index 635537d637925363c2238cafee6d2786b7382975..721b84af6d34cc6705044fbb14a5bcc155374f78 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-7.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/47",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-7-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/47",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-7-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/47",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-7-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/47",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index f9bc62e9c55bc2a00a8703d60e32169f2f4d4cf8..915930b45d0efadf4dc2b59d5001dcf3c38e42e6 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grimoire-8.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/48",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grimoire-8-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/48",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grimoire-8-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/48",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grimoire-8-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/48",
"vendor": "Intel"
},
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 67131927d7d8a3b954baaf2cae3c05d8bd2b00f1..954182bd428d057fb56169dc6eb0a4af2bb11e63 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/1",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-1-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/1",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-1-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/1",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-1-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/1",
"vendor": "Intel"
},
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 cd355c14b39cf130c715b91f5302a3fa75a1f351..6158994e48ae5c1b56a886b49485d3a012dc7b85 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-10.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/10",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-10-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/10",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-10-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/10",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-10-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/10",
"vendor": "Intel"
},
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 27a8bb9a5af3ae771a6f159b23707ee13978a671..a36aa3dac84ac39b4331e0c6019a746446134075 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-11.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/11",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-11-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/11",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-11-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/11",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-11-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/11",
"vendor": "Intel"
},
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 7b20b2a2056800f73352b03439c474fad0a6b03e..c7211d94088205f01099941a6e15eb01588a62d0 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-12.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/12",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-12-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/12",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-12-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/12",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-12-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/12",
"vendor": "Intel"
},
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 219d956381100231d37c2ca066559beeb8d92dba..c615d02f4f3bfef334c47f5f4e196c5bededb0f4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-13.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/13",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-13-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/13",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-13-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/13",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-13-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/13",
"vendor": "Intel"
},
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 9badef8c9f1c251768c597cb8a73e0071aaf599f..b01658ad9e14be89b998a15597c0b4d87533b114 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-14.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/14",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-14-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/14",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-14-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/14",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-14-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/14",
"vendor": "Intel"
},
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 94817d1bd4b9e680a590d9e681e55ecbc0ce3299..e47c49f35bfa911e81f52c5a4bf61473a09896e0 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-15.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/15",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-15-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/15",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-15-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/15",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-15-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/15",
"vendor": "Intel"
},
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 a4accebb8ed73b27561a7a62052fe8a7e2817671..fc5779621ae1b0d8dbda859b6898058a6e68ca33 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-16.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/16",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-16-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/16",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-16-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/16",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-16-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/16",
"vendor": "Intel"
},
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 85c6aef0544d5479bbef5c4ea66de548916b2ee0..7a5d1fc4555063d41fb446d02814a4b6daee1d33 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-17.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/17",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-17-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/17",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-17-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/17",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-17-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/17",
"vendor": "Intel"
},
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 f60e10b94c789e0f9a1889d2acea48621f0bf59c..53aa9ad5aaf000d6d17452f9fce6b888fab39960 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-18.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/18",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-18-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/18",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-18-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/18",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-18-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/18",
"vendor": "Intel"
},
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 3540e9d34fb78c58765c758dfeb5635904f58af7..780af9b10eca8dccd48bce630577d31f1c59d47b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-19.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/19",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-19-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/19",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-19-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/19",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-19-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/19",
"vendor": "Intel"
},
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 16fef93cbfa0b3737de5cff5d3a2ef43734c3698..8d8c0d48fabd0037f0cc93608d8f076975d7248c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/2",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-2-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/2",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-2-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/2",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-2-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/2",
"vendor": "Intel"
},
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 14a2910a8f21ff6a1f95c8e55cb8e296076f3dd1..54599f6b7cd6670adfa86bd19ee88433a4e728d5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-20.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/20",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-20-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/20",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-20-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/20",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-20-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/20",
"vendor": "Intel"
},
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 6fb165671b050699a4825cb1c16eaf2320d01c6b..9cf63ee8d88108fe68c032e93feb499168c84761 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-21.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/21",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-21-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/21",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-21-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/21",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-21-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/21",
"vendor": "Intel"
},
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 ee43be2d9cddd170756617450ad664412fa18771..85b25d2177664e2cd898fb176d4544587f025b3a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-22.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/22",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-22-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/22",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-22-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/22",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-22-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/22",
"vendor": "Intel"
},
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 7db193e9daee93412be914d051ed845b5143e5ae..405b17267065ad5203075b843f2ff3ae5165b284 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-23.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/23",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-23-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/23",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-23-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/23",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-23-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/23",
"vendor": "Intel"
},
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 07272841679b55377ca9cca3cc9a2d4a943289e9..152bb72741f8ad034309fca8395467ede85340ae 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-24.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/24",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-24-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/24",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-24-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/24",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-24-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/24",
"vendor": "Intel"
},
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 61a9ff1ac617dc71798c220627d4e8a0a306557c..51fef57522f07a01712efb73375bd4e132a96ae2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-25.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/25",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-25-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/25",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-25-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/25",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-25-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/25",
"vendor": "Intel"
},
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 3130fea90ea8b85a15ca42de1787d801e207bc26..1d708a8eb409abb054c394f8b8c43e486a1f5771 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-26.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/26",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-26-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/26",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-26-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/26",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-26-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/26",
"vendor": "Intel"
},
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 f34c5e5b1e0f545f909b881a94ed59196eca6ff3..5d829e61f413a073e13340e65b299bb478065e5d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-27.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/27",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-27-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/27",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-27-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/27",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-27-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/27",
"vendor": "Intel"
},
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 05fed3f44e80b54cf3b135842b9c955797d250f1..828aed2197a2b85b1dccf1597b193e053ec6036e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-28.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/28",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-28-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/28",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-28-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/28",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-28-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/28",
"vendor": "Intel"
},
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 957afa65be0e2a57d73f1b675c23c56b74b2b08d..dd9037fa17136f9975939f9983c55530906b20b6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-29.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/29",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-29-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/29",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-29-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/29",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-29-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/29",
"vendor": "Intel"
},
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 75e4ae2fd55fdbecfae8ca7ec6a38f53b47886ea..eed47eacea64fec9f15cc6e1a273c0ede79fcfdc 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/3",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-3-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/3",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-3-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/3",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-3-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/3",
"vendor": "Intel"
},
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 b4478a747740080791e334c8c8239f2960890cc4..5dcf1233105df71048c3b4875c52779a689eb763 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-30.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/30",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-30-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/30",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-30-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/30",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-30-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/30",
"vendor": "Intel"
},
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 65a0dfef7b2d948791ad89cf8b7976010f965133..b26cac1f46e17bf24a6deafedda7aa7eb0b64072 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-31.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/31",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-31-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/31",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-31-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/31",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-31-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/31",
"vendor": "Intel"
},
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 1088053f332c66199567a2285d68d5cc4626ce1b..c2eadcff28613c267caa7ba8cc3836cc39d46d6b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-32.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/32",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-32-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/32",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-32-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/32",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-32-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/32",
"vendor": "Intel"
},
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 4989e57c904e41fa03486cab66b737c654cf500a..1659289575d44386faf9458fc89a5f3634ac3873 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-33.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/33",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-33-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/33",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-33-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/33",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-33-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/33",
"vendor": "Intel"
},
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 5a0b7260bb28f6da3f74ec9d91fb607a2a7eeff0..3ab9cc1eacf55c72231a9ae7350988dcedfb0767 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-34.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/34",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-34-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/34",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-34-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/34",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-34-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/34",
"vendor": "Intel"
},
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 5b2a0fcbd7652cc02902f9415885202fe03481ad..b076277d584d0f7897a42f1d0c969c2a629468e7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-35.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/35",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-35-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/35",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-35-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/35",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-35-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/35",
"vendor": "Intel"
},
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 f849023747860ac2be99d921834ccc8a5de713f1..df9cf6dee5ede2d4b6c93aeac1479a7140f9085e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-36.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/36",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-36-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/36",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-36-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/36",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-36-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/36",
"vendor": "Intel"
},
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 2a64b9efbf4b3efbd01a385f7e7246ee7a4e4444..3cdb4f3c27c89e9801cb05c1646edcbbd11c86f8 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-37.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/37",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-37-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/37",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-37-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/37",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-37-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/37",
"vendor": "Intel"
},
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 85e4103be66290a421cfaa4056f760f08509acad..72f9c2114389138d5bfc6d28d0cc4b7c4c329997 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-38.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/38",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-38-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/38",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-38-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/38",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-38-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/38",
"vendor": "Intel"
},
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 43a055f9ee9f774ca0ba7915203487bd747b2e0b..25675769df447b7bf6ebce08185f44ef7a2f38ab 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-39.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/39",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-39-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/39",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-39-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/39",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-39-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/39",
"vendor": "Intel"
},
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 0002cd9fa76256e1afdb74b8299f7942f6964d95..6df38cb7214ca55a540ffe3f4de535379368bd93 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/4",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-4-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/4",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-4-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/4",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-4-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/4",
"vendor": "Intel"
},
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 e45780fedce5bbebe4566a7d949e2eb7ee4aa78b..ee67db59590fd17142e8c2e4331710d8ae7a9406 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-40.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/40",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-40-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/40",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-40-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/40",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-40-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/40",
"vendor": "Intel"
},
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 01a7e78db73a63f6133efffdfa6111b54f7bfa4f..1834bf8d08a063b30811e818209b5430e33386f2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-41.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/27",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-41-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/1",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-41-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/2",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-41-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/3",
"vendor": "Intel"
},
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 d14ee9c7d4f928ff11b039843d9c89f898f6e16a..fde670e0cc337a62f461a90149f3626de3db0bb7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-42.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/28",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-42-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/4",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-42-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/5",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-42-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/6",
"vendor": "Intel"
},
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 093e2eedc8e6cc0d8715013413ebfe6ea93cf9e5..8c9f2cede23ad25b957317303c51cd55633d75a5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-43.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/29",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-43-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/7",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-43-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/8",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-43-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/9",
"vendor": "Intel"
},
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 757e3b1e7250ab9f359e6694210eb65898e12a6f..67df3d55ec651843b226a4cd90ad75eab86dd2bb 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-44.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/30",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-44-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/10",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-44-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/11",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-44-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/12",
"vendor": "Intel"
},
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 6c2b54f6f29615f762f2c0d0d7df2e3ed356e1a0..44aea5b11f20653d311218769a142fe170a29e59 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-45.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/31",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-45-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/13",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-45-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/14",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-45-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/15",
"vendor": "Intel"
},
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 90e04c790e59560d7476dc964bff4f9c57ad8dbb..941a59cc071af24bd68b5e6f41a4fd10858c0532 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-46.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/32",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-46-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/16",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-46-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/17",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-46-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/18",
"vendor": "Intel"
},
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 9c8a4ef4f5006ce79f2ccdd2f7a5981c357694dc..d3a02bce42aad308fab554213ecef7557039e3a6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-47.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/33",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-47-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/19",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-47-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/20",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-47-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/21",
"vendor": "Intel"
},
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 cc9eb37f0b13c7995233c7afdfae0a65d2a9e641..65c81044de0db89ea78186b338648986e5d84654 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-48.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/34",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-48-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/22",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-48-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/23",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-48-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/24",
"vendor": "Intel"
},
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 02e790055ad81c973d4f66b2b6a8628da799778d..210e3443770c17e2ff7ff1acf18659d3c74ae104 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grisou-49.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/35",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grisou-49-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/25",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp3s0f0",
"network_address": "grisou-49-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/26",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp3s0f1",
"network_address": "grisou-49-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/27",
"vendor": "Intel"
},
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 b4e40ecb1e11ad523043206cc75624fbd0fe7200..89d10b4dc581f89b9d5eac4409ac2e5b3cf48032 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/5",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-5-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/5",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-5-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/5",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-5-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/5",
"vendor": "Intel"
},
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 77a44dbda5818715f9383aea324ffe46efebc400..d8b427252f9648ebbabde5889e486f643cf4acf3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grisou-50.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/36",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grisou-50-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/28",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grisou-50-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/29",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grisou-50-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/30",
"vendor": "Intel"
},
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 2964cd6e8169e4ea3cab7d5b4eafe3fab4d3b3d9..ba50bbe89a8d1d9c3fb338ef6f1a55b9d3a72269 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -120,7 +120,7 @@
"name": "eno1",
"network_address": "grisou-51.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet1/37",
"vendor": "Intel"
},
@@ -140,7 +140,7 @@
"name": "eno2",
"network_address": "grisou-51-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/31",
"vendor": "Intel"
},
@@ -160,7 +160,7 @@
"name": "enp129s0f0",
"network_address": "grisou-51-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/32",
"vendor": "Intel"
},
@@ -180,7 +180,7 @@
"name": "enp129s0f1",
"network_address": "grisou-51-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet6/33",
"vendor": "Intel"
},
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 67ba0824729f98b767a73163c225332497548011..ec5763cdbfecdb422b8b7776314f43ae9584e136 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-6.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/6",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-6-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/6",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-6-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/6",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-6-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/6",
"vendor": "Intel"
},
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 8073ab625b834b6c77bff8f1f8b9b5b7b51ac46f..088880b5cc27975be988148a3bb99b9a173a833d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-7.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/7",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-7-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/7",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-7-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/7",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-7-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/7",
"vendor": "Intel"
},
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 c2964a0065cdedcc4ebbdd8e1b057fb867850ef7..026bd843f53d5e863c3c361f292f8abcbfc2d5e8 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-8.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/8",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-8-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/8",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-8-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/8",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-8-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/8",
"vendor": "Intel"
},
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 7a2382a9e1472a597f4495b97504a02b892674d6..fe8371819952891b43578718babcbe6b67dc9fed 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -139,7 +139,7 @@
"name": "eno1",
"network_address": "grisou-9.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet2/9",
"vendor": "Intel"
},
@@ -159,7 +159,7 @@
"name": "eno2",
"network_address": "grisou-9-eth1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet3/9",
"vendor": "Intel"
},
@@ -179,7 +179,7 @@
"name": "enp3s0f0",
"network_address": "grisou-9-eth2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet4/9",
"vendor": "Intel"
},
@@ -199,7 +199,7 @@
"name": "enp3s0f1",
"network_address": "grisou-9-eth3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet5/9",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index 89fd99c42463025ea2ae2e8d177ceb6071aeb86b..77bad7cbf7043fd771032d990158bb1a56d30d53 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -103,7 +103,7 @@
"name": "eno1",
"network_address": "grue-1.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/15",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index e11c4100d2ce72ccd99601cb3cd3edcdf0aad68d..6cfbe134df46192475d74f98b20c767cacd7fba1 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -103,7 +103,7 @@
"name": "eno1",
"network_address": "grue-2.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/16",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index 8ec568e7a553140606bbaad1458bb123091986c3..dca447be6b579e68fd18dd66fe6d504c628dc2a8 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -103,7 +103,7 @@
"name": "eno1",
"network_address": "grue-3.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index 88ba6e671ae5c5e0a804bfe5405d84340d9ad055..94dc83b8fa533ae3263140682b519f1e09da3136 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -103,7 +103,7 @@
"name": "eno1",
"network_address": "grue-4.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/18",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index cfdec1005d765bff0849f5957aad61e14fa06702..7f95dbf93fe3dfb04bb895ef0b0149850c848623 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -103,7 +103,7 @@
"name": "eno1",
"network_address": "grue-5.nancy.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nancy",
+ "switch": "gw",
"switch_port": "Ethernet7/19",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw.json
similarity index 74%
rename from data/grid5000/sites/nancy/network_equipments/gw-nancy.json
rename to data/grid5000/sites/nancy/network_equipments/gw.json
index 5ce440d2558797237053255b0ddcb0938ac6c57b..62250a58cae1c5a826d06f94fb42984bd151fb6a 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -1,5 +1,10 @@
{
+ "alias": [
+ "gw-nancy",
+ "sgravillon2"
+ ],
"backplane_bps": 1280000000000,
+ "ip": "172.16.79.254",
"kind": "router",
"linecards": [
{
@@ -7,7 +12,7 @@
{
"backplane_bps": 1280000000000,
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "other",
+ "kind": "node",
"model": "N9K-X9464PX",
"ports": [
{
@@ -15,204 +20,245 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/1",
"uid": "graoully-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/2",
"uid": "graoully-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/3",
"uid": "graoully-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/4",
"uid": "graoully-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/5",
"uid": "graoully-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/6",
"uid": "graoully-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/7",
"uid": "graoully-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/8",
"uid": "graoully-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/9",
"uid": "graoully-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/10",
"uid": "graoully-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/11",
"uid": "graoully-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/12",
"uid": "graoully-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/13",
"uid": "graoully-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/14",
"uid": "graoully-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/15",
"uid": "graoully-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/16",
"uid": "graoully-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/17",
"uid": "graphite-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/18",
"uid": "graphite-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/19",
"uid": "graphite-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/20",
"uid": "graphite-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/21",
"uid": "graphique-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/22",
"uid": "graphique-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/23",
"uid": "graphique-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/24",
"uid": "graphique-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/25",
"uid": "graphique-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/26",
"uid": "graphique-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/27",
"uid": "grisou-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/28",
"uid": "grisou-42"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/29",
"uid": "grisou-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/30",
"uid": "grisou-44"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/31",
"uid": "grisou-45"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/32",
"uid": "grisou-46"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/33",
"uid": "grisou-47"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/34",
"uid": "grisou-48"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/35",
"uid": "grisou-49"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/36",
"uid": "grisou-50"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/37",
"uid": "grisou-51"
},
{
},
{
- "kind": "other",
+ "kind": "server",
+ "snmp_name": "Ethernet1/39",
"uid": "srv"
},
{
- "kind": "other",
+ "kind": "server",
+ "snmp_name": "Ethernet1/40",
"uid": "srv2"
},
{
- "kind": "other",
+ "kind": "server",
+ "snmp_name": "Ethernet1/41",
"uid": "talc-data"
},
{
- "kind": "other",
+ "kind": "server",
+ "snmp_name": "Ethernet1/42",
"uid": "srv-data"
},
{
@@ -224,11 +270,13 @@
{
},
{
- "kind": "virtual",
+ "kind": "other",
+ "snmp_name": "Ethernet1/47",
"uid": "LORIA"
},
{
- "kind": "virtual",
+ "kind": "backbone",
+ "snmp_name": "Ethernet1/48",
"uid": "renater-nancy"
}
],
@@ -246,241 +294,289 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/1",
"uid": "grisou-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/2",
"uid": "grisou-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/3",
"uid": "grisou-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/4",
"uid": "grisou-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/5",
"uid": "grisou-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/6",
"uid": "grisou-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/7",
"uid": "grisou-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/8",
"uid": "grisou-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/9",
"uid": "grisou-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/10",
"uid": "grisou-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/11",
"uid": "grisou-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/12",
"uid": "grisou-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/13",
"uid": "grisou-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/14",
"uid": "grisou-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/15",
"uid": "grisou-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/16",
"uid": "grisou-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/17",
"uid": "grisou-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/18",
"uid": "grisou-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/19",
"uid": "grisou-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/20",
"uid": "grisou-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/21",
"uid": "grisou-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/22",
"uid": "grisou-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/23",
"uid": "grisou-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/24",
"uid": "grisou-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/25",
"uid": "grisou-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/26",
"uid": "grisou-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/27",
"uid": "grisou-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/28",
"uid": "grisou-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/29",
"uid": "grisou-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/30",
"uid": "grisou-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/31",
"uid": "grisou-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/32",
"uid": "grisou-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/33",
"uid": "grisou-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/34",
"uid": "grisou-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/35",
"uid": "grisou-35"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/36",
"uid": "grisou-36"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/37",
"uid": "grisou-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/38",
"uid": "grisou-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/39",
"uid": "grisou-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/40",
"uid": "grisou-40"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/41",
"uid": "grimoire-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/42",
"uid": "grimoire-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/43",
"uid": "grimoire-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/44",
"uid": "grimoire-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/45",
"uid": "grimoire-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/46",
"uid": "grimoire-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/47",
"uid": "grimoire-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/48",
"uid": "grimoire-8"
}
],
@@ -498,241 +594,289 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/1",
"uid": "grisou-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/2",
"uid": "grisou-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/3",
"uid": "grisou-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/4",
"uid": "grisou-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/5",
"uid": "grisou-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/6",
"uid": "grisou-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/7",
"uid": "grisou-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/8",
"uid": "grisou-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/9",
"uid": "grisou-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/10",
"uid": "grisou-10"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/11",
"uid": "grisou-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/12",
"uid": "grisou-12"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/13",
"uid": "grisou-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/14",
"uid": "grisou-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/15",
"uid": "grisou-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/16",
"uid": "grisou-16"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/17",
"uid": "grisou-17"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/18",
"uid": "grisou-18"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/19",
"uid": "grisou-19"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/20",
"uid": "grisou-20"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/21",
"uid": "grisou-21"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/22",
"uid": "grisou-22"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/23",
"uid": "grisou-23"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/24",
"uid": "grisou-24"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/25",
"uid": "grisou-25"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/26",
"uid": "grisou-26"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/27",
"uid": "grisou-27"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/28",
"uid": "grisou-28"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/29",
"uid": "grisou-29"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/30",
"uid": "grisou-30"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/31",
"uid": "grisou-31"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/32",
"uid": "grisou-32"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/33",
"uid": "grisou-33"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/34",
"uid": "grisou-34"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/35",
"uid": "grisou-35"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/36",
"uid": "grisou-36"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/37",
"uid": "grisou-37"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/38",
"uid": "grisou-38"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/39",
"uid": "grisou-39"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/40",
"uid": "grisou-40"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/41",
"uid": "grimoire-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/42",
"uid": "grimoire-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/43",
"uid": "grimoire-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/44",
"uid": "grimoire-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/45",
"uid": "grimoire-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/46",
"uid": "grimoire-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/47",
"uid": "grimoire-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet3/48",
"uid": "grimoire-8"
}
],
@@ -750,241 +894,289 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/1",
"uid": "grisou-1"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/2",
"uid": "grisou-2"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/3",
"uid": "grisou-3"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/4",
"uid": "grisou-4"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/5",
"uid": "grisou-5"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/6",
"uid": "grisou-6"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/7",
"uid": "grisou-7"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/8",
"uid": "grisou-8"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/9",
"uid": "grisou-9"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/10",
"uid": "grisou-10"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/11",
"uid": "grisou-11"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/12",
"uid": "grisou-12"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/13",
"uid": "grisou-13"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/14",
"uid": "grisou-14"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/15",
"uid": "grisou-15"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/16",
"uid": "grisou-16"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/17",
"uid": "grisou-17"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/18",
"uid": "grisou-18"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/19",
"uid": "grisou-19"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/20",
"uid": "grisou-20"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/21",
"uid": "grisou-21"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/22",
"uid": "grisou-22"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/23",
"uid": "grisou-23"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/24",
"uid": "grisou-24"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/25",
"uid": "grisou-25"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/26",
"uid": "grisou-26"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/27",
"uid": "grisou-27"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/28",
"uid": "grisou-28"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/29",
"uid": "grisou-29"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/30",
"uid": "grisou-30"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/31",
"uid": "grisou-31"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/32",
"uid": "grisou-32"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/33",
"uid": "grisou-33"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/34",
"uid": "grisou-34"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/35",
"uid": "grisou-35"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/36",
"uid": "grisou-36"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/37",
"uid": "grisou-37"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/38",
"uid": "grisou-38"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/39",
"uid": "grisou-39"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/40",
"uid": "grisou-40"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/41",
"uid": "grimoire-1"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/42",
"uid": "grimoire-2"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/43",
"uid": "grimoire-3"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/44",
"uid": "grimoire-4"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/45",
"uid": "grimoire-5"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/46",
"uid": "grimoire-6"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/47",
"uid": "grimoire-7"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet4/48",
"uid": "grimoire-8"
}
],
@@ -1002,241 +1194,289 @@
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/1",
"uid": "grisou-1"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/2",
"uid": "grisou-2"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/3",
"uid": "grisou-3"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/4",
"uid": "grisou-4"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/5",
"uid": "grisou-5"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/6",
"uid": "grisou-6"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/7",
"uid": "grisou-7"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/8",
"uid": "grisou-8"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/9",
"uid": "grisou-9"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/10",
"uid": "grisou-10"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/11",
"uid": "grisou-11"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/12",
"uid": "grisou-12"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/13",
"uid": "grisou-13"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/14",
"uid": "grisou-14"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/15",
"uid": "grisou-15"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/16",
"uid": "grisou-16"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/17",
"uid": "grisou-17"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/18",
"uid": "grisou-18"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/19",
"uid": "grisou-19"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/20",
"uid": "grisou-20"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/21",
"uid": "grisou-21"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/22",
"uid": "grisou-22"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/23",
"uid": "grisou-23"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/24",
"uid": "grisou-24"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/25",
"uid": "grisou-25"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/26",
"uid": "grisou-26"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/27",
"uid": "grisou-27"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/28",
"uid": "grisou-28"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/29",
"uid": "grisou-29"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/30",
"uid": "grisou-30"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/31",
"uid": "grisou-31"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/32",
"uid": "grisou-32"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/33",
"uid": "grisou-33"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/34",
"uid": "grisou-34"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/35",
"uid": "grisou-35"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/36",
"uid": "grisou-36"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/37",
"uid": "grisou-37"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/38",
"uid": "grisou-38"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/39",
"uid": "grisou-39"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/40",
"uid": "grisou-40"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/41",
"uid": "grimoire-1"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/42",
"uid": "grimoire-2"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/43",
"uid": "grimoire-3"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/44",
"uid": "grimoire-4"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/45",
"uid": "grimoire-5"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/46",
"uid": "grimoire-6"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/47",
"uid": "grimoire-7"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet5/48",
"uid": "grimoire-8"
}
],
@@ -1254,239 +1494,287 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/1",
"uid": "grisou-41"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/2",
"uid": "grisou-41"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/3",
"uid": "grisou-41"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/4",
"uid": "grisou-42"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/5",
"uid": "grisou-42"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/6",
"uid": "grisou-42"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/7",
"uid": "grisou-43"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/8",
"uid": "grisou-43"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/9",
"uid": "grisou-43"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/10",
"uid": "grisou-44"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/11",
"uid": "grisou-44"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/12",
"uid": "grisou-44"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/13",
"uid": "grisou-45"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/14",
"uid": "grisou-45"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/15",
"uid": "grisou-45"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/16",
"uid": "grisou-46"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/17",
"uid": "grisou-46"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/18",
"uid": "grisou-46"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/19",
"uid": "grisou-47"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/20",
"uid": "grisou-47"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/21",
"uid": "grisou-47"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/22",
"uid": "grisou-48"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/23",
"uid": "grisou-48"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/24",
"uid": "grisou-48"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/25",
"uid": "grisou-49"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/26",
"uid": "grisou-49"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/27",
"uid": "grisou-49"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/28",
"uid": "grisou-50"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/29",
"uid": "grisou-50"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/30",
"uid": "grisou-50"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet6/31",
"uid": "grisou-51"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/32",
"uid": "grisou-51"
},
{
"kind": "node",
"port": "eth3",
+ "snmp_name": "Ethernet6/33",
"uid": "grisou-51"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/34",
"uid": "graffiti-8"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/35",
"uid": "graffiti-7"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/36",
"uid": "graffiti-2"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/37",
"uid": "graffiti-5"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/38",
"uid": "graffiti-6"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/39",
"uid": "graffiti-1"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet6/40",
"uid": "graffiti-3"
},
{
"kind": "switch",
+ "snmp_name": "Ethernet6/41",
"uid": "sgrvingt"
},
{
"kind": "switch",
+ "snmp_name": "Ethernet6/42",
"uid": "sgrisou1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet6/43",
"uid": "grimani-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet6/44",
"uid": "grimani-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet6/45",
"uid": "grimani-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet6/46",
"uid": "grimani-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet6/47",
"uid": "grimani-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet6/48",
"uid": "grimani-3"
}
],
@@ -1504,96 +1792,115 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/1",
"uid": "grele-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/2",
"uid": "grele-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/3",
"uid": "grele-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/4",
"uid": "grele-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/5",
"uid": "grele-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/6",
"uid": "grele-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/7",
"uid": "grele-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/8",
"uid": "grele-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/9",
"uid": "grele-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/10",
"uid": "grele-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/11",
"uid": "grele-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/12",
"uid": "grele-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/13",
"uid": "grele-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/14",
"uid": "grele-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/15",
"uid": "grue-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/16",
"uid": "grue-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/17",
"uid": "grue-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/18",
"uid": "grue-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet7/19",
"uid": "grue-5"
},
{
@@ -1630,6 +1937,7 @@
},
{
"kind": "switch",
+ "snmp_name": "Ethernet7/36",
"uid": "sgros2"
},
{
@@ -1638,6 +1946,7 @@
},
{
"kind": "switch",
+ "snmp_name": "Ethernet7/39",
"uid": "sgros1"
},
{
@@ -1645,6 +1954,7 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet7/41",
"uid": "graffiti-13"
},
{
@@ -1652,21 +1962,25 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet7/43",
"uid": "graffiti-11"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet7/44",
"uid": "graffiti-10"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet7/45",
"uid": "graffiti-12"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet7/46",
"uid": "graffiti-9"
},
{
@@ -1674,6 +1988,7 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Ethernet7/48",
"uid": "graffiti-4"
}
],
@@ -1686,11 +2001,8 @@
"metric": "power",
"wattmeter": "multiple"
},
+ "role": "production",
"sensors": {
- "network": {
- "available": true,
- "resolution": 10
- },
"power": {
"available": true,
"resolution": 1,
@@ -1719,7 +2031,7 @@
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "gw-nancy",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
@@ -1798,7 +2110,5 @@
"name": "kavlan-14"
}
},
- "warranty": "2020-09-01",
- "weathermap": {
- }
+ "warranty": "2020-09-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
index fa89243de33aa66406257514d33e96f0a4243aed..294b50552b5f44e14d20f78ee64eeb18e856dec7 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -1,4 +1,5 @@
{
+ "ip": "172.17.79.223",
"kind": "switch",
"linecards": [
{
@@ -115,7 +116,9 @@
},
{
"kind": "node",
- "uid": "node-mapping-undocumented-for-this-ib-switch"
+ "port": "mapping-undocumented-for-this-ib-switch",
+ "snmp_name": "12/42",
+ "uid": "node"
}
],
"rate": 20000000000,
@@ -127,10 +130,8 @@
"metric": "power",
"wattmeter": true
},
+ "role": "hpc",
"sensors": {
- "network": {
- "available": false
- },
"power": {
"available": true,
"resolution": 1,
@@ -148,10 +149,5 @@
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgraoullyib",
- "vlans": {
- },
- "warranty": "2020-09-01",
- "weathermap": {
- "use_cacti": "no"
- }
+ "warranty": "2020-09-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
index 20a83caaa22d1b4199a1b3a25277d6d8f42b0842..45b36000f03c9e8a7da86ec2400bb064885fbcbf 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
@@ -1,298 +1,327 @@
{
"backplane_bps": 100000000000,
+ "ip": "172.17.79.230",
"kind": "switch",
"linecards": [
{
"kavlan_pattern": "Gi1/%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/1",
"uid": "grcinq-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/2",
"uid": "grcinq-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/3",
"uid": "grcinq-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/4",
"uid": "grcinq-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/5",
"uid": "grcinq-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/6",
"uid": "grcinq-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/7",
"uid": "grcinq-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/8",
"uid": "grcinq-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/9",
"uid": "grcinq-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/10",
"uid": "grcinq-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/11",
"uid": "grcinq-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/12",
"uid": "grcinq-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/13",
"uid": "grcinq-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/14",
"uid": "grcinq-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/15",
"uid": "grcinq-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/16",
"uid": "grcinq-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/17",
"uid": "grcinq-35"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/18",
"uid": "grcinq-36"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/19",
"uid": "grcinq-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/20",
"uid": "grcinq-40"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/21",
"uid": "grcinq-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/22",
"uid": "grcinq-44"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/23",
"uid": "grcinq-47"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/24",
"uid": "grcinq-48"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/25",
"uid": "grcinq-45"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/26",
"uid": "grcinq-46"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/27",
"uid": "grcinq-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/28",
"uid": "grcinq-42"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/29",
"uid": "grcinq-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/30",
"uid": "grcinq-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/31",
"uid": "grcinq-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/32",
"uid": "grcinq-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/33",
"uid": "grcinq-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/34",
"uid": "grcinq-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/35",
"uid": "grcinq-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/36",
"uid": "grcinq-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/37",
"uid": "grcinq-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/38",
"uid": "grcinq-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/39",
"uid": "grcinq-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/40",
"uid": "grcinq-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/41",
"uid": "grcinq-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/42",
"uid": "grcinq-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/43",
"uid": "grcinq-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/44",
"uid": "grcinq-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/45",
"uid": "grcinq-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/46",
"uid": "grcinq-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/47",
"uid": "grcinq-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet1/0/48",
"uid": "grcinq-2"
}
],
"rate": 1000000000,
- "snmp_pattern": "GigabitEthernet 1/%LINECARD%/%PORT%"
+ "snmp_pattern": "GigabitEthernet1/%LINECARD%/%PORT%"
},
{
"kavlan_pattern": "TenGigabitEthernet1/0/%PORT%",
"kind": "other",
- "port": "eth0",
"ports": [
{
},
{
"kind": "switch",
- "port": "eth0",
+ "snmp_name": "TenGigabitEthernet1/0/1",
"uid": "sgrvingt"
}
],
"rate": 10000000000,
- "snmp_pattern": "TenGigabitEthernet 1/0/%PORT%"
+ "snmp_pattern": "TenGigabitEthernet1/0/%PORT%"
}
],
"model": "Cisco WS-C2960X-48TD-L",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- },
- "power": {
- "available": false
- }
- },
+ "role": "production",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgrcinq",
- "vlans": {
- "vlan1": {
- "addresses": [
- "172.17.79.230"
- ],
- "administrative": true
- }
- },
- "warranty": "2028-11-28",
- "weathermap": {
- }
+ "warranty": "2028-11-28"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
index c6f2ba6ca0c3b679c66099620563f5adc79aebf6..447d8f731137c152e58615ad54895fd93a7d8950 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
@@ -1,4 +1,5 @@
{
+ "ip": "172.17.79.253",
"kind": "switch",
"linecards": [
{
@@ -35,11 +36,15 @@
},
{
"kind": "node",
- "uid": "grele-13-when-undead"
+ "port": "when-undead",
+ "snmp_name": "1/13",
+ "uid": "grele-13"
},
{
"kind": "node",
- "uid": "grele-14-when-undead"
+ "port": "when-undead",
+ "snmp_name": "1/14",
+ "uid": "grele-14"
}
],
"rate": 100000000000,
@@ -51,10 +56,8 @@
"metric": "power",
"wattmeter": true
},
+ "role": "hpc",
"sensors": {
- "network": {
- "available": false
- },
"power": {
"available": true,
"resolution": 1,
@@ -76,10 +79,5 @@
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgrele-opf",
- "vlans": {
- },
- "warranty": "2022-06-01",
- "weathermap": {
- "use_cacti": "no"
- }
+ "warranty": "2022-06-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
index 9219ec52e92bca130c192e61ac8df0cea1db9246..455c29b06ddda8d48d1911c437b9027f725b9b79 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
@@ -1,253 +1,302 @@
{
"backplane_bps": 260000000000,
+ "ip": "172.17.79.206",
"kind": "switch",
"linecards": [
{
},
{
"kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
- "kind": "other",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/1",
"uid": "grisou-1"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/2",
"uid": "grisou-2"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/3",
"uid": "grisou-3"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/4",
"uid": "grisou-4"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/5",
"uid": "grisou-5"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/6",
"uid": "grisou-6"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/7",
"uid": "grisou-7"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/8",
"uid": "grisou-8"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/9",
"uid": "grisou-9"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/10",
"uid": "grisou-10"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/11",
"uid": "grisou-11"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/12",
"uid": "grisou-12"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/13",
"uid": "grisou-13"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/14",
"uid": "grisou-14"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/15",
"uid": "grisou-15"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/16",
"uid": "grisou-16"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/17",
"uid": "grisou-17"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/18",
"uid": "grisou-18"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/19",
"uid": "grisou-19"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/20",
"uid": "grisou-20"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/21",
"uid": "grisou-21"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/22",
"uid": "grisou-22"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/23",
"uid": "grisou-23"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/24",
"uid": "grisou-24"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/25",
"uid": "grisou-25"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/26",
"uid": "grisou-26"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/27",
"uid": "grisou-27"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/28",
"uid": "grisou-28"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/29",
"uid": "grisou-29"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/30",
"uid": "grisou-30"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/31",
"uid": "grisou-31"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/32",
"uid": "grisou-32"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/33",
"uid": "grisou-33"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/34",
"uid": "grisou-34"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/35",
"uid": "grisou-35"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/36",
"uid": "grisou-36"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/37",
"uid": "grisou-37"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/38",
"uid": "grisou-38"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/39",
"uid": "grisou-39"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/40",
"uid": "grisou-40"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/41",
"uid": "grisou-41"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/42",
"uid": "grisou-42"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/43",
"uid": "grisou-43"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/44",
"uid": "grisou-44"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/45",
"uid": "grisou-45"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/46",
"uid": "grisou-46"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/47",
"uid": "grisou-47"
},
{
"kind": "node",
"port": "eth4",
+ "snmp_name": "GigabitEthernet 1/48",
"uid": "grisou-48"
}
],
@@ -364,7 +413,8 @@
},
{
"kind": "router",
- "uid": "gw-nancy"
+ "snmp_name": "TenGigabitEthernet 1/52",
+ "uid": "gw"
}
],
"rate": 10000000000,
@@ -376,6 +426,7 @@
"metric": "power",
"wattmeter": true
},
+ "role": "production",
"sensors": {
"power": {
"available": true,
@@ -394,15 +445,5 @@
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgrisou1",
- "vlans": {
- "vlan1": {
- "addresses": [
- "172.17.79.206"
- ],
- "administrative": true
- }
- },
- "warranty": "2022-06-01",
- "weathermap": {
- }
+ "warranty": "2022-06-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
index 222970e01f37abff48b82c9eb63530c0cbb3ebce..6406af410ded87184f7e591f660279cd7f172c80 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -1,5 +1,6 @@
{
"backplane_bps": 6400000000000,
+ "ip": "172.17.79.208",
"kind": "switch",
"linecards": [
{
@@ -11,28 +12,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/3:1",
"uid": "gros-117"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/3:2",
"uid": "gros-118"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/3:3",
"uid": "gros-119"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/3:4",
"uid": "gros-120"
}
],
@@ -44,28 +48,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/5:1",
"uid": "gros-113"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/5:2",
"uid": "gros-114"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/5:3",
"uid": "gros-115"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/5:4",
"uid": "gros-116"
}
],
@@ -77,28 +84,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/7:1",
"uid": "gros-109"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/7:2",
"uid": "gros-110"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/7:3",
"uid": "gros-111"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/7:4",
"uid": "gros-112"
}
],
@@ -110,28 +120,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/9:1",
"uid": "gros-105"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/9:2",
"uid": "gros-106"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/9:3",
"uid": "gros-107"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/9:4",
"uid": "gros-108"
}
],
@@ -143,28 +156,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/11:1",
"uid": "gros-101"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/11:2",
"uid": "gros-102"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/11:3",
"uid": "gros-103"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/11:4",
"uid": "gros-104"
}
],
@@ -176,28 +192,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/13:1",
"uid": "gros-97"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/13:2",
"uid": "gros-98"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/13:3",
"uid": "gros-99"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/13:4",
"uid": "gros-100"
}
],
@@ -209,28 +228,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/15:1",
"uid": "gros-61"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/15:2",
"uid": "gros-62"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/15:3",
"uid": "gros-63"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/15:4",
"uid": "gros-64"
}
],
@@ -242,28 +264,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/17:1",
"uid": "gros-65"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/17:2",
"uid": "gros-66"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/17:3",
"uid": "gros-67"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/17:4",
"uid": "gros-68"
}
],
@@ -275,28 +300,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/19:1",
"uid": "gros-69"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/19:2",
"uid": "gros-70"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/19:3",
"uid": "gros-71"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/19:4",
"uid": "gros-72"
}
],
@@ -308,28 +336,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/21:1",
"uid": "gros-73"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/21:2",
"uid": "gros-74"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/21:3",
"uid": "gros-75"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/21:4",
"uid": "gros-76"
}
],
@@ -341,28 +372,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/23:1",
"uid": "gros-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/23:2",
"uid": "gros-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/23:3",
"uid": "gros-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/23:4",
"uid": "gros-28"
}
],
@@ -374,28 +408,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/25:1",
"uid": "gros-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/25:2",
"uid": "gros-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/25:3",
"uid": "gros-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/25:4",
"uid": "gros-32"
}
],
@@ -407,28 +444,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/27:1",
"uid": "gros-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/27:2",
"uid": "gros-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/27:3",
"uid": "gros-35"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/27:4",
"uid": "gros-36"
}
],
@@ -440,28 +480,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/29:1",
"uid": "gros-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/29:2",
"uid": "gros-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/29:3",
"uid": "gros-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/29:4",
"uid": "gros-40"
}
],
@@ -473,28 +516,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/31:1",
"uid": "gros-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/31:2",
"uid": "gros-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/31:3",
"uid": "gros-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/31:4",
"uid": "gros-8"
}
],
@@ -506,28 +552,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/33:1",
"uid": "gros-121"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/33:2",
"uid": "gros-122"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/33:3",
"uid": "gros-123"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/33:4",
"uid": "gros-124"
}
],
@@ -539,28 +588,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/35:1",
"uid": "gros-77"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/35:2",
"uid": "gros-78"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/35:3",
"uid": "gros-79"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/35:4",
"uid": "gros-80"
}
],
@@ -572,28 +624,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/37:1",
"uid": "gros-81"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/37:2",
"uid": "gros-82"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/37:3",
"uid": "gros-83"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/37:4",
"uid": "gros-84"
}
],
@@ -605,28 +660,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/39:1",
"uid": "gros-85"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/39:2",
"uid": "gros-86"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/39:3",
"uid": "gros-87"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/39:4",
"uid": "gros-88"
}
],
@@ -638,28 +696,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/41:1",
"uid": "gros-89"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/41:2",
"uid": "gros-90"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/41:3",
"uid": "gros-91"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/41:4",
"uid": "gros-92"
}
],
@@ -671,28 +732,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/43:1",
"uid": "gros-93"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/43:2",
"uid": "gros-94"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/43:3",
"uid": "gros-95"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/43:4",
"uid": "gros-96"
}
],
@@ -704,28 +768,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/45:1",
"uid": "gros-57"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/45:2",
"uid": "gros-58"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/45:3",
"uid": "gros-59"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/45:4",
"uid": "gros-60"
}
],
@@ -737,28 +804,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/47:1",
"uid": "gros-53"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/47:2",
"uid": "gros-54"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/47:3",
"uid": "gros-55"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/47:4",
"uid": "gros-56"
}
],
@@ -770,28 +840,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/49:1",
"uid": "gros-49"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/49:2",
"uid": "gros-50"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/49:3",
"uid": "gros-51"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/49:4",
"uid": "gros-52"
}
],
@@ -803,28 +876,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/51:1",
"uid": "gros-45"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/51:2",
"uid": "gros-46"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/51:3",
"uid": "gros-47"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/51:4",
"uid": "gros-48"
}
],
@@ -836,28 +912,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/53:1",
"uid": "gros-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/53:2",
"uid": "gros-42"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/53:3",
"uid": "gros-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/53:4",
"uid": "gros-44"
}
],
@@ -869,28 +948,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/55:1",
"uid": "gros-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/55:2",
"uid": "gros-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/55:3",
"uid": "gros-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/55:4",
"uid": "gros-24"
}
],
@@ -902,28 +984,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/57:1",
"uid": "gros-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/57:2",
"uid": "gros-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/57:3",
"uid": "gros-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/57:4",
"uid": "gros-20"
}
],
@@ -935,28 +1020,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/59:1",
"uid": "gros-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/59:2",
"uid": "gros-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/59:3",
"uid": "gros-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/59:4",
"uid": "gros-16"
}
],
@@ -968,28 +1056,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/61:1",
"uid": "gros-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/61:2",
"uid": "gros-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/61:3",
"uid": "gros-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/61:4",
"uid": "gros-12"
}
],
@@ -1001,28 +1092,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/63:1",
"uid": "gros-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/63:2",
"uid": "gros-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/63:3",
"uid": "gros-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "ethernet 1/1/63:4",
"uid": "gros-4"
}
],
@@ -1038,7 +1132,8 @@
},
{
"kind": "router",
- "uid": "gw-nancy"
+ "snmp_name": "ethernet 1/1/65",
+ "uid": "gw"
}
],
"rate": 10000000000,
@@ -1046,28 +1141,10 @@
}
],
"model": "Dell Z9264F-ON",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- },
- "power": {
- "available": false
- }
- },
+ "role": "production",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgros1",
- "vlans": {
- "vlan1": {
- "addresses": [
- "172.17.79.208"
- ],
- "administrative": true
- }
- },
- "warranty": "2026-07-11",
- "weathermap": {
- }
+ "warranty": "2026-07-11"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index 4533b1a5f51c90acf5c3468fb2df9b61e163a3d5..4c5a9cc5aed5308aa36c6700e8908e824fa92862 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -1,5 +1,6 @@
{
"backplane_bps": 6400000000000,
+ "ip": "172.17.79.209",
"kind": "switch",
"linecards": [
{
@@ -11,28 +12,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/3:1",
"uid": "gros-117"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/3:2",
"uid": "gros-118"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/3:3",
"uid": "gros-119"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/3:4",
"uid": "gros-120"
}
],
@@ -44,28 +48,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/5:1",
"uid": "gros-113"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/5:2",
"uid": "gros-114"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/5:3",
"uid": "gros-115"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/5:4",
"uid": "gros-116"
}
],
@@ -77,28 +84,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/7:1",
"uid": "gros-109"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/7:2",
"uid": "gros-110"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/7:3",
"uid": "gros-111"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/7:4",
"uid": "gros-112"
}
],
@@ -110,28 +120,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/9:1",
"uid": "gros-105"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/9:2",
"uid": "gros-106"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/9:3",
"uid": "gros-107"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/9:4",
"uid": "gros-108"
}
],
@@ -143,28 +156,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/11:1",
"uid": "gros-101"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/11:2",
"uid": "gros-102"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/11:3",
"uid": "gros-103"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/11:4",
"uid": "gros-104"
}
],
@@ -176,28 +192,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/13:1",
"uid": "gros-97"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/13:2",
"uid": "gros-98"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/13:3",
"uid": "gros-99"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/13:4",
"uid": "gros-100"
}
],
@@ -209,28 +228,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/15:1",
"uid": "gros-61"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/15:2",
"uid": "gros-62"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/15:3",
"uid": "gros-63"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/15:4",
"uid": "gros-64"
}
],
@@ -242,28 +264,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/17:1",
"uid": "gros-65"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/17:2",
"uid": "gros-66"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/17:3",
"uid": "gros-67"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/17:4",
"uid": "gros-68"
}
],
@@ -275,28 +300,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/19:1",
"uid": "gros-69"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/19:2",
"uid": "gros-70"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/19:3",
"uid": "gros-71"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/19:4",
"uid": "gros-72"
}
],
@@ -308,28 +336,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/21:1",
"uid": "gros-73"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/21:2",
"uid": "gros-74"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/21:3",
"uid": "gros-75"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/21:4",
"uid": "gros-76"
}
],
@@ -341,28 +372,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/23:1",
"uid": "gros-25"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/23:2",
"uid": "gros-26"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/23:3",
"uid": "gros-27"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/23:4",
"uid": "gros-28"
}
],
@@ -374,28 +408,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/25:1",
"uid": "gros-29"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/25:2",
"uid": "gros-30"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/25:3",
"uid": "gros-31"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/25:4",
"uid": "gros-32"
}
],
@@ -407,28 +444,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/27:1",
"uid": "gros-33"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/27:2",
"uid": "gros-34"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/27:3",
"uid": "gros-35"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/27:4",
"uid": "gros-36"
}
],
@@ -440,28 +480,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/29:1",
"uid": "gros-37"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/29:2",
"uid": "gros-38"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/29:3",
"uid": "gros-39"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/29:4",
"uid": "gros-40"
}
],
@@ -473,28 +516,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/31:1",
"uid": "gros-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/31:2",
"uid": "gros-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/31:3",
"uid": "gros-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/31:4",
"uid": "gros-8"
}
],
@@ -506,28 +552,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/33:1",
"uid": "gros-121"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/33:2",
"uid": "gros-122"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/33:3",
"uid": "gros-123"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/33:4",
"uid": "gros-124"
}
],
@@ -539,28 +588,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/35:1",
"uid": "gros-77"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/35:2",
"uid": "gros-78"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/35:3",
"uid": "gros-79"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/35:4",
"uid": "gros-80"
}
],
@@ -572,28 +624,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/37:1",
"uid": "gros-81"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/37:2",
"uid": "gros-82"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/37:3",
"uid": "gros-83"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/37:4",
"uid": "gros-84"
}
],
@@ -605,28 +660,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/39:1",
"uid": "gros-85"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/39:2",
"uid": "gros-86"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/39:3",
"uid": "gros-87"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/39:4",
"uid": "gros-88"
}
],
@@ -638,28 +696,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/41:1",
"uid": "gros-89"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/41:2",
"uid": "gros-90"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/41:3",
"uid": "gros-91"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/41:4",
"uid": "gros-92"
}
],
@@ -671,28 +732,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/43:1",
"uid": "gros-93"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/43:2",
"uid": "gros-94"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/43:3",
"uid": "gros-95"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/43:4",
"uid": "gros-96"
}
],
@@ -704,28 +768,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/45:1",
"uid": "gros-57"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/45:2",
"uid": "gros-58"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/45:3",
"uid": "gros-59"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/45:4",
"uid": "gros-60"
}
],
@@ -737,28 +804,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/47:1",
"uid": "gros-53"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/47:2",
"uid": "gros-54"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/47:3",
"uid": "gros-55"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/47:4",
"uid": "gros-56"
}
],
@@ -770,28 +840,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/49:1",
"uid": "gros-49"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/49:2",
"uid": "gros-50"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/49:3",
"uid": "gros-51"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/49:4",
"uid": "gros-52"
}
],
@@ -803,28 +876,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/51:1",
"uid": "gros-45"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/51:2",
"uid": "gros-46"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/51:3",
"uid": "gros-47"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/51:4",
"uid": "gros-48"
}
],
@@ -836,28 +912,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/53:1",
"uid": "gros-41"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/53:2",
"uid": "gros-42"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/53:3",
"uid": "gros-43"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/53:4",
"uid": "gros-44"
}
],
@@ -869,28 +948,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/55:1",
"uid": "gros-21"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/55:2",
"uid": "gros-22"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/55:3",
"uid": "gros-23"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/55:4",
"uid": "gros-24"
}
],
@@ -902,28 +984,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/57:1",
"uid": "gros-17"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/57:2",
"uid": "gros-18"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/57:3",
"uid": "gros-19"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/57:4",
"uid": "gros-20"
}
],
@@ -935,28 +1020,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/59:1",
"uid": "gros-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/59:2",
"uid": "gros-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/59:3",
"uid": "gros-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/59:4",
"uid": "gros-16"
}
],
@@ -968,28 +1056,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/61:1",
"uid": "gros-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/61:2",
"uid": "gros-10"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/61:3",
"uid": "gros-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/61:4",
"uid": "gros-12"
}
],
@@ -1001,28 +1092,31 @@
{
"kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/63:1",
"uid": "gros-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/63:2",
"uid": "gros-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/63:3",
"uid": "gros-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "ethernet 1/1/63:4",
"uid": "gros-4"
}
],
@@ -1040,7 +1134,8 @@
},
{
"kind": "router",
- "uid": "gw-nancy"
+ "snmp_name": "ethernet 1/1/66",
+ "uid": "gw"
}
],
"rate": 10000000000,
@@ -1048,28 +1143,10 @@
}
],
"model": "Dell Z9264F-ON",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- },
- "power": {
- "available": false
- }
- },
+ "role": "production",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgros2",
- "vlans": {
- "vlan1": {
- "addresses": [
- "172.17.79.209"
- ],
- "administrative": true
- }
- },
- "warranty": "2026-07-11",
- "weathermap": {
- }
+ "warranty": "2026-07-11"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 5b4b14eef78cbbd48bfdc7abb4e627dc3d320c29..74028d25e17583db3dd74352e9960ebadda37b6b 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -1,5 +1,6 @@
{
"backplane_bps": 1440000000000,
+ "ip": "172.17.79.207",
"kind": "switch",
"linecards": [
{
@@ -7,246 +8,285 @@
{
"kavlan_pattern": "TenGigabitEthernet%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/1",
"uid": "grvingt-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/2",
"uid": "grvingt-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/3",
"uid": "grvingt-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/4",
"uid": "grvingt-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/5",
"uid": "grvingt-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/6",
"uid": "grvingt-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/7",
"uid": "grvingt-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/8",
"uid": "grvingt-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/9",
"uid": "grvingt-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/10",
"uid": "grvingt-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/11",
"uid": "grvingt-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/12",
"uid": "grvingt-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/13",
"uid": "grvingt-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/14",
"uid": "grvingt-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/15",
"uid": "grvingt-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/16",
"uid": "grvingt-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/17",
"uid": "grvingt-35"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/18",
"uid": "grvingt-36"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/19",
"uid": "grvingt-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/20",
"uid": "grvingt-40"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/21",
"uid": "grvingt-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/22",
"uid": "grvingt-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/23",
"uid": "grvingt-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/24",
"uid": "grvingt-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/25",
"uid": "grvingt-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/26",
"uid": "grvingt-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/27",
"uid": "grvingt-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/28",
"uid": "grvingt-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/29",
"uid": "grvingt-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/30",
"uid": "grvingt-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/31",
"uid": "grvingt-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/32",
"uid": "grvingt-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/33",
"uid": "grvingt-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/34",
"uid": "grvingt-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/35",
"uid": "grvingt-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/36",
"uid": "grvingt-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/37",
"uid": "grvingt-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/38",
"uid": "grvingt-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/39",
"uid": "grvingt-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/40",
"uid": "grvingt-2"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 1/41",
"uid": "grcinq-srv-3"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 1/42",
"uid": "grcinq-srv-2"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 1/43",
"uid": "grvingt-srv"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 1/44",
"uid": "wurst"
},
{
"kind": "switch",
- "port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/45",
"uid": "sgrcinq"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "TenGigabitEthernet 1/46",
"uid": "grcinq-srv-1"
},
{
},
{
"kind": "router",
- "port": "eth0",
- "uid": "gw-nancy"
+ "snmp_name": "TenGigabitEthernet 1/48",
+ "uid": "gw"
}
],
"rate": 10000000000,
@@ -349,28 +389,31 @@
{
"kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/49/1",
"uid": "grvingt-44"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/49/2",
"uid": "grvingt-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/49/3",
"uid": "grvingt-48"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/49/4",
"uid": "grvingt-47"
}
],
@@ -380,28 +423,31 @@
{
"kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/50/1",
"uid": "grvingt-58"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/50/2",
"uid": "grvingt-57"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/50/3",
"uid": "grvingt-62"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/50/4",
"uid": "grvingt-61"
}
],
@@ -411,28 +457,31 @@
{
"kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/51/1",
"uid": "grvingt-52"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/51/2",
"uid": "grvingt-51"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/51/3",
"uid": "grvingt-56"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/51/4",
"uid": "grvingt-55"
}
],
@@ -442,28 +491,31 @@
{
"kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/52/1",
"uid": "grvingt-50"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/52/2",
"uid": "grvingt-49"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/52/3",
"uid": "grvingt-54"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/52/4",
"uid": "grvingt-53"
}
],
@@ -473,28 +525,31 @@
{
"kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/53/1",
"uid": "grvingt-60"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/53/2",
"uid": "grvingt-59"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/53/3",
"uid": "grvingt-64"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/53/4",
"uid": "grvingt-63"
}
],
@@ -504,28 +559,31 @@
{
"kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/54/1",
"uid": "grvingt-42"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/54/2",
"uid": "grvingt-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/54/3",
"uid": "grvingt-46"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/54/4",
"uid": "grvingt-45"
}
],
@@ -534,28 +592,10 @@
}
],
"model": "Dell S4048",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- },
- "power": {
- "available": false
- }
- },
+ "role": "production",
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgrvingt",
- "vlans": {
- "vlan1": {
- "addresses": [
- "172.17.79.207"
- ],
- "administrative": true
- }
- },
- "warranty": "2023-03-27",
- "weathermap": {
- }
+ "warranty": "2023-03-27"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
index f5232759cc44fc7bb23dc673ecb864a16df55eaa..3c13a8e6afd92c938c39a4dafd0076b9a94895a2 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-1.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/45",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
index 3d0b78590dab615b0c72a3d1fc3661de4662e60f..27a82248688f91ac9a52755c8784a132bd52232d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-10.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/10",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
index 0c00c595e0bc83cec6348810d61d1d32533f1d0e..4303e882c7847193e5c319a4d3906217fc4bb97f 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-11.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/19",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
index b0cd165c1b05b39627c392a93d9f491d5a0f5540..c7d31ac784e73f70c299b4d66b9049641b8c5075 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-12.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/18",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
index 6b2fbc78dfcb7fe4c3b121e5e0cd898cef6eb020..9746b59d553ff9e48b389e56e75d55b05f52d6d3 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-13.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/39",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
index 55f257dd3fe6c46ac3300eedeb21982b58358e82..42089a157910f10273ea1087056707d8d7c780f3 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-14.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/38",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
index d45872437fdb13b8b1884b352bcb7dfaaca0c0be..5bdf190312dfdb6d553aa26460aefd0cfaafa0dc 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-15.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/21",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
index 116002a7f8fb3f1d29571ab2f338665bae02af35..072fd93e55cf03766d79ad80e0450b57c6229b40 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-16.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/20",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
index d058ca0abfe5331c545b5fdb65766acf70d557ae..dfcf932d73f47a2e96724613df49b6ba531671a7 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-17.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
index c72de68c30f2b662c2f38b12adac0bb53237f4c6..0708a5af9fe061ae7b88990888c4c2cc6bdd1ba6 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-18.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/22",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
index d14baa3f1c5157a2bcd830f9ef141e66c8fc9400..a87c82027decfd8e3ced3c9b29e4b514a3f169d1 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-19.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
index aeaed5e7f983baed2a6be22080c4c2efdd7f39ab..d2b9f26ba385d5bfe99f4ff7106e3078934767ff 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-2.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/44",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
index 09382d0e7da6b4bd7aeadb6f17f2b0bcb6eec277..a389357488c1c8bf1fe29b3395ad0260540e5397 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-20.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/28",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
index 0ef4f3145a06cf77f055ba4275357db264902162..9b0127878e925e5864f8d2e5a368a871a1951a27 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-21.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/31",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
index 913250a9a9e1bfd3194d9aea4d04735e586fdf68..bca739988e8bad24593e2cbd2d25aaf86366e147 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-22.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/32",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
index 0f884d288cb6beff5f7f2cb0f95942db28fdf273..c6bd2771c011ba9b3459745a48dcdac4b547c14e 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-3.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/15",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
index 3ba29c3541b4f4f544cea2244d669e5575b7dcaa..8d1cf0a5dbfc6bc79df0a57cbcdb0a66fcb7adb8 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-4.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
index 686518f74bd67889076d33c182ec1deac4108bcf..6d321430d82db3462226658827bbb02de41abb5d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-5.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/43",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
index 94f1d349f83438c3f400ddec359a1b8cf22e0429..50f2c483d058102a675233e5829908e1aad2d8ef 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-6.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/42",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
index a628a775fd01ae715d4ac84cd97e42eeee75af60..e8146341e74dc4bc6ec843810df4dfa0021bbdb5 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-7.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
index 578a9cb9fa189e6fdcc330ad6d42f27b33a5bc20..de54f7b00f1a3daa795e9e1b18aab0e0c2f28992 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-8.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/16",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
index 4c602210d5dff1b0f40dbbd9096178b84bf85834..5c6740c818a56328f1c4e7d90f42b71baa2d3fe1 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
@@ -63,7 +63,7 @@
"name": "enp3s0f0",
"network_address": "econome-9.nantes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-nantes",
+ "switch": "gw",
"switch_port": "TenGigabitEthernet 0/41",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
index c7293e783458ed0423db1f3aafbd2dfce26b4e1c..3b17abfae7ded1bf3cd68a83c80dcf535e6bdf6a 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
@@ -1,5 +1,14 @@
{
"backplane_bps": 1280000000000,
+ "channels": {
+ "Port-channel 1": {
+ "kind": "router",
+ "port": "Port-channel 1",
+ "rate": 80000000000,
+ "uid": "gw"
+ }
+ },
+ "ip": "172.16.207.252",
"kind": "switch",
"linecards": [
{
@@ -7,261 +16,308 @@
{
"kavlan_pattern": "%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/1",
"uid": "ecotype-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/2",
"uid": "ecotype-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/3",
"uid": "ecotype-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/4",
"uid": "ecotype-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/5",
"uid": "ecotype-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/6",
"uid": "ecotype-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/7",
"uid": "ecotype-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/8",
"uid": "ecotype-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/9",
"uid": "ecotype-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/10",
"uid": "ecotype-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/11",
"uid": "ecotype-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/12",
"uid": "ecotype-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/13",
"uid": "ecotype-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/14",
"uid": "ecotype-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/15",
"uid": "ecotype-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/16",
"uid": "ecotype-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/17",
"uid": "ecotype-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/18",
"uid": "ecotype-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/19",
"uid": "ecotype-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/20",
"uid": "ecotype-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/21",
"uid": "ecotype-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/22",
"uid": "ecotype-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/23",
"uid": "ecotype-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/24",
"uid": "ecotype-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/25",
"uid": "ecotype-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/26",
"uid": "ecotype-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/27",
"uid": "ecotype-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/28",
"uid": "ecotype-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/29",
"uid": "ecotype-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/30",
"uid": "ecotype-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/31",
"uid": "ecotype-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/32",
"uid": "ecotype-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/33",
"uid": "ecotype-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/34",
"uid": "ecotype-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/35",
"uid": "ecotype-35"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/36",
"uid": "ecotype-36"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/37",
"uid": "ecotype-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/38",
"uid": "ecotype-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/39",
"uid": "ecotype-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/40",
"uid": "ecotype-40"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/41",
"uid": "ecotype-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/42",
"uid": "ecotype-42"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/43",
"uid": "ecotype-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/44",
"uid": "ecotype-44"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/45",
"uid": "ecotype-45"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/46",
"uid": "ecotype-46"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/47",
"uid": "ecotype-47"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 1/48",
"uid": "ecotype-48"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "fortyGigE0/52",
- "uid": "gw-nantes"
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 1/49",
+ "uid": "Port-channel 1"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "fortyGigE0/48",
- "uid": "gw-nantes"
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 1/50",
+ "uid": "Port-channel 1"
}
],
"rate": 10000000000,
@@ -269,17 +325,10 @@
}
],
"model": "S4048-ON",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "nantes",
"snmp_community": "public",
"type": "network_equipment",
"uid": "ecotype-prod1",
- "warranty": "2022-06-01",
- "weathermap": {
- }
+ "warranty": "2022-06-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
index ee5b967c7cf0b6ca7a1fe2db5b5192e1b179fe5c..d117af3333d1f236c6259c2febad4712b6b2a512 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
@@ -1,5 +1,14 @@
{
"backplane_bps": 1280000000000,
+ "channels": {
+ "Port-channel 1": {
+ "kind": "router",
+ "port": "Port-channel 2",
+ "rate": 80000000000,
+ "uid": "gw"
+ }
+ },
+ "ip": "172.16.207.251",
"kind": "switch",
"linecards": [
{
@@ -7,261 +16,310 @@
{
"kavlan_pattern": "%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/1",
"uid": "ecotype-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/2",
"uid": "ecotype-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/3",
"uid": "ecotype-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/4",
"uid": "ecotype-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/5",
"uid": "ecotype-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/6",
"uid": "ecotype-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/7",
"uid": "ecotype-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/8",
"uid": "ecotype-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/9",
"uid": "ecotype-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/10",
"uid": "ecotype-10"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/11",
"uid": "ecotype-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/12",
"uid": "ecotype-12"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/13",
"uid": "ecotype-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/14",
"uid": "ecotype-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/15",
"uid": "ecotype-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/16",
"uid": "ecotype-16"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/17",
"uid": "ecotype-17"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/18",
"uid": "ecotype-18"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/19",
"uid": "ecotype-19"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/20",
"uid": "ecotype-20"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/21",
"uid": "ecotype-21"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/22",
"uid": "ecotype-22"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/23",
"uid": "ecotype-23"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/24",
"uid": "ecotype-24"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/25",
"uid": "ecotype-25"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/26",
"uid": "ecotype-26"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/27",
"uid": "ecotype-27"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/28",
"uid": "ecotype-28"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/29",
"uid": "ecotype-29"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/30",
"uid": "ecotype-30"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/31",
"uid": "ecotype-31"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/32",
"uid": "ecotype-32"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/33",
"uid": "ecotype-33"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/34",
"uid": "ecotype-34"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/35",
"uid": "ecotype-35"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/36",
"uid": "ecotype-36"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/37",
"uid": "ecotype-37"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/38",
"uid": "ecotype-38"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/39",
"uid": "ecotype-39"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/40",
"uid": "ecotype-40"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/41",
"uid": "ecotype-41"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/42",
"uid": "ecotype-42"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/43",
"uid": "ecotype-43"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/44",
"uid": "ecotype-44"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/45",
"uid": "ecotype-45"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/46",
"uid": "ecotype-46"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/47",
"uid": "ecotype-47"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "TenGigabitEthernet 1/48",
"uid": "ecotype-48"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "fortyGigE0/60",
- "uid": "gw-nantes"
+ "kind": "channel",
+ "port": "fortyGigE 0/60",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 1/49",
+ "uid": "Port-channel 1"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "fortyGigE0/56",
- "uid": "gw-nantes"
+ "kind": "channel",
+ "port": "fortyGigE 0/56",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 1/50",
+ "uid": "Port-channel 1"
}
],
"rate": 10000000000,
@@ -269,17 +327,10 @@
}
],
"model": "S4048-ON",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "nantes",
"snmp_community": "public",
"type": "network_equipment",
"uid": "ecotype-prod2",
- "warranty": "2022-06-01",
- "weathermap": {
- }
+ "warranty": "2022-06-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/network_equipments/gw-nantes.json b/data/grid5000/sites/nantes/network_equipments/gw.json
similarity index 69%
rename from data/grid5000/sites/nantes/network_equipments/gw-nantes.json
rename to data/grid5000/sites/nantes/network_equipments/gw.json
index dc7c1caefe023dfa72e2bfe831174dd176890a8c..9d5cb5420d74455474146d2c2275bd198e0e3871 100644
--- a/data/grid5000/sites/nantes/network_equipments/gw-nantes.json
+++ b/data/grid5000/sites/nantes/network_equipments/gw.json
@@ -1,15 +1,32 @@
{
+ "alias": [
+ "gw-nantes"
+ ],
"backplane_bps": 1280000000000,
+ "channels": {
+ "Port-channel 1": {
+ "kind": "switch",
+ "port": "Port-channel 1",
+ "rate": 80000000000,
+ "uid": "ecotype-prod1"
+ },
+ "Port-channel 2": {
+ "kind": "switch",
+ "port": "Port-channel 1",
+ "rate": 80000000000,
+ "uid": "ecotype-prod2"
+ }
+ },
+ "ip": "172.16.207.254",
"kind": "router",
"linecards": [
{
"kavlan_pattern": "%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
- "kind": "virtual",
- "port": "eth0",
+ "kind": "backbone",
+ "snmp_name": "TenGigabitEthernet 0/0",
"uid": "renater-nantes"
},
{
@@ -33,6 +50,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/10",
"uid": "econome-10"
},
{
@@ -42,51 +60,61 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/13",
"uid": "econome-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/14",
"uid": "econome-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/15",
"uid": "econome-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/16",
"uid": "econome-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/17",
"uid": "econome-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/18",
"uid": "econome-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/19",
"uid": "econome-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/20",
"uid": "econome-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/21",
"uid": "econome-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/22",
"uid": "econome-18"
},
{
@@ -102,11 +130,13 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/28",
"uid": "econome-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/29",
"uid": "econome-19"
},
{
@@ -114,11 +144,13 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/31",
"uid": "econome-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/32",
"uid": "econome-22"
},
{
@@ -134,11 +166,13 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/38",
"uid": "econome-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/39",
"uid": "econome-13"
},
{
@@ -146,26 +180,31 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/41",
"uid": "econome-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/42",
"uid": "econome-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/43",
"uid": "econome-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/44",
"uid": "econome-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "TenGigabitEthernet 0/45",
"uid": "econome-1"
},
{
@@ -173,10 +212,10 @@
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "fortyGigE0/50",
- "uid": "ecotype-prod1"
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 0/48",
+ "uid": "Port-channel 1"
},
{
},
@@ -185,10 +224,10 @@
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "fortyGigE0/49",
- "uid": "ecotype-prod1"
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 0/52",
+ "uid": "Port-channel 1"
},
{
},
@@ -197,10 +236,10 @@
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "fortyGigE0/50",
- "uid": "ecotype-prod2"
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 0/56",
+ "uid": "Port-channel 2"
},
{
},
@@ -209,10 +248,10 @@
{
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "fortyGigE0/49",
- "uid": "ecotype-prod2"
+ "kind": "channel",
+ "rate": 40000000000,
+ "snmp_name": "fortyGigE 0/60",
+ "uid": "Port-channel 2"
}
],
"rate": 10000000000,
@@ -220,16 +259,11 @@
}
],
"model": "Force10 S4810",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "nantes",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "gw-nantes",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
@@ -308,7 +342,5 @@
"name": "kavlan-21"
}
},
- "warranty": "2017-10-01",
- "weathermap": {
- }
+ "warranty": "2017-10-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
index 92427b95062cccd4d3bc62cdd9df73b18b73690a..30a3f5b8ab42b68f389aa75f1ad7291da31a5ad6 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/2",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-1-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
index 4aa5c37073526e41601b0bd4fa9143da6866fa6d..76a9fa521bca2933788d8447230cc807a16f9342 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-10.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/20",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-10-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/19",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
index 31a2de7f71fae9a49cd1fc0fa61c4b8b7a64371f..c965fb76d849221b338797613885b939a1de7088 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-11.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/22",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-11-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/21",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
index 9d5fd427a4d4fb3f0f7d74705efc672bc12d2cd5..49f743bfd3187d1221e5f150e997a249abe4d73e 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-12.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/24",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-12-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/23",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
index 1c76652448dff4a85a04f9d6c7af0e547ca54bc2..784800d1402938ca400f43c424ea48da9b796662 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-13.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/26",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-13-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/25",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
index 4eb3cab4f21e3e9b3cb0df374eb9855fa9c30ea3..8decd4a0ddba2362a563cad8a82a9a2bc1fde452 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-14.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/28",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-14-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/27",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
index e9444d6b72b9af5ebd734db930e99a2c7cefd204..9c745eff332a849b0b12fbe154d1ca2bf03e4ad5 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-15.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/30",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-15-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index ea1f86e90888daf5e897c4cbd0037b116b37337e..befb39acd618e6071429b789bac6832a5123d323 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-16.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/32",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-16-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/31",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
index 0463279420c86d7b9daef06af067932f6152e6dc..0dd9733b5edf0c6e35f7dbc77060993efa6ac321 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-17.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/34",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-17-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/33",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 1ba4e9ce9a5fe0308cbbae0644f39c67ffb4a3ed..ef2d7a54db7d102add5365f396af4ebf0c030ada 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-18.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/36",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-18-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
index b8f559457c9511b53a36cc4e8498390d0a1fdb54..727f9a54364ebc60b8ca54e1900381cb96ed18a0 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-19.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/38",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-19-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/37",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
index 6ac85c2b9eb922a45096f4b98e571b4a1cea1ed3..614369332929e1927dc1b734809c7d7e9fb1e02c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-2.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/4",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-2-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/3",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index 659b805ec4f03c0286cfc673cb4db8fe793e8624..3a9db86797e62b4e1ee31f82d7070f278a32b6a0 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-20.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/40",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-20-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/39",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
index fc43f38a7fd0d6e3cbe59d9d08f30bec09069134..7d616e29536d86d683096b468fce30a56c250451 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-21.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/42",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-21-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/41",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
index 276df30702804f9632b2d38fb4a037f33bf32ba2..af315bd12a62f082357a63426e8f68a89df3fd20 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-22.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/44",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-22-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/43",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
index 1d76238012a4e20e30af50d8f2f25795d5dfb49c..8f44c70d87102317087221014de098d21dc7cfcd 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-23.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/46",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-23-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/45",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
index 0f384fc56f64dce9e5cff2bdfb5804d7b737563a..62a2f6e4c51a597b66f43f96530e6733dfd6683d 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-24.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/48",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-24-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/47",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
index e1f83f89d625e1fe64d5bafcdd558ad5682a7f62..0951de52a51727251d2c01b3767ec95562c6c531 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-25.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/2",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-25-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/1",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
index b1c41b4800ff2ca6bff91fd0c529ef23655a4c80..254d50b710848609b7880b130a41b397b961e3cc 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-26.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/4",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-26-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/3",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
index b7f28932b3fdfc955efdd462e6a97c70a5bcb8fa..67511058b11a5bb9e32a5e1774f54f9eb89aebd9 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-27.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/6",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-27-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/5",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
index d2fe10c921b33c86e2f53f608ee2a1eec60b1d17..54cd68e4d9cf63b88bf198a8c7fa700d9aec5230 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-28.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/8",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-28-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet2/7",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
index d1afeeab9e38c640e65519ba878c1d225e52a7fa..fc4db728faa87f812857b52403c3fb824520f2d1 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-3.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/6",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-3-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/5",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
index 9466d6f3388883e7d2d8e62dd14554e7008b7033..4912b9031b8212ffdca5e22b5c26088490ca39e8 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-4.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/8",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-4-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/7",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
index c52ba228a45066c71983cebb048b3238991dc640..09bbf3e69296b79f6cc279cc977c1b23b4bfaeea 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-5.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/10",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-5-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/9",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
index ef11ad0195c6bbb1ab0f26f58f953f6b17874f09..11f58c3da7fdd1b97d9e8b62ed6ad2e0d0b1cfb9 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-6.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/12",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-6-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
index 2ff7a3336fc6c074a08028fb5e9bbb96b20a2e64..4cf868886291418caa9871a4459c2525077177fc 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-7.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/14",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-7-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/13",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index ed4c8e68250c2249abe8ab5a4375600fc26a678c..2eb17d51b26ced30d66a86e681544bb96ae15e29 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-8.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/16",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-8-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/15",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index b27fca7989b48eeef6b8cc3bbac7e5b3b6d7cce1..97f2d4d9873153faa5e5ccbf9e441fa10881f507 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -82,7 +82,7 @@
"name": "eno1",
"network_address": "parasilo-9.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/18",
"vendor": "Intel"
},
@@ -102,7 +102,7 @@
"name": "eno2",
"network_address": "parasilo-9-eth1.rennes.grid5000.fr",
"rate": 10000000000,
- "switch": "gw-rennes",
+ "switch": "gw",
"switch_port": "Ethernet1/17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
index bf831519dc046afe259e4484271e93d4edcc4e1d..3b7e71315de1128db78a5f877edb569bea657f9a 100644
--- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
@@ -1,15 +1,16 @@
{
"backplane_bps": 1280000000000,
+ "ip": "172.17.111.203",
"kind": "switch",
"linecards": [
{
"kavlan_pattern": "%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
"kind": "switch",
"port": "1:3",
+ "snmp_name": "0",
"uid": "c6509"
},
{
@@ -33,8 +34,8 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "11",
"uid": "srv-bigdata"
},
{
@@ -50,53 +51,61 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "18",
"uid": "ceph3"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "19",
"uid": "ceph2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "20",
"uid": "paranoia-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "21",
"uid": "paranoia-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "22",
"uid": "paranoia-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "23",
"uid": "paranoia-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "24",
"uid": "paranoia-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "25",
"uid": "paranoia-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "26",
"uid": "paranoia-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "27",
"uid": "paranoia-7"
},
{
@@ -110,21 +119,25 @@
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "32",
"uid": "paranoia-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "33",
"uid": "paranoia-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "34",
"uid": "paranoia-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "35",
"uid": "paranoia-1"
},
{
@@ -140,33 +153,37 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "42",
"uid": "ceph1"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "43",
"uid": "ceph0"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "44",
"uid": "paranoia-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "45",
"uid": "paranoia-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "46",
"uid": "paranoia-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "47",
"uid": "paranoia-1"
}
],
@@ -175,25 +192,10 @@
}
],
"model": "Force10 S4810",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "rennes",
"snmp_community": "public",
"type": "network_equipment",
"uid": "bigdata-sw",
- "vlans": {
- "vlan101": {
- "addresses": [
- "172.17.111.203"
- ],
- "administrative": true
- }
- },
- "warranty": "2018-10-01",
- "weathermap": {
- }
+ "warranty": "2018-10-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
index 320077fbefefc6fea7f4ef784158442c4553daec..f78b467ec90f76993bc448582e38f4b1b878a4e6 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -1,5 +1,6 @@
{
"backplane_bps": 720000000000,
+ "ip": "172.17.111.207",
"kind": "switch",
"linecards": [
{
@@ -17,10 +18,12 @@
{
"kind": "router",
"port": "Ethernet2/23",
- "uid": "gw-rennes"
+ "snmp_name": "TenGigabitEthernet1/2",
+ "uid": "gw"
},
{
"kind": "switch",
+ "snmp_name": "TenGigabitEthernet1/3",
"uid": "bigdata-sw"
}
],
@@ -32,7 +35,6 @@
"kavlan_pattern": "Gi%LINECARD%/%PORT%",
"kind": "node",
"model": "WS-X6748-GE-TX",
- "port": "eth2",
"ports": [
{
},
@@ -119,41 +121,49 @@
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/41",
"uid": "paranoia-1"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/42",
"uid": "paranoia-2"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/43",
"uid": "paranoia-3"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/44",
"uid": "paranoia-4"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/45",
"uid": "paranoia-5"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/46",
"uid": "paranoia-6"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/47",
"uid": "paranoia-7"
},
{
"kind": "node",
"port": "eth2",
+ "snmp_name": "Gi2/48",
"uid": "paranoia-8"
}
],
@@ -165,73 +175,85 @@
"kavlan_pattern": "Gi%LINECARD%/%PORT%",
"kind": "node",
"model": "WS-X6748-GE-TX",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/1",
"uid": "parapide-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/2",
"uid": "parapide-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/3",
"uid": "parapide-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/4",
"uid": "parapide-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/5",
"uid": "parapide-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/6",
"uid": "parapide-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/7",
"uid": "parapide-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/8",
"uid": "parapide-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/9",
"uid": "parapide-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/10",
"uid": "parapide-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/11",
"uid": "parapide-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/12",
"uid": "parapide-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/13",
"uid": "parapide-13"
},
{
@@ -239,36 +261,43 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/15",
"uid": "parapide-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/16",
"uid": "parapide-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/17",
"uid": "parapide-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/18",
"uid": "parapide-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/19",
"uid": "parapide-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/20",
"uid": "parapide-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Gi3/21",
"uid": "parapide-25"
}
],
@@ -280,98 +309,115 @@
"kavlan_pattern": "Gi%LINECARD%/%PORT%",
"kind": "node",
"model": "WS-X6748-GE-TX",
- "port": "eth1",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/1",
"uid": "parapluie-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/2",
"uid": "parapluie-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/3",
"uid": "parapluie-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/4",
"uid": "parapluie-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/5",
"uid": "parapluie-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/6",
"uid": "parapluie-12"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/7",
"uid": "parapluie-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/8",
"uid": "parapluie-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/9",
"uid": "parapluie-19"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/10",
"uid": "parapluie-20"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/11",
"uid": "parapluie-21"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/12",
"uid": "parapluie-22"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/13",
"uid": "parapluie-25"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/14",
"uid": "parapluie-28"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/15",
"uid": "parapluie-31"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/16",
"uid": "parapluie-32"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/17",
"uid": "parapluie-35"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Gi4/18",
"uid": "parapluie-38"
}
],
@@ -380,17 +426,10 @@
}
],
"model": "Cisco WS-C6509-E",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "rennes",
"snmp_community": "privkavlan",
"type": "network_equipment",
"uid": "c6509",
- "warranty": "expired",
- "weathermap": {
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json b/data/grid5000/sites/rennes/network_equipments/gw.json
similarity index 72%
rename from data/grid5000/sites/rennes/network_equipments/gw-rennes.json
rename to data/grid5000/sites/rennes/network_equipments/gw.json
index eaaccbb3ba2c61fc3feaab89dca4e9b55b6df049..9d8a6e98c50b50dfa73abbe126a3bf273bb4beb9 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -1,281 +1,348 @@
{
+ "alias": [
+ {
+ "ip": "172.17.111.204",
+ "name": "parasilo-sw-1"
+ },
+ "gw-rennes"
+ ],
"backplane_bps": 1440000000000,
+ "channels": {
+ "port-channel2": {
+ "kind": "switch",
+ "port": "port-channel1",
+ "rate": 80000000000,
+ "uid": "paravance-sw-1"
+ },
+ "port-channel3": {
+ "kind": "switch",
+ "port": "port-channel4",
+ "rate": 80000000000,
+ "uid": "paravance-sw-2"
+ }
+ },
+ "ip": "172.16.111.254",
"kind": "router",
"linecards": [
{
},
{
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/1",
"uid": "parasilo-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/2",
"uid": "parasilo-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/3",
"uid": "parasilo-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/4",
"uid": "parasilo-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/5",
"uid": "parasilo-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/6",
"uid": "parasilo-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/7",
"uid": "parasilo-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/8",
"uid": "parasilo-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/9",
"uid": "parasilo-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/10",
"uid": "parasilo-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/11",
"uid": "parasilo-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/12",
"uid": "parasilo-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/13",
"uid": "parasilo-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/14",
"uid": "parasilo-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/15",
"uid": "parasilo-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/16",
"uid": "parasilo-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/17",
"uid": "parasilo-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/18",
"uid": "parasilo-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/19",
"uid": "parasilo-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/20",
"uid": "parasilo-10"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/21",
"uid": "parasilo-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/22",
"uid": "parasilo-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/23",
"uid": "parasilo-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/24",
"uid": "parasilo-12"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/25",
"uid": "parasilo-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/26",
"uid": "parasilo-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/27",
"uid": "parasilo-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/28",
"uid": "parasilo-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/29",
"uid": "parasilo-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/30",
"uid": "parasilo-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/31",
"uid": "parasilo-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/32",
"uid": "parasilo-16"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/33",
"uid": "parasilo-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/34",
"uid": "parasilo-17"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/35",
"uid": "parasilo-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/36",
"uid": "parasilo-18"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/37",
"uid": "parasilo-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/38",
"uid": "parasilo-19"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/39",
"uid": "parasilo-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/40",
"uid": "parasilo-20"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/41",
"uid": "parasilo-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/42",
"uid": "parasilo-21"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/43",
"uid": "parasilo-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/44",
"uid": "parasilo-22"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/45",
"uid": "parasilo-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/46",
"uid": "parasilo-23"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/47",
"uid": "parasilo-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/48",
"uid": "parasilo-24"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/51",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "paravance-sw-2"
+ "snmp_name": "Ethernet1/49",
+ "uid": "port-channel3"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/52",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "paravance-sw-2"
+ "snmp_name": "Ethernet1/50",
+ "uid": "port-channel3"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/49",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "paravance-sw-1"
+ "snmp_name": "Ethernet1/51",
+ "uid": "port-channel2"
},
{
- "aggregation": "lacp",
- "kind": "switch",
- "port": "Ethernet1/50",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "paravance-sw-1"
+ "snmp_name": "Ethernet1/52",
+ "uid": "port-channel2"
}
],
"rate": 10000000000,
@@ -283,47 +350,56 @@
},
{
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/1",
"uid": "parasilo-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/2",
"uid": "parasilo-25"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/3",
"uid": "parasilo-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/4",
"uid": "parasilo-26"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/5",
"uid": "parasilo-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/6",
"uid": "parasilo-27"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/7",
"uid": "parasilo-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/8",
"uid": "parasilo-28"
},
{
@@ -357,10 +433,12 @@
{
"kind": "switch",
"port": "TenGigabitEthernet1/2",
+ "snmp_name": "Ethernet2/23",
"uid": "c6509"
},
{
- "kind": "virtual",
+ "kind": "backbone",
+ "snmp_name": "Ethernet2/24",
"uid": "renater-rennes"
}
],
@@ -369,16 +447,11 @@
}
],
"model": "Nexus 56128P",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 10
- }
- },
+ "role": "production",
"site": "rennes",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "gw-rennes",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
@@ -458,7 +531,5 @@
"name": "kavlan-16"
}
},
- "warranty": "2018-04-01",
- "weathermap": {
- }
+ "warranty": "2018-04-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
index e5671b28ef6cbde44c3870682889c08b3d02f70f..14a688f5f865def3e2db5dcdbab47728661a1296 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
@@ -1,267 +1,323 @@
{
"backplane_bps": 1440000000000,
+ "channels": {
+ "port-channel1": {
+ "kind": "router",
+ "port": "port-channel2",
+ "rate": 80000000000,
+ "uid": "gw"
+ }
+ },
+ "ip": "172.17.111.206",
"kind": "switch",
"linecards": [
{
},
{
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/1",
"uid": "paravance-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/2",
"uid": "paravance-1"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/3",
"uid": "paravance-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/4",
"uid": "paravance-2"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/5",
"uid": "paravance-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/6",
"uid": "paravance-3"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/7",
"uid": "paravance-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/8",
"uid": "paravance-4"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/9",
"uid": "paravance-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/10",
"uid": "paravance-5"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/11",
"uid": "paravance-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/12",
"uid": "paravance-6"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/13",
"uid": "paravance-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/14",
"uid": "paravance-7"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/15",
"uid": "paravance-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/16",
"uid": "paravance-8"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/17",
"uid": "paravance-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/18",
"uid": "paravance-9"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/19",
"uid": "paravance-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/20",
"uid": "paravance-10"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/21",
"uid": "paravance-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/22",
"uid": "paravance-11"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/23",
"uid": "paravance-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/24",
"uid": "paravance-12"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/25",
"uid": "paravance-13"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/26",
"uid": "paravance-13"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/27",
"uid": "paravance-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/28",
"uid": "paravance-14"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/29",
"uid": "paravance-15"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/30",
"uid": "paravance-15"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/31",
"uid": "paravance-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/32",
"uid": "paravance-16"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/33",
"uid": "paravance-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/34",
"uid": "paravance-17"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/35",
"uid": "paravance-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/36",
"uid": "paravance-18"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/37",
"uid": "paravance-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/38",
"uid": "paravance-19"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/39",
"uid": "paravance-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/40",
"uid": "paravance-20"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/41",
"uid": "paravance-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/42",
"uid": "paravance-21"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/43",
"uid": "paravance-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/44",
"uid": "paravance-22"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/45",
"uid": "paravance-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/46",
"uid": "paravance-23"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/47",
"uid": "paravance-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/48",
"uid": "paravance-24"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/51",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "gw-rennes"
+ "snmp_name": "Ethernet1/49",
+ "uid": "port-channel1"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/52",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "gw-rennes"
+ "snmp_name": "Ethernet1/50",
+ "uid": "port-channel1"
}
],
"rate": 10000000000,
@@ -269,127 +325,152 @@
},
{
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/1",
"uid": "paravance-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/2",
"uid": "paravance-25"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/3",
"uid": "paravance-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/4",
"uid": "paravance-26"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/5",
"uid": "paravance-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/6",
"uid": "paravance-27"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/7",
"uid": "paravance-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/8",
"uid": "paravance-28"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/9",
"uid": "paravance-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/10",
"uid": "paravance-29"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/11",
"uid": "paravance-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/12",
"uid": "paravance-30"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/13",
"uid": "paravance-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/14",
"uid": "paravance-31"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/15",
"uid": "paravance-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/16",
"uid": "paravance-32"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/17",
"uid": "paravance-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/18",
"uid": "paravance-33"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/19",
"uid": "paravance-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/20",
"uid": "paravance-34"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/21",
"uid": "paravance-35"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/22",
"uid": "paravance-35"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/23",
"uid": "paravance-36"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/24",
"uid": "paravance-36"
}
],
@@ -398,17 +479,10 @@
}
],
"model": "Nexus 56128P",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "rennes",
"snmp_community": "public",
"type": "network_equipment",
"uid": "paravance-sw-1",
- "warranty": "2018-04-01",
- "weathermap": {
- }
+ "warranty": "2018-04-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
index 61c7cb796bd0f665f6bdbef3269ed543a14ece15..fb0ef20b4bec7268f71e3ecc07c1d53bf9447388 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
@@ -1,252 +1,310 @@
{
"backplane_bps": 1440000000000,
+ "channels": {
+ "port-channel4": {
+ "kind": "router",
+ "port": "port-channel3",
+ "rate": 80000000000,
+ "uid": "gw"
+ }
+ },
+ "ip": "172.17.111.205",
"kind": "switch",
"linecards": [
{
},
{
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/1",
"uid": "paravance-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/2",
"uid": "paravance-37"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/3",
"uid": "paravance-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/4",
"uid": "paravance-38"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/5",
"uid": "paravance-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/6",
"uid": "paravance-39"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/7",
"uid": "paravance-40"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/8",
"uid": "paravance-40"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/9",
"uid": "paravance-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/10",
"uid": "paravance-41"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/11",
"uid": "paravance-42"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/12",
"uid": "paravance-42"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/13",
"uid": "paravance-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/14",
"uid": "paravance-43"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/15",
"uid": "paravance-44"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/16",
"uid": "paravance-44"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/17",
"uid": "paravance-45"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/18",
"uid": "paravance-45"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/19",
"uid": "paravance-46"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/20",
"uid": "paravance-46"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/21",
"uid": "paravance-47"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/22",
"uid": "paravance-47"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/23",
"uid": "paravance-48"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/24",
"uid": "paravance-48"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/25",
"uid": "paravance-49"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/26",
"uid": "paravance-49"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/27",
"uid": "paravance-50"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/28",
"uid": "paravance-50"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/29",
"uid": "paravance-51"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/30",
"uid": "paravance-51"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/31",
"uid": "paravance-52"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/32",
"uid": "paravance-52"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/33",
"uid": "paravance-53"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/34",
"uid": "paravance-53"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/35",
"uid": "paravance-54"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/36",
"uid": "paravance-54"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/37",
"uid": "paravance-55"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/38",
"uid": "paravance-55"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/39",
"uid": "paravance-56"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/40",
"uid": "paravance-56"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/41",
"uid": "paravance-57"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/42",
"uid": "paravance-57"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/43",
"uid": "paravance-58"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/44",
"uid": "paravance-58"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/45",
"uid": "paravance-59"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/46",
"uid": "paravance-59"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet1/47",
"uid": "paravance-60"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet1/48",
"uid": "paravance-60"
},
{
@@ -254,18 +312,16 @@
{
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/49",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "gw-rennes"
+ "snmp_name": "Ethernet1/51",
+ "uid": "port-channel4"
},
{
- "aggregation": "lacp",
- "kind": "router",
- "port": "Ethernet1/50",
+ "kind": "channel",
"rate": 40000000000,
- "uid": "gw-rennes"
+ "snmp_name": "Ethernet1/52",
+ "uid": "port-channel4"
}
],
"rate": 10000000000,
@@ -273,127 +329,152 @@
},
{
"kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kind": "node",
"ports": [
{
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/1",
"uid": "paravance-61"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/2",
"uid": "paravance-61"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/3",
"uid": "paravance-62"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/4",
"uid": "paravance-62"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/5",
"uid": "paravance-63"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/6",
"uid": "paravance-63"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/7",
"uid": "paravance-64"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/8",
"uid": "paravance-64"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/9",
"uid": "paravance-65"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/10",
"uid": "paravance-65"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/11",
"uid": "paravance-66"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/12",
"uid": "paravance-66"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/13",
"uid": "paravance-67"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/14",
"uid": "paravance-67"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/15",
"uid": "paravance-68"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/16",
"uid": "paravance-68"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/17",
"uid": "paravance-69"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/18",
"uid": "paravance-69"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/19",
"uid": "paravance-70"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/20",
"uid": "paravance-70"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/21",
"uid": "paravance-71"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/22",
"uid": "paravance-71"
},
{
"kind": "node",
"port": "eth1",
+ "snmp_name": "Ethernet2/23",
"uid": "paravance-72"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Ethernet2/24",
"uid": "paravance-72"
}
],
@@ -402,17 +483,10 @@
}
],
"model": "Nexus 56128P",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "rennes",
"snmp_community": "public",
"type": "network_equipment",
"uid": "paravance-sw-2",
- "warranty": "2018-04-01",
- "weathermap": {
- }
+ "warranty": "2018-04-01"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index 4b160d90805ec982ca922c38fd875f765fb4eb08..bcff18bfcbf4a759ed810dce041dfddab7a59f7e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-1.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/10",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index 05e0683e0e69b6ee3df53f0c7cc1db11b187dbc0..1664b1a06de33fccd172ceda0a2c137a81f6f9de 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-10.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/3",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index f81ea77511936eea33924db1b0deeaab198be7fc..d3e9a4ca7848019d0716e107bb9d632af89feb4d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-11.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/2",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index 2b0902a9e5c18a95bd32e525ba1d5800d6f0970c..259eda0b4486965058af8a486f48ae3dc3ab9c04 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-12.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/6",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index 40c601ea071abe479a2ee981e94ae3d1bb8f8d2d..b57ea487c53b9e43c6f27778cafc3e4fcb9720c8 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-13.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/13",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index cf8b7638e4382f64d9a7c5ee23db169225fbbffa..d9b25dc3734a02d19aa26a1545292ded6dd418a9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-14.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/19",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index 893ff14f8d1bd9ce2fa39ece4c7933c85e4aa71e..2522ebc9baa9171d760b3f76352922e2ace81e1c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-15.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/17",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index 4addfca19e263cacfaa705c41fc39413ec2aa926..fc91f87204f952564b08608d00a4f7bc49f39b49 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-16.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/21",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index 6e3be4f078765290f3521288e72c2a1e505d1464..3e26a357672c116957fbf069a428dd65fb340e2b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-17.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/15",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index 9d41c0fd35f8902a3ae1353d05b1fe9bc8993ee1..18097f9ee5afb9566cf19b3ba0422f6cf8620996 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-18.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index 31fd52ac3dbc1ca960d4706fbb1fe0e9972b21bb..10f3dd8f9a216446d4a4bc49710b4724d6f53a72 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-19.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/2",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index f458fabf31a56f699ce7d105f4ebcb7942cd1d81..a347871595a89439041bb039e0897d03d093090e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-2.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/11",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index 798782918b839baf69ac8ddaae72010fd3ae493d..de87c6eb5a50303f65558f27af5ec2cc0543d697 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-20.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/3",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index 608156acb47d6ec3bb086500417eb6d7ef919b9a..8e97521580476daf52414ce0657e3e58148c101e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-21.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/4",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index 44d1ad89f54ad48bdbc6761ab376e5a852caf50b..3ebfc55bc64fca5f29a313ffb41c16d54aed3b81 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-22.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/5",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index a91e546fc830f0255cc123fe0db20a948b73e4fa..550be70b2597357344d8318fbe08672dd187f14d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-23.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/6",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index 92fda1913860e168097f9383d9949ab5013b0c3f..72b9e27410dd253265a4be0d6301ee86614ca4aa 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-24.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/7",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 4c1810d83dbaf0e3ffdc97676cae2bb3b34fbd07..c597ae34d1f40e897f35a6f12a050e89254b6ae4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-25.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/8",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index 73f820a62cf5d07540fd6062fbd4489603a72acc..e5903bfa531e46d95313cd4c1e4a39366f46c7ec 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-26.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/9",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index 2b3302acd568f736168db513c233a366b37af5fc..a1fee948a70483c11d00dec03816cb8beb21aecc 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-27.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/10",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index 79bc29e08ec0a780b8fed3a9796a1835ebfd73e8..8b9b9562c4aa1d55f7dd7cebd7d851cf004de3aa 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-28.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/11",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index a537fc810916cf14dc1ba2f10e7d82f92bf2f447..fc256acbe00d42355625ad3da5fb1281d90829df 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-29.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/12",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index 3a732955e7259044d56ee3a4cf150d6d95425ade..6572e6fa894131d882a4aa2711438619a2db5a21 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-3.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index 00a0910cfe00c2751bddd0e394f104a5548b3725..fbdd5454afd68177c0b8c633546e4adabfaea4f4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-30.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/13",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 6a833af27c0c23d1db228e6b02be4f5cc4494ab7..e489a8d2f3446d4a858a8fad74cb773c672ec82e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-31.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/14",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index ae0a89a7fec6459adbcdcce57d1585ea7a33eee9..ad9017888d5847441bfbfa92b28763d0e4453375 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-32.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/15",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index bee7947c7a964ce9ccd8ce3ec6962554664b56db..b97af138b1c5d3462918fdb740b0bdcad1b772e2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-33.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/16",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index 87146dcb2e45805a3df23092b8bff8d7ffd93479..0818c55186d587736638ad89c6ad794af689bc72 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-34.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/17",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index e7dae5a6652a8e9d12c775bb92ea463c0c92cbb5..18cb1ac3c644c9b4b2f15bdfb16bccc88cd23741 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-35.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet6/18",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index bddbb3a7f090b0d8e23ee23fdc149c5375ba7674..838fc5ddffa651e05edcb824732625ba9955b5b7 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-36.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/1",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index 57eefb1cf03f8648008339f1072e3736b5cd9084..e995aa76dc300ada4afc5dafae53bd2596ffadae 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-37.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/2",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index ca117f5a9ed2fa208594e257a9de743c5d6780d6..f895e3d203afc852ef656db92136821a27b2ee84 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-38.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/3",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index dfc5b407879dd38044d82399248bc072b4bb76c0..ab2c24c8b31747572e9bf685544f9662df76f80b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-39.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/4",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index 5b86780cfbcc6de23ec6880e4efcc42f473aecfd..554e1280e68557241d275d46b853b4ab1c80295d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-4.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/5",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index 1df7f548abd8422214d8bfb30d4d15082d1431ca..bf8e4adbf203740c0da9f22454f09ea223e7bd97 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-40.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/5",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index 2e28e0b78df46808135a7d42ca12ffe5d02ca478..9b42b520d9a38316c22e3f059bbc2f5fb8c25d59 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-41.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/6",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index 22e88b6835e203655444984a42ad4a8f4a244985..6c66f4f6c645ea2b1eb19b1f3780617a86eee381 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-42.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/7",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index f52d379d3cb294ba9849d743b8905383c530e7f2..fc0b2ea84736818b84666d9e18fb5c6390642f2f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-43.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/8",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index e25f58ece5bec5906e602dafea02f18688810095..66275bfe294ba327aff806c376ded26cc8c1ade1 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-44.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/9",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index c94135d4bb2c6d1de5b1fbf41cb373e617d4e696..0522910455952b0f54ae5aaa2f07b54e6763564b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-45.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet7/10",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 920bc2411cb55dc2e22b15041d9b32cddf988b91..19fb1f299d059b9bf26db6a5a687cfb53e719413 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-5.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/4",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index acd925230e808c426993f41b8b498b1424065c07..f3121feb6e0e17d0dd12d418dfbbf660d8d219bd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -62,7 +62,7 @@
"name": "eno1",
"network_address": "suno-6.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/7",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index 97c4867f6d4123d6a01d40ad3a774973f46a589a..21ec218d443ae257315d7502a98713c4a8e09f04 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-7.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/8",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index 8bed2ed83b84badc864fb3de0fa06a40ee185466..368053706f5da280cb4e7e2b0e42a5326b5a1f9c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-8.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/12",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 25fb1ae24192fac50a8c51ac9870dbfdc112f74a..7db5ee1dfd3dff7a148080d29d6c41a001647915 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -63,7 +63,7 @@
"name": "eno1",
"network_address": "suno-9.sophia.grid5000.fr",
"rate": 1000000000,
- "switch": "gw-sophia",
+ "switch": "gw",
"switch_port": "GigabitEthernet5/9",
"vendor": "Broadcom"
},
diff --git a/data/grid5000/sites/sophia/network_equipments/edgeiron.json b/data/grid5000/sites/sophia/network_equipments/edgeiron.json
deleted file mode 100644
index 55c742e2f0746e8849aa77e661b49c88cdfe1c92..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/network_equipments/edgeiron.json
+++ /dev/null
@@ -1,225 +0,0 @@
-{
- "backplane_bps": 40000000000,
- "kind": "switch",
- "linecards": [
- {
- "kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
- "kind": "router",
- "ports": [
- {
- },
- {
- "kind": "router",
- "port": "ethernet2/1",
- "uid": "gw-sophia"
- },
- {
- "kind": "router",
- "port": "ethernet2/2",
- "uid": "gw-sophia"
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- "kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- },
- {
- },
- {
- "kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
- "kind": "node",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- }
- ],
- "rate": 1000000000,
- "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
- }
- ],
- "model": "Foundry",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
- "site": "sophia",
- "snmp_community": "public",
- "type": "network_equipment",
- "uid": "edgeiron",
- "vlans": {
- "vlan100": {
- "addresses": [
- "172.16.143.250"
- ],
- "administrative": true
- }
- },
- "warranty": "expired",
- "weathermap": {
- "use_cacti": "no"
- }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json b/data/grid5000/sites/sophia/network_equipments/gw.json
similarity index 71%
rename from data/grid5000/sites/sophia/network_equipments/gw-sophia.json
rename to data/grid5000/sites/sophia/network_equipments/gw.json
index 277b9ae98e53b41609028edfd346ba154db77012..dbfd8b48c1e56e434f049ad276cb1bf819aa21dd 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -1,5 +1,9 @@
{
+ "alias": [
+ "gw-sophia"
+ ],
"backplane_bps": 900000000000,
+ "ip": "172.16.143.254",
"kind": "router",
"linecards": [
{
@@ -11,12 +15,14 @@
{
},
{
- "kind": "other",
+ "kind": "backbone",
+ "snmp_name": "10GigabitEthernet1/1",
"uid": "renater5-FON"
},
{
"kind": "switch",
"port": "0/5",
+ "snmp_name": "10GigabitEthernet1/2",
"uid": "swx1nef"
}
],
@@ -24,24 +30,6 @@
"snmp_pattern": "10GigabitEthernet%LINECARD%/%PORT%"
},
{
- "backplane_bps": 20000000000,
- "kind": "switch",
- "ports": [
- {
- },
- {
- "kind": "switch",
- "port": "0/1",
- "uid": "edgeiron"
- },
- {
- "kind": "switch",
- "port": "0/2",
- "uid": "edgeiron"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "10GigabitEthernet%LINECARD%/%PORT%"
},
{
},
@@ -58,66 +46,79 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/1",
"uid": "suno-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/2",
"uid": "suno-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/3",
"uid": "suno-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/4",
"uid": "suno-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/5",
"uid": "suno-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/6",
"uid": "suno-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/7",
"uid": "suno-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/8",
"uid": "suno-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/9",
"uid": "suno-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/10",
"uid": "suno-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/11",
"uid": "suno-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/12",
"uid": "suno-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/13",
"uid": "suno-13"
},
{
@@ -125,6 +126,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/15",
"uid": "suno-17"
},
{
@@ -132,6 +134,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/17",
"uid": "suno-15"
},
{
@@ -139,6 +142,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/19",
"uid": "suno-14"
},
{
@@ -146,6 +150,7 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet5/21",
"uid": "suno-16"
}
],
@@ -163,122 +168,146 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/1",
"uid": "suno-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/2",
"uid": "suno-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/3",
"uid": "suno-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/4",
"uid": "suno-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/5",
"uid": "suno-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/6",
"uid": "suno-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/7",
"uid": "suno-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/8",
"uid": "suno-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/9",
"uid": "suno-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/10",
"uid": "suno-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/11",
"uid": "suno-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/12",
"uid": "suno-29"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/13",
"uid": "suno-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/14",
"uid": "suno-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/15",
"uid": "suno-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/16",
"uid": "suno-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/17",
"uid": "suno-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet6/18",
"uid": "suno-35"
},
{
- "kind": "other",
- "port": "eth2",
- "uid": "srv-stock"
+ "kind": "server",
+ "port": "eth0",
+ "snmp_name": "GigabitEthernet6/19",
+ "uid": "srv-stock-eth2"
},
{
- "kind": "other",
- "port": "eth1",
- "uid": "srv"
+ "kind": "server",
+ "port": "eth0",
+ "snmp_name": "GigabitEthernet6/20",
+ "uid": "srv-eth1"
},
{
- "kind": "other",
- "port": "eth3",
- "uid": "srv"
+ "kind": "server",
+ "port": "eth0",
+ "snmp_name": "GigabitEthernet6/21",
+ "uid": "srv-eth3"
},
{
- "kind": "other",
- "port": "eth2",
- "uid": "srv"
+ "kind": "server",
+ "port": "eth0",
+ "snmp_name": "GigabitEthernet6/22",
+ "uid": "srv-eth2"
},
{
- "kind": "other",
- "port": "eth3",
- "uid": "srv-stock"
+ "kind": "server",
+ "port": "eth0",
+ "snmp_name": "GigabitEthernet6/23",
+ "uid": "srv-stock-eth3"
},
{
- "kind": "other",
- "port": "eth1",
- "uid": "srv-stock"
+ "kind": "server",
+ "port": "eth0",
+ "snmp_name": "GigabitEthernet6/24",
+ "uid": "srv-stock-eth1"
}
],
"rate": 1000000000,
@@ -288,58 +317,67 @@
"backplane_bps": 24000000000,
"kavlan_pattern": "%LINECARD%/%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/1",
"uid": "suno-36"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/2",
"uid": "suno-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/3",
"uid": "suno-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/4",
"uid": "suno-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/5",
"uid": "suno-40"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/6",
"uid": "suno-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/7",
"uid": "suno-42"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/8",
"uid": "suno-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/9",
"uid": "suno-44"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "GigabitEthernet7/10",
"uid": "suno-45"
},
{
@@ -357,9 +395,9 @@
{
},
{
- "kind": "other",
- "port": "eth1",
- "uid": "srv2"
+ "kind": "server",
+ "snmp_name": "GigabitEthernet7/18",
+ "uid": "srv2-eth1"
},
{
},
@@ -370,13 +408,13 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "GigabitEthernet7/23",
"uid": "srv"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "GigabitEthernet7/24",
"uid": "srv-stock"
}
],
@@ -411,16 +449,16 @@
{
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "GigabitEthernet9/10",
"uid": "stock"
},
{
},
{
- "kind": "other",
- "port": "eth1",
- "uid": "stock"
+ "kind": "server",
+ "snmp_name": "GigabitEthernet9/12",
+ "uid": "stock-eth1"
}
],
"rate": 1000000000,
@@ -428,16 +466,11 @@
}
],
"model": "Foundry",
- "sensors": {
- "network": {
- "available": true,
- "resolution": 1
- }
- },
+ "role": "production",
"site": "sophia",
"snmp_community": "g5kadmin",
"type": "network_equipment",
- "uid": "gw-sophia",
+ "uid": "gw",
"vlans": {
"vlan100": {
"addresses": [
@@ -541,7 +574,5 @@
"name": "kavlan-18"
}
},
- "warranty": "expired",
- "weathermap": {
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swx1nef.json b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
index 9f14224ab299df845e8ce7e68daec7a0e52ee4a2..3f052b5fb30ded422ab63647893d5c31b827ebd9 100644
--- a/data/grid5000/sites/sophia/network_equipments/swx1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
@@ -18,7 +18,8 @@
{
"kind": "router",
"port": "1/2",
- "uid": "gw-sophia"
+ "snmp_name": "Port: 5 Gigabit",
+ "uid": "gw"
},
{
},
@@ -47,11 +48,13 @@
{
"kind": "switch",
"port": "0/103",
+ "snmp_name": "Port: 18 Gigabit",
"uid": "swy1nef"
},
{
"kind": "other",
"port": "eth3",
+ "snmp_name": "Port: 19 Gigabit",
"uid": "srv3"
}
],
@@ -60,11 +63,10 @@
}
],
"model": "Juniper EX2500-24F-FB",
+ "role": "production",
"site": "sophia",
"snmp_community": "g5kadmin",
"type": "network_equipment",
"uid": "swx1nef",
- "warranty": "expired",
- "weathermap": {
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swy1nef.json b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
index e512a16ea8933bcbdab497682929b51ed07063d2..6cdf076f6ea5ba0c422dc444bf774eac96941720 100644
--- a/data/grid5000/sites/sophia/network_equipments/swy1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
@@ -1,11 +1,11 @@
{
"backplane_bps": 184000000000,
+ "ip": "172.16.143.249",
"kind": "switch",
"linecards": [
{
"kavlan_pattern": "%PORT%",
"kind": "node",
- "port": "eth0",
"ports": [
{
},
@@ -116,16 +116,19 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 53 Gigabit",
"uid": "uvb-27"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 54 Gigabit",
"uid": "uvb-39"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 55 Gigabit",
"uid": "uvb-44"
},
{
@@ -133,191 +136,228 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 57 Gigabit",
"uid": "uvb-43"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 58 Gigabit",
"uid": "uvb-40"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 59 Gigabit",
"uid": "uvb-32"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 60 Gigabit",
"uid": "uvb-26"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 61 Gigabit",
"uid": "uvb-25"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 62 Gigabit",
"uid": "uvb-28"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 63 Gigabit",
"uid": "uvb-36"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 64 Gigabit",
"uid": "uvb-31"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 65 Gigabit",
"uid": "uvb-30"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 66 Gigabit",
"uid": "uvb-35"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 67 Gigabit",
"uid": "uvb-22"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 68 Gigabit",
"uid": "uvb-21"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 69 Gigabit",
"uid": "uvb-24"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 70 Gigabit",
"uid": "uvb-23"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 71 Gigabit",
"uid": "uvb-15"
},
{
- "kind": "other",
- "port": "eth0",
+ "kind": "server",
+ "snmp_name": "Port: 72 Gigabit",
"uid": "opensm"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 73 Gigabit",
"uid": "uvb-19"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 74 Gigabit",
"uid": "uvb-14"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 75 Gigabit",
"uid": "uvb-17"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 76 Gigabit",
"uid": "uvb-18"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 77 Gigabit",
"uid": "uvb-20"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 78 Gigabit",
"uid": "uvb-16"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 79 Gigabit",
"uid": "uvb-12"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 80 Gigabit",
"uid": "uvb-9"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 81 Gigabit",
"uid": "uvb-10"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 82 Gigabit",
"uid": "uvb-11"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 83 Gigabit",
"uid": "uvb-7"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 84 Gigabit",
"uid": "uvb-8"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 85 Gigabit",
"uid": "uvb-5"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 86 Gigabit",
"uid": "uvb-6"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 87 Gigabit",
"uid": "uvb-4"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 88 Gigabit",
"uid": "uvb-1"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 89 Gigabit",
"uid": "uvb-3"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 90 Gigabit",
"uid": "uvb-2"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 91 Gigabit",
"uid": "uvb-38"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 92 Gigabit",
"uid": "uvb-37"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 93 Gigabit",
"uid": "uvb-34"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 94 Gigabit",
"uid": "uvb-29"
},
{
@@ -325,16 +365,19 @@
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 96 Gigabit",
"uid": "uvb-33"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 97 Gigabit",
"uid": "uvb-41"
},
{
"kind": "node",
"port": "eth0",
+ "snmp_name": "Port: 98 Gigabit",
"uid": "uvb-42"
},
{
@@ -348,6 +391,7 @@
{
"kind": "switch",
"port": "0/18",
+ "snmp_name": "Port: 103 Gigabit",
"uid": "swx1nef"
}
],
@@ -356,11 +400,10 @@
}
],
"model": "Dell PowerConnect 6248",
+ "role": "production",
"site": "sophia",
"snmp_community": "g5kadmin",
"type": "network_equipment",
"uid": "swy1nef",
- "warranty": "expired",
- "weathermap": {
- }
+ "warranty": "expired"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
index 84abbdf00df7c3233f5aac9a59fd6d63093411f6..da49b8886fb722235d10e96fc24d42610830ff0d 100644
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw.yaml
@@ -1,16 +1,16 @@
---
gw:
+ role: production
model: ExtremeNetworks
kind: router
- alias: [sw-imag]
+ alias:
+ - sw-imag
+ - gw-grenoble
site: grenoble
warranty: expired
backplane_bps: 800000000000
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
+ ip: 172.16.31.254
vlans:
"vlan100":
administrative: yes
@@ -68,7 +68,6 @@ gw:
kavlan_pattern: "%PORT%"
backplane_bps: 48000000000
kind: node
- port: eth0
rate: 10000000000
ports:
1: dahu-1
@@ -113,19 +112,19 @@ gw:
40: troll-4
41:
uid: dighyp1
- kind: other
+ kind: server
42:
uid: dighyp2
- kind: other
+ kind: server
43:
uid: digsed
- kind: other
+ kind: server
44:
uid: digsed
- kind: other
+ kind: server
45:
uid: digwatt
- kind: other
+ kind: server
48:
uid: renater5
- kind: other
+ kind: backbone
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index 54e8b78de5e5d1c58c4a87ae4643033202d250e0..04376f94f5d5e69285dfd000f78599230ccc66f4 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -1,18 +1,16 @@
---
sw-chiclet-1:
+ role: production
model: cisco 93180YC-EX
warranty: 2021-11-30
+ ip: 172.17.47.221
kind: switch
site: lille
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 36000000000000
linecards:
1:
- kind: virtual
+ kind: node
snmp_pattern: Ethernet%LINECARD%/%PORT%
kavlan_pattern: Ethernet%LINECARD%/%PORT%
backplane_bps: 36000000000000
@@ -20,141 +18,79 @@ sw-chiclet-1:
ports:
1:
uid: chifflot-1
- port: eth0
- kind: node
2:
uid: chifflot-2
- port: eth0
- kind: node
3:
uid: chifflot-3
- port: eth0
- kind: node
4:
uid: chifflot-4
- port: eth0
- kind: node
5:
uid: chifflot-5
- port: eth0
- kind: node
6:
uid: chifflot-6
- port: eth0
- kind: node
7:
uid: chifflot-7
- port: eth0
- kind: node
8:
uid: chifflot-8
- port: eth0
- kind: node
9:
uid: chiclet-1
- port: eth0
- kind: node
10:
uid: chiclet-2
- port: eth0
- kind: node
11:
uid: chiclet-3
- port: eth0
- kind: node
12:
uid: chiclet-4
- port: eth0
- kind: node
13:
uid: chiclet-5
- port: eth0
- kind: node
14:
uid: chiclet-6
- port: eth0
- kind: node
15:
uid: chiclet-7
- port: eth0
- kind: node
16:
uid: chiclet-8
- port: eth0
- kind: node
17:
- uid: chifflot-1
- port: eth1
- kind: node
+ uid: chifflot-1-eth1
18:
- uid: chifflot-2
- port: eth1
- kind: node
+ uid: chifflot-2-eth1
19:
- uid: chifflot-3
- port: eth1
- kind: node
+ uid: chifflot-3-eth1
20:
- uid: chifflot-4
- port: eth1
- kind: node
+ uid: chifflot-4-eth1
21:
- uid: chifflot-5
- port: eth1
- kind: node
+ uid: chifflot-5-eth1
22:
- uid: chifflot-6
- port: eth1
- kind: node
+ uid: chifflot-6-eth1
23:
- uid: chifflot-7
- port: eth1
- kind: node
+ uid: chifflot-7-eth1
24:
- uid: chifflot-8
- port: eth1
- kind: node
+ uid: chifflot-8-eth1
25:
- uid: chiclet-1
- port: eth1
- kind: node
+ uid: chiclet-1-eth1
26:
- uid: chiclet-2
- port: eth1
- kind: node
+ uid: chiclet-2-eth1
27:
- uid: chiclet-3
- port: eth1
- kind: node
+ uid: chiclet-3-eth1
28:
- uid: chiclet-4
- port: eth1
- kind: node
+ uid: chiclet-4-eth1
29:
- uid: chiclet-5
- port: eth1
- kind: node
+ uid: chiclet-5-eth1
30:
- uid: chiclet-6
- port: eth1
- kind: node
+ uid: chiclet-6-eth1
31:
- uid: chiclet-7
- port: eth1
- kind: node
+ uid: chiclet-7-eth1
32:
- uid: chiclet-8
- port: eth1
- kind: node
+ uid: chiclet-8-eth1
53:
- uid: sw-chiclet-2
- kind: router
- port: Ethernet1/52
- aggregation: lacp
+ uid: port-channel1
+ kind: channel
rate: 100000000000
54:
- uid: sw-chiclet-2
- kind: router
- port: Ethernet1/51
- aggregation: lacp
+ uid: port-channel1
+ kind: channel
rate: 100000000000
+ channels:
+ port-channel1:
+ port: port-channel1
+ uid: sw-chiclet-2
+ kind: router
+ rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 1f212cdc7bc1a714a509f0f9439f94553e1e8a4a..13fa90675e915d966b139be161b82050d6707744 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -1,14 +1,17 @@
---
sw-chiclet-2:
+ role: production
model: cisco 93180YC-EX
warranty: 2021-11-30
+ alias:
+ - name: gw
+ ip: 172.16.47.254
+ - name: gw-adm
+ ip: 172.17.47.254
+ ip: 172.17.47.222
kind: router
site: lille
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 36000000000000
vlans:
"vlan100":
@@ -63,40 +66,43 @@ sw-chiclet-2:
- 10.11.192.0/18
linecards:
1:
- kind: virtual
+ kind: other
snmp_pattern: Ethernet%LINECARD%/%PORT%
kavlan_pattern: Ethernet%LINECARD%/%PORT%
backplane_bps: 36000000000000
rate: 10000000000
- port: eth0
ports:
33:
uid: renater5-FON
- kind: other
+ kind: backbone
35:
uid: labo
kind: other
+ rate: 1000000000
51:
- uid: sw-chiclet-1
- kind: switch
- port: Ethernet1/54
- aggregation: lacp
+ uid: port-channel1
+ kind: channel
rate: 100000000000
52:
- uid: sw-chiclet-1
- kind: switch
- port: Ethernet1/53
- aggregation: lacp
+ uid: port-channel1
+ kind: channel
rate: 100000000000
53:
- uid: sw-chiclet-3
- kind: switch
- port: Ethernet1/53
- aggregation: lacp
+ uid: port-channel2
+ kind: channel
rate: 100000000000
54:
- uid: sw-chiclet-3
- kind: switch
- port: Ethernet1/54
- aggregation: lacp
+ uid: port-channel2
+ kind: channel
rate: 100000000000
+ channels:
+ port-channel1:
+ port: port-channel1
+ uid: sw-chiclet-1
+ kind: switch
+ rate: 200000000000
+ port-channel2:
+ port: port-channel1
+ uid: sw-chiclet-3
+ kind: switch
+ rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index 0a1f4b65ff5eec7ff8234bcbaa9d75f850d50ada..5fd2ff35e90432c4d21f27c1a5021a55f5618f43 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -1,18 +1,16 @@
---
sw-chiclet-3:
+ role: production
model: cisco 93180YC-EX
warranty: 2021-11-30
+ ip: 172.17.47.223
kind: switch
site: lille
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 36000000000000
linecards:
1:
- kind: virtual
+ kind: node
snmp_pattern: Ethernet%LINECARD%/%PORT%
kavlan_pattern: Ethernet%LINECARD%/%PORT%
backplane_bps: 36000000000000
@@ -20,197 +18,107 @@ sw-chiclet-3:
ports:
1:
uid: chetemi-1
- port: eth0
- kind: node
2:
uid: chetemi-2
- port: eth0
- kind: node
3:
uid: chetemi-3
- port: eth0
- kind: node
4:
uid: chetemi-4
- port: eth0
- kind: node
5:
uid: chetemi-5
- port: eth0
- kind: node
6:
uid: chetemi-6
- port: eth0
- kind: node
7:
uid: chetemi-7
- port: eth0
- kind: node
8:
uid: chetemi-8
- port: eth0
- kind: node
9:
uid: chetemi-9
- port: eth0
- kind: node
10:
uid: chetemi-10
- port: eth0
- kind: node
11:
uid: chetemi-11
- port: eth0
- kind: node
12:
uid: chetemi-12
- port: eth0
- kind: node
13:
uid: chetemi-13
- port: eth0
- kind: node
14:
uid: chetemi-14
- port: eth0
- kind: node
15:
uid: chetemi-15
- port: eth0
- kind: node
17:
uid: chifflet-1
- port: eth0
- kind: node
18:
uid: chifflet-2
- port: eth0
- kind: node
19:
uid: chifflet-3
- port: eth0
- kind: node
20:
uid: chifflet-4
- port: eth0
- kind: node
21:
uid: chifflet-5
- port: eth0
- kind: node
22:
uid: chifflet-6
- port: eth0
- kind: node
23:
uid: chifflet-7
- port: eth0
- kind: node
24:
uid: chifflet-8
- port: eth0
- kind: node
25:
- uid: chetemi-1
- port: eth1
- kind: node
+ uid: chetemi-1-eth1
26:
- uid: chetemi-2
- port: eth1
- kind: node
+ uid: chetemi-2-eth1
27:
- uid: chetemi-3
- port: eth1
- kind: node
+ uid: chetemi-3-eth1
28:
- uid: chetemi-4
- port: eth1
- kind: node
+ uid: chetemi-4-eth1
29:
- uid: chetemi-5
- port: eth1
- kind: node
+ uid: chetemi-5-eth1
30:
- uid: chetemi-6
- port: eth1
- kind: node
+ uid: chetemi-6-eth1
31:
- uid: chetemi-7
- port: eth1
- kind: node
+ uid: chetemi-7-eth1
32:
- uid: chetemi-8
- port: eth1
- kind: node
+ uid: chetemi-8-eth1
33:
- uid: chetemi-9
- port: eth1
- kind: node
+ uid: chetemi-9-eth1
34:
- uid: chetemi-10
- port: eth1
- kind: node
+ uid: chetemi-10-eth1
35:
- uid: chetemi-11
- port: eth1
- kind: node
+ uid: chetemi-11-eth1
36:
- uid: chetemi-12
- port: eth1
- kind: node
+ uid: chetemi-12-eth1
37:
- uid: chetemi-13
- port: eth1
- kind: node
+ uid: chetemi-13-eth1
38:
- uid: chetemi-14
- port: eth1
- kind: node
+ uid: chetemi-14-eth1
39:
- uid: chetemi-15
- port: eth1
- kind: node
+ uid: chetemi-15-eth1
40:
- uid: chifflet-1
- port: eth1
- kind: node
+ uid: chifflet-1-eth1
41:
- uid: chifflet-2
- port: eth1
- kind: node
+ uid: chifflet-2-eth1
42:
- uid: chifflet-3
- port: eth1
- kind: node
+ uid: chifflet-3-eth1
43:
- uid: chifflet-4
- port: eth1
- kind: node
+ uid: chifflet-4-eth1
44:
- uid: chifflet-5
- port: eth1
- kind: node
+ uid: chifflet-5-eth1
45:
- uid: chifflet-6
- port: eth1
- kind: node
+ uid: chifflet-6-eth1
46:
- uid: chifflet-7
- port: eth1
- kind: node
+ uid: chifflet-7-eth1
47:
- uid: chifflet-8
- port: eth1
- kind: node
+ uid: chifflet-8-eth1
53:
- uid: sw-chiclet-2
- kind: router
- port: Ethernet1/53
- aggregation: lacp
+ uid: port-channel1
+ kind: channel
rate: 100000000000
54:
- uid: sw-chiclet-2
- kind: router
- port: Ethernet1/54
- aggregation: lacp
+ uid: port-channel1
+ kind: channel
rate: 100000000000
+ channels:
+ port-channel1:
+ uid: sw-chiclet-2
+ port: port-channel2
+ rate: 200000000000
+ kind: router
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index 72a74656af0669d13078b55f2fc5b4af811010f7..1cb71deccd474e082e91bfb8f8b74fac093489b6 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -1,15 +1,15 @@
---
-gw-luxembourg:
+gw:
+ role: production
model: cisco WS-C6506-E
+ alias:
+ - gw-luxembourg
kind: router
site: luxembourg
snmp_community: public
warranty: 2018-12-01
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 720000000000
+ ip: 172.16.191.254
vlans:
"vlan50":
addresses:
@@ -164,36 +164,27 @@ gw-luxembourg:
# port: bmc
# kind: node
25:
- uid: granduc-2
- port: eth1
+ uid: granduc-2-eth1
26:
- uid: granduc-3
- port: eth1
+ uid: granduc-3-eth1
27:
- uid: granduc-4
- port: eth1
+ uid: granduc-4-eth1
29:
- uid: granduc-6
- port: eth1
+ uid: granduc-6-eth1
32:
- uid: granduc-9
- port: eth1
+ uid: granduc-9-eth1
35:
- uid: cronos
- port: eth1
- kind: other
+ uid: cronos-eth1
+ kind: server
36:
uid: zeus
- port: eth0
- kind: other
+ kind: server
37:
- uid: cronos
- port: eth2
- kind: other
+ uid: cronos-eth2
+ kind: server
40:
- uid: zeus
- port: eth1
- kind: other
+ uid: zeus-eth1
+ kind: server
46:
# uid: ul-grid5000-sw02
# port: mgmt0
@@ -208,59 +199,41 @@ gw-luxembourg:
ports:
2:
uid: granduc-2
- port: eth0
3:
uid: granduc-3
- port: eth0
4:
uid: granduc-4
- port: eth0
6:
uid: granduc-6
- port: eth0
9:
uid: granduc-9
- port: eth0
12:
uid: granduc-12
- port: eth0
15:
uid: granduc-15
- port: eth0
16:
uid: granduc-16
- port: eth0
18:
uid: granduc-18
- port: eth0
20:
uid: granduc-20
- port: eth0
21:
uid: granduc-21
- port: eth0
24:
- uid: granduc-12
- port: eth1
+ uid: granduc-12-eth1
27:
- uid: granduc-15
- port: eth1
+ uid: granduc-15-eth1
28:
- uid: granduc-16
- port: eth1
+ uid: granduc-16-eth1
30:
- uid: granduc-18
- port: eth1
+ uid: granduc-18-eth1
32:
- uid: granduc-20
- port: eth1
+ uid: granduc-20-eth1
33:
- uid: granduc-21
- port: eth1
+ uid: granduc-21-eth1
44:
uid: cronos
- port: eth0
- kind: other
+ kind: server
45:
# uid: zeus
# port: bmc
@@ -271,24 +244,27 @@ gw-luxembourg:
kavlan_pattern: Ti%LINECARD%/%PORT%
rate: 10000000000
backplane_bps: 40000000000
- kind: switch
+ kind: channel
ports:
1:
- uid: ul-grid5000-sw02
- port: Ethernet1/30
- aggregation: lacp
+ uid: Port-channel4
+ kind: channel
2:
- uid: ul-grid5000-sw02
- port: Ethernet1/32
- aggregation: lacp
+ uid: Port-channel4
+ kind: channel
5:
snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
kavlan_pattern: Ti%LINECARD%/%PORT%
rate: 1000000000
backplane_bps: 40000000000
- kind: virtual
+ kind: backbone
ports:
4:
uid: renater-luxembourg
rate: 10000000000
- kind: virtual
+ channels:
+ Port-channel4:
+ uid: ul-grid5000-sw02
+ port: port-channel4
+ kind: switch
+ rate: 20000000000
diff --git a/input/grid5000/sites/luxembourg/networks/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
index ae36972597f0bcae40d0993fb49445dd07eda6dc..ea2258087890aefdf88920c9bcfb09f730a6c630 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl1.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
@@ -1,22 +1,15 @@
---
mxl1:
+ role: production
model: Force10 MXL
kind: switch
site: luxembourg
snmp_community: public
warranty: expired
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 1407374880000
- weathermap:
- use_cacti: "yes"
- vlans:
- "vlan101":
- administrative: yes
- addresses:
- - 172.17.191.251
+ alias:
+ - m1000-mxl1
+ ip: 172.17.191.251
linecards:
0:
snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
@@ -26,66 +19,49 @@ mxl1:
ports:
1:
uid: petitprince-1
- port: eth0
2:
uid: petitprince-2
- port: eth0
3:
uid: petitprince-3
- port: eth0
4:
uid: petitprince-4
- port: eth0
5:
uid: petitprince-5
- port: eth0
6:
uid: petitprince-6
- port: eth0
7:
uid: petitprince-7
- port: eth0
8:
uid: petitprince-8
- port: eth0
9:
uid: petitprince-9
- port: eth0
10:
uid: petitprince-10
- port: eth0
11:
uid: petitprince-11
- port: eth0
13:
uid: petitprince-13
- port: eth0
14:
uid: petitprince-14
- port: eth0
15:
uid: petitprince-15
- port: eth0
16:
uid: petitprince-16
- port: eth0
33:
- uid: ul-grid5000-sw02
- port: Ethernet1/33
- kind: switch
- aggregation: lacp
+ uid: Port-channel 5
+ kind: channel
34:
- uid: ul-grid5000-sw02
- port: Ethernet1/34
- kind: switch
- aggregation: lacp
+ uid: Port-channel 5
+ kind: channel
35:
- uid: ul-grid5000-sw02
- port: Ethernet1/35
- kind: switch
- aggregation: lacp
+ uid: Port-channel 5
+ kind: channel
36:
- uid: ul-grid5000-sw02
- port: Ethernet1/36
- kind: switch
- aggregation: lacp
+ uid: Port-channel 5
+ kind: channel
+ channels:
+ Port-channel 5:
+ uid: ul-grid5000-sw02
+ port: port-channel5
+ kind: switch
+ rate: 4000000000
diff --git a/input/grid5000/sites/luxembourg/networks/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
index 5e8c80f6b263da0dc32bf17e76f316b23a70b4e5..2831b0e8474a46cda1c2f63182f260a2fecd43c2 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl2.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
@@ -1,22 +1,15 @@
---
mxl2:
+ role: production
model: Force10 MXL
kind: switch
site: luxembourg
snmp_community: public
warranty: expired
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 1407374880000
- weathermap:
- use_cacti: "yes"
- vlans:
- "vlan101":
- administrative: yes
- addresses:
- - 172.17.191.252
+ alias:
+ - m1000-mxl2
+ ip: 172.17.191.252
linecards:
0:
snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
@@ -25,67 +18,50 @@ mxl2:
kind: node
ports:
1:
- uid: petitprince-1
- port: eth1
+ uid: petitprince-1-eth1
2:
- uid: petitprince-2
- port: eth1
+ uid: petitprince-2-eth1
3:
- uid: petitprince-3
- port: eth1
+ uid: petitprince-3-eth1
4:
- uid: petitprince-4
- port: eth1
+ uid: petitprince-4-eth1
5:
- uid: petitprince-5
- port: eth1
+ uid: petitprince-5-eth1
6:
- uid: petitprince-6
- port: eth1
+ uid: petitprince-6-eth1
7:
- uid: petitprince-7
- port: eth1
+ uid: petitprince-7-eth1
8:
- uid: petitprince-8
- port: eth1
+ uid: petitprince-8-eth1
9:
- uid: petitprince-9
- port: eth1
+ uid: petitprince-9-eth1
10:
- uid: petitprince-10
- port: eth1
+ uid: petitprince-10-eth1
11:
- uid: petitprince-11
- port: eth1
+ uid: petitprince-11-eth1
13:
- uid: petitprince-13
- port: eth1
+ uid: petitprince-13-eth1
14:
- uid: petitprince-14
- port: eth1
+ uid: petitprince-14-eth1
15:
- uid: petitprince-15
- port: eth1
+ uid: petitprince-15-eth1
16:
- uid: petitprince-16
- port: eth1
+ uid: petitprince-16-eth1
33:
- uid: ul-grid5000-sw02
- port: Ethernet1/37
- kind: switch
- aggregation: lacp
+ uid: Port-channel 6
+ kind: channel
34:
- uid: ul-grid5000-sw02
- port: Ethernet1/38
- kind: switch
- aggregation: lacp
+ uid: Port-channel 6
+ kind: channel
35:
- uid: ul-grid5000-sw02
- port: Ethernet1/39
- kind: switch
- aggregation: lacp
+ uid: Port-channel 6
+ kind: channel
36:
- uid: ul-grid5000-sw02
- port: Ethernet1/40
- kind: switch
- aggregation: lacp
+ uid: Port-channel 6
+ kind: channel
+ channels:
+ Port-channel 6:
+ uid: ul-grid5000-sw02
+ port: port-channel6
+ kind: switch
+ rate: 4000000000
diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
index 04e8ba2a1521734eafcf36a0a7f32a67ce5b29fd..fd4f132296e38356c5a79c7c5e72ea0183132674 100644
--- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
+++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
@@ -1,125 +1,110 @@
---
ul-grid5000-sw02:
+ role: production
model: cisco N5K-C5020P-BF
kind: switch
site: luxembourg
snmp_community: public
warranty: expired
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 1040000000000
- weathermap:
- use_cacti: "yes"
- vlans:
- "vlan101":
- administrative: yes
- addresses:
- - 172.17.191.253
+ ip: 172.17.191.253
linecards:
# 0:
# naming_pattern: "mgmt%PORT%"
# rate: 100000000
# ports:
# 0:
-# uid: gw-luxembourg
+# uid: gw
# port: Gi1/46
# kind: router
1:
- snmp_pattern: "Ethernet%LINECARD%/%PORT%"
- kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
+ snmp_pattern: Ethernet%LINECARD%/%PORT%
+ kavlan_pattern: Ethernet%LINECARD%/%PORT%
rate: 10000000000
kind: node
ports:
1:
3:
- uid: granduc-2
- port: eth2
+ uid: granduc-2-eth2
4:
- uid: granduc-3
- port: eth2
+ uid: granduc-3-eth2
5:
- uid: granduc-4
- port: eth2
+ uid: granduc-4-eth2
7:
- uid: granduc-6
- port: eth2
+ uid: granduc-6-eth2
10:
- uid: granduc-9
- port: eth2
+ uid: granduc-9-eth2
13:
- uid: granduc-12
- port: eth2
+ uid: granduc-12-eth2
16:
- uid: granduc-15
- port: eth2
+ uid: granduc-15-eth2
17:
- uid: granduc-16
- port: eth2
+ uid: granduc-16-eth2
19:
- uid: granduc-18
- port: eth2
+ uid: granduc-18-eth2
21:
- uid: granduc-20
- port: eth2
+ uid: granduc-20-eth2
22:
- uid: granduc-21
- port: eth2
+ uid: granduc-21-eth2
24:
25:
+ uid: port-channel7
+ kind: channel
26:
+ uid: port-channel7
+ kind: channel
27:
28:
29:
30:
- uid: gw-luxembourg
- port: Te3/1
- kind: router
- aggregation: lacp
+ uid: port-channel4
+ kind: channel
31:
32:
- uid: gw-luxembourg
- port: Te3/2
- kind: router
- aggregation: lacp
+ uid: port-channel4
+ kind: channel
33:
- uid: mxl1
- port: Te0/33
- kind: switch
- aggregation: lacp
+ uid: port-channel5
+ kind: channel
34:
- uid: mxl1
- port: Te0/34
- kind: switch
- aggregation: lacp
+ uid: port-channel5
+ kind: channel
35:
- uid: mxl1
- port: Te0/35
- kind: switch
- aggregation: lacp
+ uid: port-channel5
+ kind: channel
36:
- uid: mxl1
- port: Te0/36
- kind: switch
- aggregation: lacp
+ uid: port-channel5
+ kind: channel
37:
- uid: mxl2
- port: Te0/33
- kind: switch
- aggregation: lacp
+ uid: port-channel6
+ kind: channel
38:
- uid: mxl2
- port: Te0/34
- kind: switch
- aggregation: lacp
+ uid: port-channel6
+ kind: channel
39:
- uid: mxl2
- port: Te0/35
- kind: switch
- aggregation: lacp
+ uid: port-channel6
+ kind: channel
40:
- uid: mxl2
- port: Te0/36
- kind: switch
- aggregation: lacp
+ uid: port-channel6
+ kind: channel
+ channels:
+ port-channel4:
+ uid: gw
+ port: Port-channel4
+ kind: router
+ rate: 20000000000
+ port-channel5:
+ uid: mxl1
+ port: Port-channel 5
+ kind: switch
+ rate: 40000000000
+ port-channel6:
+ uid: mxl2
+ port: Port-channel 6
+ kind: switch
+ rate: 40000000000
+ port-channel7:
+ uid: srv-data
+ port: NA
+ kind: server
+ rate: 20000000000
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index 7b62dcc2a37adeaf9ff95ffd9d8d64dbf9a58378..bb8fcfb19fa8a4f7955a2ccac184353f9165f8ce 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -1,20 +1,18 @@
---
force10:
+ role: production
model: Force10 S4810
serial: FGSN9T1
warranty: 2017-07-01
kind: switch
site: lyon
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- vlans:
- "vlan101":
- administrative: yes
- addresses:
- - 172.17.63.253
+ ip: 172.17.63.253
+ alias:
+ - force10-adm
+ - staurus
+ - sorion
+ - shercule
backplane_bps: 1280000000000
linecards:
0:
@@ -22,7 +20,6 @@ force10:
kavlan_pattern: "%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: taurus-1
2: taurus-2
@@ -44,17 +41,13 @@ force10:
19: orion-3
20: orion-4
21:
- uid: hercule-1
- port: eth1
+ uid: hercule-1-eth1
22:
- uid: hercule-2
- port: eth1
+ uid: hercule-2-eth1
23:
- uid: hercule-3
- port: eth1
+ uid: hercule-3-eth1
24:
- uid: hercule-4
- port: eth1
+ uid: hercule-4-eth1
25: nova-1
26: nova-2
27: nova-3
@@ -80,14 +73,15 @@ force10:
47: nova-23
48:
uid: castor
- kind: other
+ kind: server
49:
uid: pollux
- kind: other
+ kind: server
50:
uid: procyon
- kind: other
+ kind: server
60:
- uid: gw-lyon
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ uid: gw
kind: router
port: '0:25'
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index ccd0e47554c114a4267dc0c7df6b5320bdf4648e..53744c40508156fc26da4e4e40dfa412d6ae7119 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -1,15 +1,17 @@
---
-gw-lyon:
+gw:
+ role: production
model: Dell EMC S4128F-ON
serial: J9J1PK2
warranty: 2024-08-15
kind: router
+ alias:
+ - gw-lyon
+ - router
+ - sgemini
site: lyon
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
+ ip: 172.16.63.254
vlans:
"vlan100":
administrative: yes
@@ -69,22 +71,18 @@ gw-lyon:
kavlan_pattern: "%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: gemini-1
2: gemini-2
20:
uid: albireo-a
- kind: other
- port: eno1
+ kind: server
21:
uid: albireo-b
- kind: other
- port: eno1
+ kind: server
22:
uid: alcor
- kind: other
- port: ens3f1
+ kind: server
23:
uid: salome
kind: switch
@@ -95,5 +93,4 @@ gw-lyon:
port: '0:60'
30:
uid: renater-lyon
- site: renater
- kind: virtual
+ kind: backbone
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index bd996b2454c3359196638efe9ed048d068a72086..1930387c79a86e8447cb62f809890bd543e069a8 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -1,20 +1,15 @@
---
salome:
+ role: production
model: FESX448+2XG-PREM
serial: FL37068284
warranty: expired
kind: switch
site: lyon
+ ip: 172.17.63.250
+ alias:
+ - ssagittaire
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- vlans:
- "vlan101":
- administrative: yes
- addresses:
- - 172.17.63.250
backplane_bps: 136000000000
linecards:
0:
@@ -25,7 +20,7 @@ salome:
port: eth1
ports:
2:
- uid: gw-lyon
+ uid: gw
kind: router
port: "0:23"
4:
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index ff91369f9723211ff99a0396bbb69494e438f38b..423f7dcf3ea1b88bc258e6097c62ff4c47cd3c67 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -1,14 +1,16 @@
---
-gw-nancy:
+gw:
+ role: production
model: Cisco Nexus 9508
warranty: 2020-09-01
kind: router
site: nancy
snmp_community: public
+ ip: 172.16.79.254
+ alias:
+ - gw-nancy
+ - sgravillon2
sensors:
- network:
- available: true
- resolution: 10
power:
available: true
resolution: 1
@@ -83,175 +85,101 @@ gw-nancy:
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
backplane_bps: 1280000000000
model: N9K-X9464PX
- kind: other
+ kind: node
rate: 10000000000
ports:
1:
uid: graoully-1
- port: eth0
- kind: node
2:
uid: graoully-2
- port: eth0
- kind: node
3:
uid: graoully-3
- port: eth0
- kind: node
4:
uid: graoully-4
- port: eth0
- kind: node
5:
uid: graoully-5
- port: eth0
- kind: node
6:
uid: graoully-6
- port: eth0
- kind: node
7:
uid: graoully-7
- port: eth0
- kind: node
8:
uid: graoully-8
- port: eth0
- kind: node
9:
uid: graoully-9
- port: eth0
- kind: node
10:
uid: graoully-10
- port: eth0
- kind: node
11:
uid: graoully-11
- port: eth0
- kind: node
12:
uid: graoully-12
- port: eth0
- kind: node
13:
uid: graoully-13
- port: eth0
- kind: node
14:
uid: graoully-14
- port: eth0
- kind: node
15:
uid: graoully-15
- port: eth0
- kind: node
16:
uid: graoully-16
- port: eth0
- kind: node
17:
uid: graphite-1
- port: eth0
- kind: node
18:
uid: graphite-2
- port: eth0
- kind: node
19:
uid: graphite-3
- port: eth0
- kind: node
20:
uid: graphite-4
- port: eth0
- kind: node
21:
uid: graphique-4
- port: eth0
- kind: node
22:
uid: graphique-5
- port: eth0
- kind: node
23:
uid: graphique-3
- port: eth0
- kind: node
24:
uid: graphique-2
- port: eth0
- kind: node
25:
uid: graphique-1
- port: eth0
- kind: node
26:
uid: graphique-6
- port: eth0
- kind: node
27:
uid: grisou-41
- port: eth0
- kind: node
28:
uid: grisou-42
- port: eth0
- kind: node
29:
uid: grisou-43
- port: eth0
- kind: node
30:
uid: grisou-44
- port: eth0
- kind: node
31:
uid: grisou-45
- port: eth0
- kind: node
32:
uid: grisou-46
- port: eth0
- kind: node
33:
uid: grisou-47
- port: eth0
- kind: node
34:
uid: grisou-48
- port: eth0
- kind: node
35:
uid: grisou-49
- port: eth0
- kind: node
36:
uid: grisou-50
- port: eth0
- kind: node
37:
uid: grisou-51
- port: eth0
- kind: node
39:
uid: srv
- kind: other
+ kind: server
40:
uid: srv2
- kind: other
+ kind: server
41:
uid: talc-data
- kind: other
+ kind: server
42:
uid: srv-data
- kind: other
+ kind: server
47:
uid: LORIA
- kind: virtual
+ kind: other
48:
uid: renater-nancy
- kind: virtual
+ kind: backbone
2:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -262,196 +190,100 @@ gw-nancy:
ports:
1:
uid: grisou-1
- port: eth0
- kind: node
2:
uid: grisou-2
- port: eth0
- kind: node
3:
uid: grisou-3
- port: eth0
- kind: node
4:
uid: grisou-4
- port: eth0
- kind: node
5:
uid: grisou-5
- port: eth0
- kind: node
6:
uid: grisou-6
- port: eth0
- kind: node
7:
uid: grisou-7
- port: eth0
- kind: node
8:
uid: grisou-8
- port: eth0
- kind: node
9:
uid: grisou-9
- port: eth0
- kind: node
10:
uid: grisou-10
- port: eth0
- kind: node
11:
uid: grisou-11
- port: eth0
- kind: node
12:
uid: grisou-12
- port: eth0
- kind: node
13:
uid: grisou-13
- port: eth0
- kind: node
14:
uid: grisou-14
- port: eth0
- kind: node
15:
uid: grisou-15
- port: eth0
- kind: node
16:
uid: grisou-16
- port: eth0
- kind: node
17:
uid: grisou-17
- port: eth0
- kind: node
18:
uid: grisou-18
- port: eth0
- kind: node
19:
uid: grisou-19
- port: eth0
- kind: node
20:
uid: grisou-20
- port: eth0
- kind: node
21:
uid: grisou-21
- port: eth0
- kind: node
22:
uid: grisou-22
- port: eth0
- kind: node
23:
uid: grisou-23
- port: eth0
- kind: node
24:
uid: grisou-24
- port: eth0
- kind: node
25:
uid: grisou-25
- port: eth0
- kind: node
26:
uid: grisou-26
- port: eth0
- kind: node
27:
uid: grisou-27
- port: eth0
- kind: node
28:
uid: grisou-28
- port: eth0
- kind: node
29:
uid: grisou-29
- port: eth0
- kind: node
30:
uid: grisou-30
- port: eth0
- kind: node
31:
uid: grisou-31
- port: eth0
- kind: node
32:
uid: grisou-32
- port: eth0
- kind: node
33:
uid: grisou-33
- port: eth0
- kind: node
34:
uid: grisou-34
- port: eth0
- kind: node
35:
uid: grisou-35
- port: eth0
- kind: node
36:
uid: grisou-36
- port: eth0
- kind: node
37:
uid: grisou-37
- port: eth0
- kind: node
38:
uid: grisou-38
- port: eth0
- kind: node
39:
uid: grisou-39
- port: eth0
- kind: node
40:
uid: grisou-40
- port: eth0
- kind: node
41:
uid: grimoire-1
- port: eth0
- kind: node
42:
uid: grimoire-2
- port: eth0
- kind: node
43:
uid: grimoire-3
- port: eth0
- kind: node
44:
uid: grimoire-4
- port: eth0
- kind: node
45:
uid: grimoire-5
- port: eth0
- kind: node
46:
uid: grimoire-6
- port: eth0
- kind: node
47:
uid: grimoire-7
- port: eth0
- kind: node
48:
uid: grimoire-8
- port: eth0
- kind: node
3:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -461,197 +293,101 @@ gw-nancy:
rate: 10000000000
ports:
1:
- uid: grisou-1
- kind: node
- port: eth1
+ uid: grisou-1-eth1
2:
- uid: grisou-2
- kind: node
- port: eth1
+ uid: grisou-2-eth1
3:
- uid: grisou-3
- kind: node
- port: eth1
+ uid: grisou-3-eth1
4:
- uid: grisou-4
- kind: node
- port: eth1
+ uid: grisou-4-eth1
5:
- uid: grisou-5
- kind: node
- port: eth1
+ uid: grisou-5-eth1
6:
- uid: grisou-6
- kind: node
- port: eth1
+ uid: grisou-6-eth1
7:
- uid: grisou-7
- kind: node
- port: eth1
+ uid: grisou-7-eth1
8:
- uid: grisou-8
- kind: node
- port: eth1
+ uid: grisou-8-eth1
9:
- uid: grisou-9
- kind: node
- port: eth1
+ uid: grisou-9-eth1
10:
- uid: grisou-10
- kind: node
- port: eth1
+ uid: grisou-10-eth1
11:
- uid: grisou-11
- kind: node
- port: eth1
+ uid: grisou-11-eth1
12:
- uid: grisou-12
- kind: node
- port: eth1
+ uid: grisou-12-eth1
13:
- uid: grisou-13
- kind: node
- port: eth1
+ uid: grisou-13-eth1
14:
- uid: grisou-14
- kind: node
- port: eth1
+ uid: grisou-14-eth1
15:
- uid: grisou-15
- kind: node
- port: eth1
+ uid: grisou-15-eth1
16:
- uid: grisou-16
- kind: node
- port: eth1
+ uid: grisou-16-eth1
17:
- uid: grisou-17
- kind: node
- port: eth1
+ uid: grisou-17-eth1
18:
- uid: grisou-18
- kind: node
- port: eth1
+ uid: grisou-18-eth1
19:
- uid: grisou-19
- kind: node
- port: eth1
+ uid: grisou-19-eth1
20:
- uid: grisou-20
- kind: node
- port: eth1
+ uid: grisou-20-eth1
21:
- uid: grisou-21
- kind: node
- port: eth1
+ uid: grisou-21-eth1
22:
- uid: grisou-22
- kind: node
- port: eth1
+ uid: grisou-22-eth1
23:
- uid: grisou-23
- kind: node
- port: eth1
+ uid: grisou-23-eth1
24:
- uid: grisou-24
- kind: node
- port: eth1
+ uid: grisou-24-eth1
25:
- uid: grisou-25
- kind: node
- port: eth1
+ uid: grisou-25-eth1
26:
- uid: grisou-26
- kind: node
- port: eth1
+ uid: grisou-26-eth1
27:
- uid: grisou-27
- kind: node
- port: eth1
+ uid: grisou-27-eth1
28:
- uid: grisou-28
- kind: node
- port: eth1
+ uid: grisou-28-eth1
29:
- uid: grisou-29
- kind: node
- port: eth1
+ uid: grisou-29-eth1
30:
- uid: grisou-30
- kind: node
- port: eth1
+ uid: grisou-30-eth1
31:
- uid: grisou-31
- kind: node
- port: eth1
+ uid: grisou-31-eth1
32:
- uid: grisou-32
- kind: node
- port: eth1
+ uid: grisou-32-eth1
33:
- uid: grisou-33
- kind: node
- port: eth1
+ uid: grisou-33-eth1
34:
- uid: grisou-34
- kind: node
- port: eth1
+ uid: grisou-34-eth1
35:
- uid: grisou-35
- kind: node
- port: eth1
+ uid: grisou-35-eth1
36:
- uid: grisou-36
- kind: node
- port: eth1
+ uid: grisou-36-eth1
37:
- uid: grisou-37
- kind: node
- port: eth1
+ uid: grisou-37-eth1
38:
- uid: grisou-38
- kind: node
- port: eth1
+ uid: grisou-38-eth1
39:
- uid: grisou-39
- kind: node
- port: eth1
+ uid: grisou-39-eth1
40:
- uid: grisou-40
- kind: node
- port: eth1
+ uid: grisou-40-eth1
41:
- uid: grimoire-1
- kind: node
- port: eth1
+ uid: grimoire-1-eth1
42:
- uid: grimoire-2
- kind: node
- port: eth1
+ uid: grimoire-2-eth1
43:
- uid: grimoire-3
- kind: node
- port: eth1
+ uid: grimoire-3-eth1
44:
- uid: grimoire-4
- kind: node
- port: eth1
+ uid: grimoire-4-eth1
45:
- uid: grimoire-5
- kind: node
- port: eth1
+ uid: grimoire-5-eth1
46:
- uid: grimoire-6
- kind: node
- port: eth1
+ uid: grimoire-6-eth1
47:
- uid: grimoire-7
- kind: node
- port: eth1
+ uid: grimoire-7-eth1
48:
- uid: grimoire-8
- kind: node
- port: eth1
+ uid: grimoire-8-eth1
4:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -661,197 +397,101 @@ gw-nancy:
rate: 10000000000
ports:
1:
- uid: grisou-1
- kind: node
- port: eth2
+ uid: grisou-1-eth2
2:
- uid: grisou-2
- kind: node
- port: eth2
+ uid: grisou-2-eth2
3:
- uid: grisou-3
- kind: node
- port: eth2
+ uid: grisou-3-eth2
4:
- uid: grisou-4
- kind: node
- port: eth2
+ uid: grisou-4-eth2
5:
- uid: grisou-5
- kind: node
- port: eth2
+ uid: grisou-5-eth2
6:
- uid: grisou-6
- kind: node
- port: eth2
+ uid: grisou-6-eth2
7:
- uid: grisou-7
- kind: node
- port: eth2
+ uid: grisou-7-eth2
8:
- uid: grisou-8
- kind: node
- port: eth2
+ uid: grisou-8-eth2
9:
- uid: grisou-9
- kind: node
- port: eth2
+ uid: grisou-9-eth2
10:
- uid: grisou-10
- kind: node
- port: eth2
+ uid: grisou-10-eth2
11:
- uid: grisou-11
- kind: node
- port: eth2
+ uid: grisou-11-eth2
12:
- uid: grisou-12
- kind: node
- port: eth2
+ uid: grisou-12-eth2
13:
- uid: grisou-13
- kind: node
- port: eth2
+ uid: grisou-13-eth2
14:
- uid: grisou-14
- kind: node
- port: eth2
+ uid: grisou-14-eth2
15:
- uid: grisou-15
- kind: node
- port: eth2
+ uid: grisou-15-eth2
16:
- uid: grisou-16
- kind: node
- port: eth2
+ uid: grisou-16-eth2
17:
- uid: grisou-17
- kind: node
- port: eth2
+ uid: grisou-17-eth2
18:
- uid: grisou-18
- kind: node
- port: eth2
+ uid: grisou-18-eth2
19:
- uid: grisou-19
- kind: node
- port: eth2
+ uid: grisou-19-eth2
20:
- uid: grisou-20
- kind: node
- port: eth2
+ uid: grisou-20-eth2
21:
- uid: grisou-21
- kind: node
- port: eth2
+ uid: grisou-21-eth2
22:
- uid: grisou-22
- kind: node
- port: eth2
+ uid: grisou-22-eth2
23:
- uid: grisou-23
- kind: node
- port: eth2
+ uid: grisou-23-eth2
24:
- uid: grisou-24
- kind: node
- port: eth2
+ uid: grisou-24-eth2
25:
- uid: grisou-25
- kind: node
- port: eth2
+ uid: grisou-25-eth2
26:
- uid: grisou-26
- kind: node
- port: eth2
+ uid: grisou-26-eth2
27:
- uid: grisou-27
- kind: node
- port: eth2
+ uid: grisou-27-eth2
28:
- uid: grisou-28
- kind: node
- port: eth2
+ uid: grisou-28-eth2
29:
- uid: grisou-29
- kind: node
- port: eth2
+ uid: grisou-29-eth2
30:
- uid: grisou-30
- kind: node
- port: eth2
+ uid: grisou-30-eth2
31:
- uid: grisou-31
- kind: node
- port: eth2
+ uid: grisou-31-eth2
32:
- uid: grisou-32
- kind: node
- port: eth2
+ uid: grisou-32-eth2
33:
- uid: grisou-33
- kind: node
- port: eth2
+ uid: grisou-33-eth2
34:
- uid: grisou-34
- kind: node
- port: eth2
+ uid: grisou-34-eth2
35:
- uid: grisou-35
- kind: node
- port: eth2
+ uid: grisou-35-eth2
36:
- uid: grisou-36
- kind: node
- port: eth2
+ uid: grisou-36-eth2
37:
- uid: grisou-37
- kind: node
- port: eth2
+ uid: grisou-37-eth2
38:
- uid: grisou-38
- kind: node
- port: eth2
+ uid: grisou-38-eth2
39:
- uid: grisou-39
- kind: node
- port: eth2
+ uid: grisou-39-eth2
40:
- uid: grisou-40
- kind: node
- port: eth2
+ uid: grisou-40-eth2
41:
- uid: grimoire-1
- kind: node
- port: eth2
+ uid: grimoire-1-eth2
42:
- uid: grimoire-2
- kind: node
- port: eth2
+ uid: grimoire-2-eth2
43:
- uid: grimoire-3
- kind: node
- port: eth2
+ uid: grimoire-3-eth2
44:
- uid: grimoire-4
- kind: node
- port: eth2
+ uid: grimoire-4-eth2
45:
- uid: grimoire-5
- kind: node
- port: eth2
+ uid: grimoire-5-eth2
46:
- uid: grimoire-6
- kind: node
- port: eth2
+ uid: grimoire-6-eth2
47:
- uid: grimoire-7
- kind: node
- port: eth2
+ uid: grimoire-7-eth2
48:
- uid: grimoire-8
- kind: node
- port: eth2
+ uid: grimoire-8-eth2
5:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -861,197 +501,101 @@ gw-nancy:
rate: 10000000000
ports:
1:
- uid: grisou-1
- kind: node
- port: eth3
+ uid: grisou-1-eth3
2:
- uid: grisou-2
- kind: node
- port: eth3
+ uid: grisou-2-eth3
3:
- uid: grisou-3
- kind: node
- port: eth3
+ uid: grisou-3-eth3
4:
- uid: grisou-4
- kind: node
- port: eth3
+ uid: grisou-4-eth3
5:
- uid: grisou-5
- kind: node
- port: eth3
+ uid: grisou-5-eth3
6:
- uid: grisou-6
- kind: node
- port: eth3
+ uid: grisou-6-eth3
7:
- uid: grisou-7
- kind: node
- port: eth3
+ uid: grisou-7-eth3
8:
- uid: grisou-8
- kind: node
- port: eth3
+ uid: grisou-8-eth3
9:
- uid: grisou-9
- kind: node
- port: eth3
+ uid: grisou-9-eth3
10:
- uid: grisou-10
- kind: node
- port: eth3
+ uid: grisou-10-eth3
11:
- uid: grisou-11
- kind: node
- port: eth3
+ uid: grisou-11-eth3
12:
- uid: grisou-12
- kind: node
- port: eth3
+ uid: grisou-12-eth3
13:
- uid: grisou-13
- kind: node
- port: eth3
+ uid: grisou-13-eth3
14:
- uid: grisou-14
- kind: node
- port: eth3
+ uid: grisou-14-eth3
15:
- uid: grisou-15
- kind: node
- port: eth3
+ uid: grisou-15-eth3
16:
- uid: grisou-16
- kind: node
- port: eth3
+ uid: grisou-16-eth3
17:
- uid: grisou-17
- kind: node
- port: eth3
+ uid: grisou-17-eth3
18:
- uid: grisou-18
- kind: node
- port: eth3
+ uid: grisou-18-eth3
19:
- uid: grisou-19
- kind: node
- port: eth3
+ uid: grisou-19-eth3
20:
- uid: grisou-20
- kind: node
- port: eth3
+ uid: grisou-20-eth3
21:
- uid: grisou-21
- kind: node
- port: eth3
+ uid: grisou-21-eth3
22:
- uid: grisou-22
- kind: node
- port: eth3
+ uid: grisou-22-eth3
23:
- uid: grisou-23
- kind: node
- port: eth3
+ uid: grisou-23-eth3
24:
- uid: grisou-24
- kind: node
- port: eth3
+ uid: grisou-24-eth3
25:
- uid: grisou-25
- kind: node
- port: eth3
+ uid: grisou-25-eth3
26:
- uid: grisou-26
- kind: node
- port: eth3
+ uid: grisou-26-eth3
27:
- uid: grisou-27
- kind: node
- port: eth3
+ uid: grisou-27-eth3
28:
- uid: grisou-28
- kind: node
- port: eth3
+ uid: grisou-28-eth3
29:
- uid: grisou-29
- kind: node
- port: eth3
+ uid: grisou-29-eth3
30:
- uid: grisou-30
- kind: node
- port: eth3
+ uid: grisou-30-eth3
31:
- uid: grisou-31
- kind: node
- port: eth3
+ uid: grisou-31-eth3
32:
- uid: grisou-32
- kind: node
- port: eth3
+ uid: grisou-32-eth3
33:
- uid: grisou-33
- kind: node
- port: eth3
+ uid: grisou-33-eth3
34:
- uid: grisou-34
- kind: node
- port: eth3
+ uid: grisou-34-eth3
35:
- uid: grisou-35
- kind: node
- port: eth3
+ uid: grisou-35-eth3
36:
- uid: grisou-36
- kind: node
- port: eth3
+ uid: grisou-36-eth3
37:
- uid: grisou-37
- kind: node
- port: eth3
+ uid: grisou-37-eth3
38:
- uid: grisou-38
- kind: node
- port: eth3
+ uid: grisou-38-eth3
39:
- uid: grisou-39
- kind: node
- port: eth3
+ uid: grisou-39-eth3
40:
- uid: grisou-40
- kind: node
- port: eth3
+ uid: grisou-40-eth3
41:
- uid: grimoire-1
- kind: node
- port: eth3
+ uid: grimoire-1-eth3
42:
- uid: grimoire-2
- kind: node
- port: eth3
+ uid: grimoire-2-eth3
43:
- uid: grimoire-3
- kind: node
- port: eth3
+ uid: grimoire-3-eth3
44:
- uid: grimoire-4
- kind: node
- port: eth3
+ uid: grimoire-4-eth3
45:
- uid: grimoire-5
- kind: node
- port: eth3
+ uid: grimoire-5-eth3
46:
- uid: grimoire-6
- kind: node
- port: eth3
+ uid: grimoire-6-eth3
47:
- uid: grimoire-7
- kind: node
- port: eth3
+ uid: grimoire-7-eth3
48:
- uid: grimoire-8
- kind: node
- port: eth3
+ uid: grimoire-8-eth3
6:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -1061,165 +605,85 @@ gw-nancy:
rate: 10000000000
ports:
1:
- uid: grisou-41
- kind: node
- port: eth1
+ uid: grisou-41-eth1
2:
- uid: grisou-41
- kind: node
- port: eth2
+ uid: grisou-41-eth2
3:
- uid: grisou-41
- kind: node
- port: eth3
+ uid: grisou-41-eth3
4:
- uid: grisou-42
- kind: node
- port: eth1
+ uid: grisou-42-eth1
5:
- uid: grisou-42
- kind: node
- port: eth2
+ uid: grisou-42-eth2
6:
- uid: grisou-42
- kind: node
- port: eth3
+ uid: grisou-42-eth3
7:
- uid: grisou-43
- kind: node
- port: eth1
+ uid: grisou-43-eth1
8:
- uid: grisou-43
- kind: node
- port: eth2
+ uid: grisou-43-eth2
9:
- uid: grisou-43
- kind: node
- port: eth3
+ uid: grisou-43-eth3
10:
- uid: grisou-44
- kind: node
- port: eth1
+ uid: grisou-44-eth1
11:
- uid: grisou-44
- kind: node
- port: eth2
+ uid: grisou-44-eth2
12:
- uid: grisou-44
- kind: node
- port: eth3
+ uid: grisou-44-eth3
13:
- uid: grisou-45
- kind: node
- port: eth1
+ uid: grisou-45-eth1
14:
- uid: grisou-45
- kind: node
- port: eth2
+ uid: grisou-45-eth2
15:
- uid: grisou-45
- kind: node
- port: eth3
+ uid: grisou-45-eth3
16:
- uid: grisou-46
- kind: node
- port: eth1
+ uid: grisou-46-eth1
17:
- uid: grisou-46
- kind: node
- port: eth2
+ uid: grisou-46-eth2
18:
- uid: grisou-46
- kind: node
- port: eth3
+ uid: grisou-46-eth3
19:
- uid: grisou-47
- kind: node
- port: eth1
+ uid: grisou-47-eth1
20:
- uid: grisou-47
- kind: node
- port: eth2
+ uid: grisou-47-eth2
21:
- uid: grisou-47
- kind: node
- port: eth3
+ uid: grisou-47-eth3
22:
- uid: grisou-48
- kind: node
- port: eth1
+ uid: grisou-48-eth1
23:
- uid: grisou-48
- kind: node
- port: eth2
+ uid: grisou-48-eth2
24:
- uid: grisou-48
- kind: node
- port: eth3
+ uid: grisou-48-eth3
25:
- uid: grisou-49
- kind: node
- port: eth1
+ uid: grisou-49-eth1
26:
- uid: grisou-49
- kind: node
- port: eth2
+ uid: grisou-49-eth2
27:
- uid: grisou-49
- kind: node
- port: eth3
+ uid: grisou-49-eth3
28:
- uid: grisou-50
- kind: node
- port: eth1
+ uid: grisou-50-eth1
29:
- uid: grisou-50
- kind: node
- port: eth2
+ uid: grisou-50-eth2
30:
- uid: grisou-50
- kind: node
- port: eth3
+ uid: grisou-50-eth3
31:
- uid: grisou-51
- kind: node
- port: eth1
+ uid: grisou-51-eth1
32:
- uid: grisou-51
- kind: node
- port: eth2
+ uid: grisou-51-eth2
33:
- uid: grisou-51
- kind: node
- port: eth3
+ uid: grisou-51-eth3
34:
- uid: graffiti-8
- kind: node
- port: eth2
+ uid: graffiti-8-eth2
35:
- uid: graffiti-7
- kind: node
- port: eth2
+ uid: graffiti-7-eth2
37:
- uid: graffiti-5
- kind: node
- port: eth2
+ uid: graffiti-5-eth2
36:
- uid: graffiti-2
- kind: node
- port: eth2
+ uid: graffiti-2-eth2
38:
- uid: graffiti-6
- kind: node
- port: eth2
+ uid: graffiti-6-eth2
39:
- uid: graffiti-1
- kind: node
- port: eth2
+ uid: graffiti-1-eth2
40:
- uid: graffiti-3
- kind: node
- port: eth2
+ uid: graffiti-3-eth2
41:
uid: sgrvingt
kind: switch
@@ -1228,22 +692,16 @@ gw-nancy:
kind: switch
43:
uid: grimani-4
- port: eth0
44:
uid: grimani-6
- port: eth0
45:
uid: grimani-5
- port: eth0
46:
uid: grimani-1
- port: eth0
47:
uid: grimani-2
- port: eth0
48:
uid: grimani-3
- port: eth0
7:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -1254,84 +712,42 @@ gw-nancy:
ports:
1:
uid: grele-1
- kind: node
- port: eth0
2:
uid: grele-2
- kind: node
- port: eth0
3:
uid: grele-3
- kind: node
- port: eth0
4:
uid: grele-4
- kind: node
- port: eth0
5:
uid: grele-5
- kind: node
- port: eth0
6:
uid: grele-6
- kind: node
- port: eth0
7:
uid: grele-7
- kind: node
- port: eth0
- 8:
- uid: grele-8
- kind: node
- port: eth0
8:
uid: grele-8
- kind: node
- port: eth0
9:
uid: grele-9
- kind: node
- port: eth0
10:
uid: grele-10
- kind: node
- port: eth0
11:
uid: grele-11
- kind: node
- port: eth0
12:
uid: grele-12
- kind: node
- port: eth0
13:
uid: grele-13
- kind: node
- port: eth0
14:
uid: grele-14
- kind: node
- port: eth0
15:
uid: grue-1
- kind: node
- port: eth0
16:
uid: grue-2
- kind: node
- port: eth0
17:
uid: grue-3
- kind: node
- port: eth0
18:
uid: grue-4
- kind: node
- port: eth0
19:
uid: grue-5
- kind: node
- port: eth0
36:
uid: sgros2
kind: switch
@@ -1339,26 +755,14 @@ gw-nancy:
uid: sgros1
kind: switch
41:
- uid: graffiti-13
- kind: node
- port: eth2
+ uid: graffiti-13-eth2
43:
- uid: graffiti-11
- kind: node
- port: eth2
+ uid: graffiti-11-eth2
44:
- uid: graffiti-10
- kind: node
- port: eth2
+ uid: graffiti-10-eth2
45:
- uid: graffiti-12
- kind: node
- port: eth2
+ uid: graffiti-12-eth2
46:
- uid: graffiti-9
- kind: node
- port: eth2
+ uid: graffiti-9-eth2
48:
- uid: graffiti-4
- kind: node
- port: eth2
+ uid: graffiti-4-eth2
diff --git a/input/grid5000/sites/nancy/networks/net-links.yaml b/input/grid5000/sites/nancy/networks/net-links.yaml
deleted file mode 100644
index 04f8bf0e1a7cac6dcf5d7ab35269b70104c5eff3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/networks/net-links.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-sgraoullyib:
- network_adapters:
- ib0:
- ip: 172.17.79.223
-
-sgrisou1:
- network_adapters:
- bmc:
- mounted: true
- ip: 172.17.79.206
- mac: 64:00:6A:E0:CC:A2
-
-sgrele-opf:
- network_adapters:
- bmc:
- mounted: true
- ip: 172.17.79.253
- mac: 00:13:95:22:27:96
-
-sgros1:
- network_adapters:
- bmc:
- mounted: true
- ip: 172.17.79.208
- mac: 20:04:0f:44:4e:a9
-
-sgros2:
- network_adapters:
- bmc:
- mounted: true
- ip: 172.17.79.209
- mac: 20:04:0f:44:2b:a9
-
diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
index ee7ce9d778647ae5162d59217e1d56593c039a59..30e0e691909d928490113d212ec74f9801f37d5c 100644
--- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
+++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
@@ -1,13 +1,12 @@
---
sgraoullyib:
+ role: hpc
model: Infiniband
warranty: 2020-09-01
kind: switch
site: nancy
snmp_community: public
sensors:
- network:
- available: false
power:
available: true
resolution: 1
@@ -18,9 +17,7 @@ sgraoullyib:
monitoring:
wattmeter: true
metric: power
- weathermap:
- use_cacti: "no"
- vlans: {}
+ ip: 172.17.79.223
linecards:
12:
snmp_pattern: "%LINECARD%/%PORT%"
@@ -28,6 +25,6 @@ sgraoullyib:
kind: switch
rate: 20000000000
ports:
- 42:
+ 42:
uid: node-mapping-undocumented-for-this-ib-switch
kind: node
diff --git a/input/grid5000/sites/nancy/networks/sgrcinq.yaml b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
index 06a4dd4a9d5c3ecee5a3022a0b9a27f70ee74c6f..f7579a59a7d2f5aaa1cbd15ab316c6a927b23d9c 100644
--- a/input/grid5000/sites/nancy/networks/sgrcinq.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
@@ -1,29 +1,19 @@
---
sgrcinq:
+ role: production
model: Cisco WS-C2960X-48TD-L
warranty: "2028-11-28" # see bug 9837
kind: switch
site: nancy
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- power:
- available: false
- vlans:
- "vlan1":
- administrative: yes
- addresses:
- - 172.17.79.230
+ ip: 172.17.79.230
backplane_bps: 100000000000
linecards:
0:
- snmp_pattern: "GigabitEthernet 1/%LINECARD%/%PORT%"
+ snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kavlan_pattern: "Gi1/%LINECARD%/%PORT%"
kind: node
rate: 1000000000
- port: eth0
ports:
1: grcinq-3
2: grcinq-4
@@ -74,11 +64,10 @@ sgrcinq:
47: grcinq-1
48: grcinq-2
1:
- snmp_pattern: "TenGigabitEthernet 1/0/%PORT%"
+ snmp_pattern: "TenGigabitEthernet1/0/%PORT%"
kavlan_pattern: "TenGigabitEthernet1/0/%PORT%"
kind: other
rate: 10000000000
- port: eth0
ports:
1:
uid: sgrvingt
diff --git a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
index 4c95a2a0e87d7774384b100a47f2ecfdf0815ddd..f4f2d5ffd24af164347578d619d28afa2608b6d8 100644
--- a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
@@ -1,14 +1,13 @@
---
#Information in this file can be incorrect #TODO
sgrele-opf:
+ role: hpc
model: Omni-Path
warranty: 2022-06-01
kind: switch
site: nancy
snmp_community: public
sensors:
- network:
- available: false
power:
available: true
resolution: 1
@@ -21,9 +20,7 @@ sgrele-opf:
monitoring:
wattmeter: true
metric: power
- weathermap:
- use_cacti: "no"
- vlans: {}
+ ip: 172.17.79.253
linecards:
1:
snmp_pattern: "%LINECARD%/%PORT%"
@@ -31,11 +28,9 @@ sgrele-opf:
kind: switch
rate: 100000000000
ports:
- 13:
+ 13:
uid: grele-13-when-undead
kind: node
- 14:
+ 14:
uid: grele-14-when-undead
kind: node
-
-
diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
index ec791421801879b507c02ac2f6d52c75b7c286ef..39a01fb8a12b0f918688af8716c7bb6bf4f1723f 100644
--- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
@@ -1,5 +1,6 @@
---
sgrisou1:
+ role: production
model: Dell S3048
warranty: 2022-06-01
kind: switch
@@ -16,211 +17,111 @@ sgrisou1:
monitoring:
wattmeter: true
metric: power
- vlans:
- "vlan1":
- administrative: yes
- addresses:
- - 172.17.79.206
+ ip: 172.17.79.206
backplane_bps: 260000000000
linecards:
1:
snmp_pattern: "GigabitEthernet %LINECARD%/%PORT%"
kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kind: other
+ kind: node
rate: 1000000000
ports:
1:
- uid: grisou-1
- port: eth4
- kind: node
+ uid: grisou-1-eth4
2:
- uid: grisou-2
- port: eth4
- kind: node
+ uid: grisou-2-eth4
3:
- uid: grisou-3
- port: eth4
- kind: node
+ uid: grisou-3-eth4
4:
- uid: grisou-4
- port: eth4
- kind: node
+ uid: grisou-4-eth4
5:
- uid: grisou-5
- port: eth4
- kind: node
+ uid: grisou-5-eth4
6:
- uid: grisou-6
- port: eth4
- kind: node
+ uid: grisou-6-eth4
7:
- uid: grisou-7
- port: eth4
- kind: node
+ uid: grisou-7-eth4
8:
- uid: grisou-8
- port: eth4
- kind: node
+ uid: grisou-8-eth4
9:
- uid: grisou-9
- port: eth4
- kind: node
+ uid: grisou-9-eth4
10:
- uid: grisou-10
- port: eth4
- kind: node
+ uid: grisou-10-eth4
11:
- uid: grisou-11
- port: eth4
- kind: node
+ uid: grisou-11-eth4
12:
- uid: grisou-12
- port: eth4
- kind: node
+ uid: grisou-12-eth4
13:
- uid: grisou-13
- port: eth4
- kind: node
+ uid: grisou-13-eth4
14:
- uid: grisou-14
- port: eth4
- kind: node
+ uid: grisou-14-eth4
15:
- uid: grisou-15
- port: eth4
- kind: node
+ uid: grisou-15-eth4
16:
- uid: grisou-16
- port: eth4
- kind: node
+ uid: grisou-16-eth4
17:
- uid: grisou-17
- port: eth4
- kind: node
+ uid: grisou-17-eth4
18:
- uid: grisou-18
- port: eth4
- kind: node
+ uid: grisou-18-eth4
19:
- uid: grisou-19
- port: eth4
- kind: node
+ uid: grisou-19-eth4
20:
- uid: grisou-20
- port: eth4
- kind: node
+ uid: grisou-20-eth4
21:
- uid: grisou-21
- port: eth4
- kind: node
+ uid: grisou-21-eth4
22:
- uid: grisou-22
- port: eth4
- kind: node
+ uid: grisou-22-eth4
23:
- uid: grisou-23
- port: eth4
- kind: node
+ uid: grisou-23-eth4
24:
- uid: grisou-24
- port: eth4
- kind: node
+ uid: grisou-24-eth4
25:
- uid: grisou-25
- port: eth4
- kind: node
+ uid: grisou-25-eth4
26:
- uid: grisou-26
- port: eth4
- kind: node
+ uid: grisou-26-eth4
27:
- uid: grisou-27
- port: eth4
- kind: node
+ uid: grisou-27-eth4
28:
- uid: grisou-28
- port: eth4
- kind: node
+ uid: grisou-28-eth4
29:
- uid: grisou-29
- port: eth4
- kind: node
+ uid: grisou-29-eth4
30:
- uid: grisou-30
- port: eth4
- kind: node
+ uid: grisou-30-eth4
31:
- uid: grisou-31
- port: eth4
- kind: node
+ uid: grisou-31-eth4
32:
- uid: grisou-32
- port: eth4
- kind: node
+ uid: grisou-32-eth4
33:
- uid: grisou-33
- port: eth4
- kind: node
+ uid: grisou-33-eth4
34:
- uid: grisou-34
- port: eth4
- kind: node
+ uid: grisou-34-eth4
35:
- uid: grisou-35
- port: eth4
- kind: node
+ uid: grisou-35-eth4
36:
- uid: grisou-36
- port: eth4
- kind: node
+ uid: grisou-36-eth4
37:
- uid: grisou-37
- port: eth4
- kind: node
+ uid: grisou-37-eth4
38:
- uid: grisou-38
- port: eth4
- kind: node
+ uid: grisou-38-eth4
39:
- uid: grisou-39
- port: eth4
- kind: node
+ uid: grisou-39-eth4
40:
- uid: grisou-40
- port: eth4
- kind: node
+ uid: grisou-40-eth4
41:
- uid: grisou-41
- port: eth4
- kind: node
+ uid: grisou-41-eth4
42:
- uid: grisou-42
- port: eth4
- kind: node
+ uid: grisou-42-eth4
43:
- uid: grisou-43
- port: eth4
- kind: node
+ uid: grisou-43-eth4
44:
- uid: grisou-44
- port: eth4
- kind: node
+ uid: grisou-44-eth4
45:
- uid: grisou-45
- port: eth4
- kind: node
+ uid: grisou-45-eth4
46:
- uid: grisou-46
- port: eth4
- kind: node
+ uid: grisou-46-eth4
47:
- uid: grisou-47
- port: eth4
- kind: node
+ uid: grisou-47-eth4
48:
- uid: grisou-48
- port: eth4
- kind: node
+ uid: grisou-48-eth4
2:
snmp_pattern: "TenGigabitEthernet 1/%PORT%"
kavlan_pattern: "TenGigabitEthernet1/%PORT%"
@@ -228,7 +129,5 @@ sgrisou1:
rate: 10000000000
ports:
52:
- uid: gw-nancy
+ uid: gw
kind: router
-
-
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index 93d1edaadb5c117accaa112ce4eee66b9d138eb6..6e002711e4299ce19c4154a4030f77d52cf394cb 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -1,21 +1,12 @@
---
sgros1:
+ role: production
model: Dell Z9264F-ON
warranty: "2026-07-11"
kind: switch
site: nancy
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- power:
- available: false
- vlans:
- "vlan1":
- administrative: yes
- addresses:
- - 172.17.79.208
+ ip: 172.17.79.208
backplane_bps: 6400000000000
linecards:
3:
@@ -23,7 +14,6 @@ sgros1:
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-117
2: gros-118
@@ -34,336 +24,306 @@ sgros1:
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-113
2: gros-114
3: gros-115
4: gros-116
- 7:
+ 7:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-109
2: gros-110
3: gros-111
4: gros-112
- 9:
+ 9:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-105
2: gros-106
3: gros-107
4: gros-108
- 11:
+ 11:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-101
2: gros-102
3: gros-103
4: gros-104
- 13:
+ 13:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-97
2: gros-98
3: gros-99
4: gros-100
- 15:
+ 15:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-61
2: gros-62
3: gros-63
4: gros-64
- 17:
+ 17:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-65
2: gros-66
3: gros-67
4: gros-68
- 19:
+ 19:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-69
2: gros-70
3: gros-71
4: gros-72
- 21:
+ 21:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-73
2: gros-74
3: gros-75
4: gros-76
- 23:
+ 23:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-25
2: gros-26
3: gros-27
4: gros-28
- 25:
+ 25:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-29
2: gros-30
3: gros-31
4: gros-32
- 27:
+ 27:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-33
2: gros-34
3: gros-35
4: gros-36
- 29:
+ 29:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-37
2: gros-38
3: gros-39
4: gros-40
- 31:
+ 31:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-5
2: gros-6
3: gros-7
4: gros-8
- 33:
+ 33:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-121
2: gros-122
3: gros-123
4: gros-124
- 35:
+ 35:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-77
2: gros-78
3: gros-79
4: gros-80
- 37:
+ 37:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-81
2: gros-82
3: gros-83
4: gros-84
- 39:
+ 39:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-85
2: gros-86
3: gros-87
4: gros-88
- 41:
+ 41:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-89
2: gros-90
3: gros-91
4: gros-92
- 43:
+ 43:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-93
2: gros-94
3: gros-95
4: gros-96
- 45:
+ 45:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-57
2: gros-58
3: gros-59
4: gros-60
- 47:
+ 47:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-53
2: gros-54
3: gros-55
4: gros-56
- 49:
+ 49:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-49
2: gros-50
3: gros-51
4: gros-52
- 51:
+ 51:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-45
2: gros-46
3: gros-47
4: gros-48
- 53:
+ 53:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-41
2: gros-42
3: gros-43
4: gros-44
- 55:
+ 55:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-21
2: gros-22
3: gros-23
4: gros-24
- 57:
+ 57:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-17
2: gros-18
3: gros-19
4: gros-20
- 59:
+ 59:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-13
2: gros-14
3: gros-15
4: gros-16
- 61:
+ 61:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-9
2: gros-10
3: gros-11
4: gros-12
- 63:
+ 63:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth0
ports:
1: gros-1
2: gros-2
3: gros-3
- 4: gros-4
+ 4: gros-4
65:
snmp_pattern: "ethernet 1/1/%LINECARD%"
kavlan_pattern: "ethernet1/1/%LINECARD%"
rate: 10000000000
ports:
1:
- uid: gw-nancy
+ uid: gw
kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 8a8a6411b7adfac9795bb913613200700b549f65..fda995e7a29d249a5abcc214aad02d534be8a331 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -1,21 +1,12 @@
---
sgros2:
+ role: production
model: Dell Z9264F-ON
warranty: "2026-07-11"
kind: switch
site: nancy
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- power:
- available: false
- vlans:
- "vlan1":
- administrative: yes
- addresses:
- - 172.17.79.209
+ ip: 172.17.79.209
backplane_bps: 6400000000000
linecards:
3:
@@ -23,347 +14,316 @@ sgros2:
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-117
- 2: gros-118
- 3: gros-119
- 4: gros-120
+ 1: gros-117-eth1
+ 2: gros-118-eth1
+ 3: gros-119-eth1
+ 4: gros-120-eth1
5:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-113
- 2: gros-114
- 3: gros-115
- 4: gros-116
- 7:
+ 1: gros-113-eth1
+ 2: gros-114-eth1
+ 3: gros-115-eth1
+ 4: gros-116-eth1
+ 7:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-109
- 2: gros-110
- 3: gros-111
- 4: gros-112
- 9:
+ 1: gros-109-eth1
+ 2: gros-110-eth1
+ 3: gros-111-eth1
+ 4: gros-112-eth1
+ 9:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-105
- 2: gros-106
- 3: gros-107
- 4: gros-108
- 11:
+ 1: gros-105-eth1
+ 2: gros-106-eth1
+ 3: gros-107-eth1
+ 4: gros-108-eth1
+ 11:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-101
- 2: gros-102
- 3: gros-103
- 4: gros-104
- 13:
+ 1: gros-101-eth1
+ 2: gros-102-eth1
+ 3: gros-103-eth1
+ 4: gros-104-eth1
+ 13:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-97
- 2: gros-98
- 3: gros-99
- 4: gros-100
- 15:
+ 1: gros-97-eth1
+ 2: gros-98-eth1
+ 3: gros-99-eth1
+ 4: gros-100-eth1
+ 15:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-61
- 2: gros-62
- 3: gros-63
- 4: gros-64
- 17:
+ 1: gros-61-eth1
+ 2: gros-62-eth1
+ 3: gros-63-eth1
+ 4: gros-64-eth1
+ 17:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-65
- 2: gros-66
- 3: gros-67
- 4: gros-68
- 19:
+ 1: gros-65-eth1
+ 2: gros-66-eth1
+ 3: gros-67-eth1
+ 4: gros-68-eth1
+ 19:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-69
- 2: gros-70
- 3: gros-71
- 4: gros-72
- 21:
+ 1: gros-69-eth1
+ 2: gros-70-eth1
+ 3: gros-71-eth1
+ 4: gros-72-eth1
+ 21:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-73
- 2: gros-74
- 3: gros-75
- 4: gros-76
- 23:
+ 1: gros-73-eth1
+ 2: gros-74-eth1
+ 3: gros-75-eth1
+ 4: gros-76-eth1
+ 23:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-25
- 2: gros-26
- 3: gros-27
- 4: gros-28
- 25:
+ 1: gros-25-eth1
+ 2: gros-26-eth1
+ 3: gros-27-eth1
+ 4: gros-28-eth1
+ 25:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-29
- 2: gros-30
- 3: gros-31
- 4: gros-32
- 27:
+ 1: gros-29-eth1
+ 2: gros-30-eth1
+ 3: gros-31-eth1
+ 4: gros-32-eth1
+ 27:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-33
- 2: gros-34
- 3: gros-35
- 4: gros-36
- 29:
+ 1: gros-33-eth1
+ 2: gros-34-eth1
+ 3: gros-35-eth1
+ 4: gros-36-eth1
+ 29:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-37
- 2: gros-38
- 3: gros-39
- 4: gros-40
- 31:
+ 1: gros-37-eth1
+ 2: gros-38-eth1
+ 3: gros-39-eth1
+ 4: gros-40-eth1
+ 31:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-5
- 2: gros-6
- 3: gros-7
- 4: gros-8
- 33:
+ 1: gros-5-eth1
+ 2: gros-6-eth1
+ 3: gros-7-eth1
+ 4: gros-8-eth1
+ 33:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-121
- 2: gros-122
- 3: gros-123
- 4: gros-124
- 35:
+ 1: gros-121-eth1
+ 2: gros-122-eth1
+ 3: gros-123-eth1
+ 4: gros-124-eth1
+ 35:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-77
- 2: gros-78
- 3: gros-79
- 4: gros-80
- 37:
+ 1: gros-77-eth1
+ 2: gros-78-eth1
+ 3: gros-79-eth1
+ 4: gros-80-eth1
+ 37:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-81
- 2: gros-82
- 3: gros-83
- 4: gros-84
- 39:
+ 1: gros-81-eth1
+ 2: gros-82-eth1
+ 3: gros-83-eth1
+ 4: gros-84-eth1
+ 39:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-85
- 2: gros-86
- 3: gros-87
- 4: gros-88
- 41:
+ 1: gros-85-eth1
+ 2: gros-86-eth1
+ 3: gros-87-eth1
+ 4: gros-88-eth1
+ 41:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-89
- 2: gros-90
- 3: gros-91
- 4: gros-92
- 43:
+ 1: gros-89-eth1
+ 2: gros-90-eth1
+ 3: gros-91-eth1
+ 4: gros-92-eth1
+ 43:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-93
- 2: gros-94
- 3: gros-95
- 4: gros-96
- 45:
+ 1: gros-93-eth1
+ 2: gros-94-eth1
+ 3: gros-95-eth1
+ 4: gros-96-eth1
+ 45:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-57
- 2: gros-58
- 3: gros-59
- 4: gros-60
- 47:
+ 1: gros-57-eth1
+ 2: gros-58-eth1
+ 3: gros-59-eth1
+ 4: gros-60-eth1
+ 47:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-53
- 2: gros-54
- 3: gros-55
- 4: gros-56
- 49:
+ 1: gros-53-eth1
+ 2: gros-54-eth1
+ 3: gros-55-eth1
+ 4: gros-56-eth1
+ 49:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-49
- 2: gros-50
- 3: gros-51
- 4: gros-52
- 51:
+ 1: gros-49-eth1
+ 2: gros-50-eth1
+ 3: gros-51-eth1
+ 4: gros-52-eth1
+ 51:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-45
- 2: gros-46
- 3: gros-47
- 4: gros-48
- 53:
+ 1: gros-45-eth1
+ 2: gros-46-eth1
+ 3: gros-47-eth1
+ 4: gros-48-eth1
+ 53:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-41
- 2: gros-42
- 3: gros-43
- 4: gros-44
- 55:
+ 1: gros-41-eth1
+ 2: gros-42-eth1
+ 3: gros-43-eth1
+ 4: gros-44-eth1
+ 55:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-21
- 2: gros-22
- 3: gros-23
- 4: gros-24
- 57:
+ 1: gros-21-eth1
+ 2: gros-22-eth1
+ 3: gros-23-eth1
+ 4: gros-24-eth1
+ 57:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-17
- 2: gros-18
- 3: gros-19
- 4: gros-20
- 59:
+ 1: gros-17-eth1
+ 2: gros-18-eth1
+ 3: gros-19-eth1
+ 4: gros-20-eth1
+ 59:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-13
- 2: gros-14
- 3: gros-15
- 4: gros-16
- 61:
+ 1: gros-13-eth1
+ 2: gros-14-eth1
+ 3: gros-15-eth1
+ 4: gros-16-eth1
+ 61:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-9
- 2: gros-10
- 3: gros-11
- 4: gros-12
- 63:
+ 1: gros-9-eth1
+ 2: gros-10-eth1
+ 3: gros-11-eth1
+ 4: gros-12-eth1
+ 63:
snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
kind: node
rate: 25000000000
- port: eth1
ports:
- 1: gros-1
- 2: gros-2
- 3: gros-3
- 4: gros-4
+ 1: gros-1-eth1
+ 2: gros-2-eth1
+ 3: gros-3-eth1
+ 4: gros-4-eth1
66:
snmp_pattern: "ethernet 1/1/%LINECARD%"
kavlan_pattern: "ethernet1/1/%LINECARD%"
rate: 10000000000
ports:
1:
- uid: gw-nancy
+ uid: gw
kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index b4e520aca3cb5a1ab6a209d988c08d5af6777d3a..1d87813c68a381e803878d0c7671d9d7f08a5e66 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -1,21 +1,12 @@
---
sgrvingt:
+ role: production
model: Dell S4048
warranty: "2023-03-27"
kind: switch
site: nancy
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- power:
- available: false
- vlans:
- "vlan1":
- administrative: yes
- addresses:
- - 172.17.79.207
+ ip: 172.17.79.207
backplane_bps: 1440000000000
linecards:
1:
@@ -23,7 +14,6 @@ sgrvingt:
kavlan_pattern: "TenGigabitEthernet%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: grvingt-3
2: grvingt-4
@@ -65,33 +55,32 @@ sgrvingt:
38: grvingt-6
39: grvingt-1
40: grvingt-2
- 41:
+ 41:
uid: grcinq-srv-3
- kind: other
+ kind: server
42:
uid: grcinq-srv-2
- kind: other
+ kind: server
43:
uid: grvingt-srv
- kind: other
+ kind: server
44:
uid: wurst
- kind: other
+ kind: server
45:
uid: sgrcinq
kind: switch
46:
uid: grcinq-srv-1
- kind: other
+ kind: server
48:
- uid: gw-nancy
+ uid: gw
kind: router
49:
snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: grvingt-44
2: grvingt-43
@@ -102,7 +91,6 @@ sgrvingt:
kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: grvingt-58
2: grvingt-57
@@ -113,7 +101,6 @@ sgrvingt:
kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: grvingt-52
2: grvingt-51
@@ -124,7 +111,6 @@ sgrvingt:
kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: grvingt-50
2: grvingt-49
@@ -135,7 +121,6 @@ sgrvingt:
kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: grvingt-60
2: grvingt-59
@@ -146,7 +131,6 @@ sgrvingt:
kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: grvingt-42
2: grvingt-41
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
index f9ae606d75f28de63d0074f50980c397afbda6d4..78f9b9afe53ef438852caf45f8fcccf9d9a8340f 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
@@ -1,14 +1,12 @@
---
ecotype-prod1:
+ role: production
model: S4048-ON
kind: switch
site: nantes
+ ip: 172.16.207.252
snmp_community: public
warranty: 2022-06-01
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 1280000000000
linecards:
1:
@@ -16,7 +14,6 @@ ecotype-prod1:
kavlan_pattern: "%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
1: ecotype-1
2: ecotype-2
@@ -67,12 +64,18 @@ ecotype-prod1:
47: ecotype-47
48: ecotype-48
49:
- uid: gw-nantes
- port: fortyGigE0/52
- aggregation: lacp
- kind: router
+ uid: Port-channel 1
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ kind: channel
+ rate: 40000000000
50:
- uid: gw-nantes
- port: fortyGigE0/48
- aggregation: lacp
- kind: router
+ uid: Port-channel 1
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ kind: channel
+ rate: 40000000000
+ channels:
+ Port-channel 1:
+ kind: router
+ uid: gw
+ port: Port-channel 1
+ rate: 80000000000
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
index b67d5ac55a408c3696170f6ddc4fcec0c98686e3..beb1749ff5c8ef05bba805b401427dfa8e74bf45 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
@@ -1,14 +1,12 @@
---
ecotype-prod2:
+ role: production
model: S4048-ON
kind: switch
site: nantes
+ ip: 172.16.207.251
snmp_community: public
warranty: 2022-06-01
- sensors:
- network:
- available: true
- resolution: 1
backplane_bps: 1280000000000
linecards:
1:
@@ -16,63 +14,70 @@ ecotype-prod2:
kavlan_pattern: "%LINECARD%/%PORT%"
kind: node
rate: 10000000000
- port: eth1
ports:
- 1: ecotype-1
- 2: ecotype-2
- 3: ecotype-3
- 4: ecotype-4
- 5: ecotype-5
- 6: ecotype-6
- 8: ecotype-8
- 7: ecotype-7
- 9: ecotype-9
- 10: ecotype-10
- 11: ecotype-11
- 12: ecotype-12
- 13: ecotype-13
- 14: ecotype-14
- 15: ecotype-15
- 16: ecotype-16
- 17: ecotype-17
- 18: ecotype-18
- 19: ecotype-19
- 20: ecotype-20
- 21: ecotype-21
- 22: ecotype-22
- 23: ecotype-23
- 24: ecotype-24
- 25: ecotype-25
- 26: ecotype-26
- 27: ecotype-27
- 28: ecotype-28
- 29: ecotype-29
- 30: ecotype-30
- 31: ecotype-31
- 32: ecotype-32
- 33: ecotype-33
- 34: ecotype-34
- 35: ecotype-35
- 36: ecotype-36
- 37: ecotype-37
- 38: ecotype-38
- 39: ecotype-39
- 40: ecotype-40
- 41: ecotype-41
- 42: ecotype-42
- 43: ecotype-43
- 44: ecotype-44
- 45: ecotype-45
- 46: ecotype-46
- 47: ecotype-47
- 48: ecotype-48
+ 1: ecotype-1-eth1
+ 2: ecotype-2-eth1
+ 3: ecotype-3-eth1
+ 4: ecotype-4-eth1
+ 5: ecotype-5-eth1
+ 6: ecotype-6-eth1
+ 8: ecotype-8-eth1
+ 7: ecotype-7-eth1
+ 9: ecotype-9-eth1
+ 10: ecotype-10-eth1
+ 11: ecotype-11-eth1
+ 12: ecotype-12-eth1
+ 13: ecotype-13-eth1
+ 14: ecotype-14-eth1
+ 15: ecotype-15-eth1
+ 16: ecotype-16-eth1
+ 17: ecotype-17-eth1
+ 18: ecotype-18-eth1
+ 19: ecotype-19-eth1
+ 20: ecotype-20-eth1
+ 21: ecotype-21-eth1
+ 22: ecotype-22-eth1
+ 23: ecotype-23-eth1
+ 24: ecotype-24-eth1
+ 25: ecotype-25-eth1
+ 26: ecotype-26-eth1
+ 27: ecotype-27-eth1
+ 28: ecotype-28-eth1
+ 29: ecotype-29-eth1
+ 30: ecotype-30-eth1
+ 31: ecotype-31-eth1
+ 32: ecotype-32-eth1
+ 33: ecotype-33-eth1
+ 34: ecotype-34-eth1
+ 35: ecotype-35-eth1
+ 36: ecotype-36-eth1
+ 37: ecotype-37-eth1
+ 38: ecotype-38-eth1
+ 39: ecotype-39-eth1
+ 40: ecotype-40-eth1
+ 41: ecotype-41-eth1
+ 42: ecotype-42-eth1
+ 43: ecotype-43-eth1
+ 44: ecotype-44-eth1
+ 45: ecotype-45-eth1
+ 46: ecotype-46-eth1
+ 47: ecotype-47-eth1
+ 48: ecotype-48-eth1
49:
- uid: gw-nantes
- port: fortyGigE0/60
- aggregation: lacp
- kind: router
+ uid: Port-channel 1
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ port: fortyGigE 0/60
+ rate: 40000000000
+ kind: channel
50:
- uid: gw-nantes
- port: fortyGigE0/56
- aggregation: lacp
- kind: router
+ uid: Port-channel 1
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ port: fortyGigE 0/56
+ rate: 40000000000
+ kind: channel
+ channels:
+ Port-channel 1:
+ kind: router
+ rate: 80000000000
+ uid: gw
+ port: Port-channel 2
diff --git a/input/grid5000/sites/nantes/networks/gw-nantes.yaml b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
index 3efb1e52343728dd26538421ac104b024387a985..67508953cada5a7fc424cf9372950ff85eb485f5 100644
--- a/input/grid5000/sites/nantes/networks/gw-nantes.yaml
+++ b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
@@ -1,14 +1,14 @@
---
-gw-nantes:
+gw:
+ role: production
model: Force10 S4810
kind: router
site: nantes
+ ip: 172.16.207.254
+ alias:
+ - gw-nantes
snmp_community: public
warranty: 2017-10-01
- sensors:
- network:
- available: true
- resolution: 1
vlans:
"vlan100":
administrative: yes
@@ -39,7 +39,7 @@ gw-nantes:
"vlan705":
name: kavlan-5
addresses:
- - 10.44.64.0/18
+ - 10.44.64.0/18
"vlan706":
name: kavlan-6
addresses:
@@ -47,11 +47,11 @@ gw-nantes:
"vlan707":
name: kavlan-7
addresses:
- - 10.44.192.0/18
+ - 10.44.192.0/18
"vlan708":
name: kavlan-8
addresses:
- - 10.45.0.0/18
+ - 10.45.0.0/18
"vlan709":
name: kavlan-9
addresses:
@@ -67,11 +67,10 @@ gw-nantes:
kavlan_pattern: "%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
0:
uid: renater-nantes
- kind: virtual
+ kind: backbone
45: econome-1
44: econome-2
15: econome-3
@@ -95,22 +94,33 @@ gw-nantes:
31: econome-21
32: econome-22
48:
- uid: ecotype-prod1
- port: fortyGigE0/50
- aggregation: lacp
- kind: switch
+ uid: Port-channel 1
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ rate: 40000000000
+ kind: channel
52:
- uid: ecotype-prod1
- port: fortyGigE0/49
- aggregation: lacp
- kind: switch
+ uid: Port-channel 1
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ rate: 40000000000
+ kind: channel
60:
- uid: ecotype-prod2
- port: fortyGigE0/49
- aggregation: lacp
- kind: switch
+ uid: Port-channel 2
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ rate: 40000000000
+ kind: channel
56:
- uid: ecotype-prod2
- port: fortyGigE0/50
- aggregation: lacp
- kind: switch
+ uid: Port-channel 2
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+ rate: 40000000000
+ kind: channel
+ channels:
+ Port-channel 1:
+ uid: ecotype-prod1
+ port: Port-channel 1
+ rate: 80000000000
+ kind: switch
+ Port-channel 2:
+ kind: switch
+ rate: 80000000000
+ uid: ecotype-prod2
+ port: Port-channel 1
diff --git a/input/grid5000/sites/nantes/networks/net-links.yaml b/input/grid5000/sites/nantes/networks/net-links.yaml
deleted file mode 100644
index c5fa1719ce14e0025454d2623a15d4a1dd39c12e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nantes/networks/net-links.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-gw-nantes:
- network_adapters:
- eth0:
- mounted: true
- ip: 172.16.207.254
-
-ecotype-prod1:
- network_adapters:
- eth0:
- mounted: true
- ip: 172.16.207.252
-
-ecotype-prod2:
- network_adapters:
- eth0:
- mounted: true
- ip: 172.16.207.251
diff --git a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
index 4a002524df74416dfc42848257aa88e38f7ce18a..9a8d1827f4e476b570b195e89fc50482b1c67350 100644
--- a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
@@ -1,19 +1,12 @@
---
bigdata-sw:
+ role: production
model: Force10 S4810
warranty: 2018-10-01
kind: switch
site: rennes
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- vlans:
- "vlan101":
- administrative: yes
- addresses:
- - 172.17.111.203
+ ip: 172.17.111.203
backplane_bps: 1280000000000
linecards:
0:
@@ -21,7 +14,6 @@ bigdata-sw:
kavlan_pattern: "%PORT%"
kind: node
rate: 10000000000
- port: eth0
ports:
0:
uid: c6509
@@ -29,80 +21,48 @@ bigdata-sw:
port: "1:3"
11:
uid: srv-bigdata
- kind: other
+ kind: server
18:
uid: ceph3
- kind: other
+ kind: server
19:
uid: ceph2
- kind: other
+ kind: server
20:
uid: paranoia-8
- kind: node
- port: eth0
21:
uid: paranoia-7
- kind: node
- port: eth0
22:
uid: paranoia-4
- kind: node
- port: eth0
23:
uid: paranoia-3
- kind: node
- port: eth0
24:
- uid: paranoia-4
- kind: node
- port: eth1
+ uid: paranoia-4-eth1
25:
- uid: paranoia-3
- kind: node
- port: eth1
+ uid: paranoia-3-eth1
26:
- uid: paranoia-8
- kind: node
- port: eth1
+ uid: paranoia-8-eth1
27:
- uid: paranoia-7
- kind: node
- port: eth1
+ uid: paranoia-7-eth1
32:
- uid: paranoia-6
- kind: node
- port: eth1
+ uid: paranoia-6-eth1
33:
- uid: paranoia-5
- kind: node
- port: eth1
+ uid: paranoia-5-eth1
34:
- uid: paranoia-2
- kind: node
- port: eth1
+ uid: paranoia-2-eth1
35:
- uid: paranoia-1
- kind: node
- port: eth1
+ uid: paranoia-1-eth1
42:
uid: ceph1
- kind: other
+ kind: server
43:
uid: ceph0
- kind: other
+ kind: server
44:
uid: paranoia-6
- kind: node
- port: eth0
45:
uid: paranoia-5
- kind: node
- port: eth0
46:
uid: paranoia-2
- kind: node
- port: eth0
47:
uid: paranoia-1
- kind: node
- port: eth0
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index c8e54aa2d2c08c6c3ce31bd7282e6e3d0bde42c6..2a6f5137e2ed898e5f7f3d2baae9cbe6e5c2759a 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -1,14 +1,12 @@
---
c6509:
+ role: production
model: Cisco WS-C6509-E
warranty: "expired"
kind: switch
site: rennes
snmp_community: privkavlan
- sensors:
- network:
- available: true
- resolution: 1
+ ip: 172.17.111.207
backplane_bps: 720000000000
linecards:
1:
@@ -20,7 +18,7 @@ c6509:
model: WS-X6704-10GE
ports:
2:
- uid: gw-rennes
+ uid: gw
kind: router
port: Ethernet2/23
3:
@@ -28,24 +26,22 @@ c6509:
kind: switch
2:
kind: node
- port: eth2
snmp_pattern: Gi%LINECARD%/%PORT%
kavlan_pattern: Gi%LINECARD%/%PORT%
rate: 1000000000
backplane_bps: 40000000000
model: WS-X6748-GE-TX
ports:
- 41: paranoia-1
- 42: paranoia-2
- 43: paranoia-3
- 44: paranoia-4
- 45: paranoia-5
- 46: paranoia-6
- 47: paranoia-7
- 48: paranoia-8
+ 41: paranoia-1-eth2
+ 42: paranoia-2-eth2
+ 43: paranoia-3-eth2
+ 44: paranoia-4-eth2
+ 45: paranoia-5-eth2
+ 46: paranoia-6-eth2
+ 47: paranoia-7-eth2
+ 48: paranoia-8-eth2
3:
kind: node
- port: eth0
snmp_pattern: Gi%LINECARD%/%PORT%
kavlan_pattern: Gi%LINECARD%/%PORT%
rate: 1000000000
@@ -74,28 +70,27 @@ c6509:
21: parapide-25
4:
kind: node
- port: eth1
snmp_pattern: Gi%LINECARD%/%PORT%
kavlan_pattern: Gi%LINECARD%/%PORT%
rate: 1000000000
backplane_bps: 40000000000
model: WS-X6748-GE-TX
ports:
- 1: parapluie-1
- 2: parapluie-2
- 3: parapluie-8
- 4: parapluie-9
- 5: parapluie-11
- 6: parapluie-12
- 7: parapluie-13
- 8: parapluie-15
- 9: parapluie-19
- 10: parapluie-20
- 11: parapluie-21
- 12: parapluie-22
- 13: parapluie-25
- 14: parapluie-28
- 15: parapluie-31
- 16: parapluie-32
- 17: parapluie-35
- 18: parapluie-38
+ 1: parapluie-1-eth1
+ 2: parapluie-2-eth1
+ 3: parapluie-8-eth1
+ 4: parapluie-9-eth1
+ 5: parapluie-11-eth1
+ 6: parapluie-12-eth1
+ 7: parapluie-13-eth1
+ 8: parapluie-15-eth1
+ 9: parapluie-19-eth1
+ 10: parapluie-20-eth1
+ 11: parapluie-21-eth1
+ 12: parapluie-22-eth1
+ 13: parapluie-25-eth1
+ 14: parapluie-28-eth1
+ 15: parapluie-31-eth1
+ 16: parapluie-32-eth1
+ 17: parapluie-35-eth1
+ 18: parapluie-38-eth1
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index e5eac5d011f2dc53bcf2c259a9ed42fa08987c5d..847096251578ee3a6d31940a7ff8eeb8b0448df6 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -1,14 +1,16 @@
---
-gw-rennes:
+gw:
+ role: production
model: Nexus 56128P
warranty: 2018-04-01
kind: router
site: rennes
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 10
+ ip: 172.16.111.254
+ alias:
+ - name: parasilo-sw-1
+ ip: 172.17.111.204
+ - gw-rennes
backplane_bps: 1440000000000
vlans:
"vlan100":
@@ -67,264 +69,157 @@ gw-rennes:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
rate: 10000000000
+ kind: node
ports:
1:
- uid: parasilo-1
- kind: node
- port: eth1
+ uid: parasilo-1-eth1
2:
uid: parasilo-1
- kind: node
- port: eth0
3:
- uid: parasilo-2
- kind: node
- port: eth1
+ uid: parasilo-2-eth1
4:
uid: parasilo-2
- kind: node
- port: eth0
5:
- uid: parasilo-3
- kind: node
- port: eth1
+ uid: parasilo-3-eth1
6:
uid: parasilo-3
- kind: node
- port: eth0
7:
- uid: parasilo-4
- kind: node
- port: eth1
+ uid: parasilo-4-eth1
8:
uid: parasilo-4
- kind: node
- port: eth0
9:
- uid: parasilo-5
- kind: node
- port: eth1
+ uid: parasilo-5-eth1
10:
uid: parasilo-5
- kind: node
- port: eth0
11:
- uid: parasilo-6
- kind: node
- port: eth1
+ uid: parasilo-6-eth1
12:
uid: parasilo-6
- kind: node
- port: eth0
13:
- uid: parasilo-7
- kind: node
- port: eth1
+ uid: parasilo-7-eth1
14:
uid: parasilo-7
- kind: node
- port: eth0
15:
- uid: parasilo-8
- kind: node
- port: eth1
+ uid: parasilo-8-eth1
16:
uid: parasilo-8
- kind: node
- port: eth0
17:
- uid: parasilo-9
- kind: node
- port: eth1
+ uid: parasilo-9-eth1
18:
uid: parasilo-9
- kind: node
- port: eth0
19:
- uid: parasilo-10
- kind: node
- port: eth1
+ uid: parasilo-10-eth1
20:
uid: parasilo-10
- kind: node
- port: eth0
21:
- uid: parasilo-11
- kind: node
- port: eth1
+ uid: parasilo-11-eth1
22:
uid: parasilo-11
- kind: node
- port: eth0
23:
- uid: parasilo-12
- kind: node
- port: eth1
+ uid: parasilo-12-eth1
24:
uid: parasilo-12
- kind: node
- port: eth0
25:
- uid: parasilo-13
- kind: node
- port: eth1
+ uid: parasilo-13-eth1
26:
uid: parasilo-13
- kind: node
- port: eth0
27:
- uid: parasilo-14
- kind: node
- port: eth1
+ uid: parasilo-14-eth1
28:
uid: parasilo-14
- kind: node
- port: eth0
29:
- uid: parasilo-15
- kind: node
- port: eth1
+ uid: parasilo-15-eth1
30:
uid: parasilo-15
- kind: node
- port: eth0
31:
- uid: parasilo-16
- kind: node
- port: eth1
+ uid: parasilo-16-eth1
32:
uid: parasilo-16
- kind: node
- port: eth0
33:
- uid: parasilo-17
- kind: node
- port: eth1
+ uid: parasilo-17-eth1
34:
uid: parasilo-17
- kind: node
- port: eth0
35:
- uid: parasilo-18
- kind: node
- port: eth1
+ uid: parasilo-18-eth1
36:
uid: parasilo-18
- kind: node
- port: eth0
37:
- uid: parasilo-19
- kind: node
- port: eth1
+ uid: parasilo-19-eth1
38:
uid: parasilo-19
- kind: node
- port: eth0
39:
- uid: parasilo-20
- kind: node
- port: eth1
+ uid: parasilo-20-eth1
40:
uid: parasilo-20
- kind: node
- port: eth0
41:
- uid: parasilo-21
- kind: node
- port: eth1
+ uid: parasilo-21-eth1
42:
uid: parasilo-21
- kind: node
- port: eth0
43:
- uid: parasilo-22
- kind: node
- port: eth1
+ uid: parasilo-22-eth1
44:
uid: parasilo-22
- kind: node
- port: eth0
45:
- uid: parasilo-23
- kind: node
- port: eth1
+ uid: parasilo-23-eth1
46:
uid: parasilo-23
- kind: node
- port: eth0
47:
- uid: parasilo-24
- kind: node
- port: eth1
+ uid: parasilo-24-eth1
48:
uid: parasilo-24
- kind: node
- port: eth0
49:
- uid: paravance-sw-2
+ uid: port-channel3
rate: 40000000000
- port: Ethernet1/51
- kind: switch
- aggregation: lacp
+ kind: channel
50:
- uid: paravance-sw-2
+ uid: port-channel3
rate: 40000000000
- port: Ethernet1/52
- kind: switch
- aggregation: lacp
+ kind: channel
51:
- uid: paravance-sw-1
+ uid: port-channel2
rate: 40000000000
- port: Ethernet1/49
- kind: switch
- aggregation: lacp
+ kind: channel
52:
- uid: paravance-sw-1
+ uid: port-channel2
rate: 40000000000
- port: Ethernet1/50
- kind: switch
- aggregation: lacp
+ kind: channel
2:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
rate: 10000000000
+ kind: node
ports:
1:
- uid: parasilo-25
- kind: node
- port: eth1
+ uid: parasilo-25-eth1
2:
uid: parasilo-25
- kind: node
- port: eth0
3:
- uid: parasilo-26
- kind: node
- port: eth1
+ uid: parasilo-26-eth1
4:
uid: parasilo-26
- kind: node
- port: eth0
5:
- uid: parasilo-27
- kind: node
- port: eth1
+ uid: parasilo-27-eth1
6:
uid: parasilo-27
- kind: node
- port: eth0
7:
- uid: parasilo-28
- kind: node
- port: eth1
+ uid: parasilo-28-eth1
8:
uid: parasilo-28
- kind: node
- port: eth0
23:
uid: c6509
kind: switch
port: TenGigabitEthernet1/2
24:
uid: renater-rennes
- kind: virtual
+ kind: backbone
+ channels:
+ port-channel3:
+ kind: switch
+ rate: 80000000000
+ uid: paravance-sw-2
+ port: port-channel4
+ port-channel2:
+ kind: switch
+ rate: 80000000000
+ uid: paravance-sw-1
+ port: port-channel1
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
index 2700cf416a80bea04b5afb09933b7f88e646d727..ec241295d8ecdae2070f1ec4d7d5f546846040d3 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
@@ -1,323 +1,181 @@
---
paravance-sw-1:
+ role: production
model: Nexus 56128P
warranty: 2018-04-01
kind: switch
site: rennes
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
+ ip: 172.17.111.206
backplane_bps: 1440000000000
linecards:
1:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
rate: 10000000000
+ kind: node
ports:
1:
- uid: paravance-1
- kind: node
- port: eth1
+ uid: paravance-1-eth1
2:
uid: paravance-1
- kind: node
- port: eth0
3:
- uid: paravance-2
- kind: node
- port: eth1
+ uid: paravance-2-eth1
4:
uid: paravance-2
- kind: node
- port: eth0
5:
- uid: paravance-3
- kind: node
- port: eth1
+ uid: paravance-3-eth1
6:
uid: paravance-3
- kind: node
- port: eth0
7:
- uid: paravance-4
- kind: node
- port: eth1
+ uid: paravance-4-eth1
8:
uid: paravance-4
- kind: node
- port: eth0
9:
- uid: paravance-5
- kind: node
- port: eth1
+ uid: paravance-5-eth1
10:
uid: paravance-5
- kind: node
- port: eth0
11:
- uid: paravance-6
- kind: node
- port: eth1
+ uid: paravance-6-eth1
12:
uid: paravance-6
- kind: node
- port: eth0
13:
- uid: paravance-7
- kind: node
- port: eth1
+ uid: paravance-7-eth1
14:
uid: paravance-7
- kind: node
- port: eth0
15:
- uid: paravance-8
- kind: node
- port: eth1
+ uid: paravance-8-eth1
16:
uid: paravance-8
- kind: node
- port: eth0
17:
- uid: paravance-9
- kind: node
- port: eth1
+ uid: paravance-9-eth1
18:
uid: paravance-9
- kind: node
- port: eth0
19:
- uid: paravance-10
- kind: node
- port: eth1
+ uid: paravance-10-eth1
20:
uid: paravance-10
- kind: node
- port: eth0
21:
- uid: paravance-11
- kind: node
- port: eth1
+ uid: paravance-11-eth1
22:
uid: paravance-11
- kind: node
- port: eth0
23:
- uid: paravance-12
- kind: node
- port: eth1
+ uid: paravance-12-eth1
24:
uid: paravance-12
- kind: node
- port: eth0
25:
- uid: paravance-13
- kind: node
- port: eth1
+ uid: paravance-13-eth1
26:
uid: paravance-13
- kind: node
- port: eth0
27:
- uid: paravance-14
- kind: node
- port: eth1
+ uid: paravance-14-eth1
28:
uid: paravance-14
- kind: node
- port: eth0
29:
- uid: paravance-15
- kind: node
- port: eth1
+ uid: paravance-15-eth1
30:
uid: paravance-15
- kind: node
- port: eth0
31:
- uid: paravance-16
- kind: node
- port: eth1
+ uid: paravance-16-eth1
32:
uid: paravance-16
- kind: node
- port: eth0
33:
- uid: paravance-17
- kind: node
- port: eth1
+ uid: paravance-17-eth1
34:
uid: paravance-17
- kind: node
- port: eth0
35:
- uid: paravance-18
- kind: node
- port: eth1
+ uid: paravance-18-eth1
36:
uid: paravance-18
- kind: node
- port: eth0
37:
- uid: paravance-19
- kind: node
- port: eth1
+ uid: paravance-19-eth1
38:
uid: paravance-19
- kind: node
- port: eth0
39:
- uid: paravance-20
- kind: node
- port: eth1
+ uid: paravance-20-eth1
40:
uid: paravance-20
- kind: node
- port: eth0
41:
- uid: paravance-21
- kind: node
- port: eth1
+ uid: paravance-21-eth1
42:
uid: paravance-21
- kind: node
- port: eth0
43:
- uid: paravance-22
- kind: node
- port: eth1
+ uid: paravance-22-eth1
44:
uid: paravance-22
- kind: node
- port: eth0
45:
- uid: paravance-23
- kind: node
- port: eth1
+ uid: paravance-23-eth1
46:
uid: paravance-23
- kind: node
- port: eth0
47:
- uid: paravance-24
- kind: node
- port: eth1
+ uid: paravance-24-eth1
48:
uid: paravance-24
- kind: node
- port: eth0
49:
- uid: gw-rennes
+ uid: port-channel1
rate: 40000000000
- kind: router
- port: Ethernet1/51
- aggregation: lacp
+ kind: channel
50:
- uid: gw-rennes
+ uid: port-channel1
rate: 40000000000
- kind: router
- port: Ethernet1/52
- aggregation: lacp
+ kind: channel
2:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
rate: 10000000000
+ kind: node
ports:
1:
- uid: paravance-25
- kind: node
- port: eth1
+ uid: paravance-25-eth1
2:
uid: paravance-25
- kind: node
- port: eth0
3:
- uid: paravance-26
- kind: node
- port: eth1
+ uid: paravance-26-eth1
4:
uid: paravance-26
- kind: node
- port: eth0
5:
- uid: paravance-27
- kind: node
- port: eth1
+ uid: paravance-27-eth1
6:
uid: paravance-27
- kind: node
- port: eth0
7:
- uid: paravance-28
- kind: node
- port: eth1
+ uid: paravance-28-eth1
8:
uid: paravance-28
- kind: node
- port: eth0
9:
- uid: paravance-29
- kind: node
- port: eth1
+ uid: paravance-29-eth1
10:
uid: paravance-29
- kind: node
- port: eth0
11:
- uid: paravance-30
- kind: node
- port: eth1
+ uid: paravance-30-eth1
12:
uid: paravance-30
- kind: node
- port: eth0
13:
- uid: paravance-31
- kind: node
- port: eth1
+ uid: paravance-31-eth1
14:
uid: paravance-31
- kind: node
- port: eth0
15:
- uid: paravance-32
- kind: node
- port: eth1
+ uid: paravance-32-eth1
16:
uid: paravance-32
- kind: node
- port: eth0
17:
- uid: paravance-33
- kind: node
- port: eth1
+ uid: paravance-33-eth1
18:
uid: paravance-33
- kind: node
- port: eth0
19:
- uid: paravance-34
- kind: node
- port: eth1
+ uid: paravance-34-eth1
20:
uid: paravance-34
- kind: node
- port: eth0
21:
- uid: paravance-35
- kind: node
- port: eth1
+ uid: paravance-35-eth1
22:
uid: paravance-35
- kind: node
- port: eth0
23:
- uid: paravance-36
- kind: node
- port: eth1
+ uid: paravance-36-eth1
24:
uid: paravance-36
- kind: node
- port: eth0
+ channels:
+ port-channel1:
+ uid: gw
+ port: port-channel2
+ rate: 80000000000
+ kind: router
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
index 86bf481927732dbb108257c179f3c803b3baa7d5..5789b867e8f36f04e9de937360d8a1087b6aaa1c 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
@@ -1,323 +1,181 @@
---
paravance-sw-2:
+ role: production
model: Nexus 56128P
warranty: 2018-04-01
kind: switch
site: rennes
snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
+ ip: 172.17.111.205
backplane_bps: 1440000000000
linecards:
1:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
rate: 10000000000
+ kind: node
ports:
1:
- uid: paravance-37
- kind: node
- port: eth1
+ uid: paravance-37-eth1
2:
uid: paravance-37
- kind: node
- port: eth0
3:
- uid: paravance-38
- kind: node
- port: eth1
+ uid: paravance-38-eth1
4:
uid: paravance-38
- kind: node
- port: eth0
5:
- uid: paravance-39
- kind: node
- port: eth1
+ uid: paravance-39-eth1
6:
uid: paravance-39
- kind: node
- port: eth0
7:
- uid: paravance-40
- kind: node
- port: eth1
+ uid: paravance-40-eth1
8:
uid: paravance-40
- kind: node
- port: eth0
9:
- uid: paravance-41
- kind: node
- port: eth1
+ uid: paravance-41-eth1
10:
uid: paravance-41
- kind: node
- port: eth0
11:
- uid: paravance-42
- kind: node
- port: eth1
+ uid: paravance-42-eth1
12:
uid: paravance-42
- kind: node
- port: eth0
13:
- uid: paravance-43
- kind: node
- port: eth1
+ uid: paravance-43-eth1
14:
uid: paravance-43
- kind: node
- port: eth0
15:
- uid: paravance-44
- kind: node
- port: eth1
+ uid: paravance-44-eth1
16:
uid: paravance-44
- kind: node
- port: eth0
17:
- uid: paravance-45
- kind: node
- port: eth1
+ uid: paravance-45-eth1
18:
uid: paravance-45
- kind: node
- port: eth0
19:
- uid: paravance-46
- kind: node
- port: eth1
+ uid: paravance-46-eth1
20:
uid: paravance-46
- kind: node
- port: eth0
21:
- uid: paravance-47
- kind: node
- port: eth1
+ uid: paravance-47-eth1
22:
uid: paravance-47
- kind: node
- port: eth0
23:
- uid: paravance-48
- kind: node
- port: eth1
+ uid: paravance-48-eth1
24:
uid: paravance-48
- kind: node
- port: eth0
25:
- uid: paravance-49
- kind: node
- port: eth1
+ uid: paravance-49-eth1
26:
uid: paravance-49
- kind: node
- port: eth0
27:
- uid: paravance-50
- kind: node
- port: eth1
+ uid: paravance-50-eth1
28:
uid: paravance-50
- kind: node
- port: eth0
29:
- uid: paravance-51
- kind: node
- port: eth1
+ uid: paravance-51-eth1
30:
uid: paravance-51
- kind: node
- port: eth0
31:
- uid: paravance-52
- kind: node
- port: eth1
+ uid: paravance-52-eth1
32:
uid: paravance-52
- kind: node
- port: eth0
33:
- uid: paravance-53
- kind: node
- port: eth1
+ uid: paravance-53-eth1
34:
uid: paravance-53
- kind: node
- port: eth0
35:
- uid: paravance-54
- kind: node
- port: eth1
+ uid: paravance-54-eth1
36:
uid: paravance-54
- kind: node
- port: eth0
37:
- uid: paravance-55
- kind: node
- port: eth1
+ uid: paravance-55-eth1
38:
uid: paravance-55
- kind: node
- port: eth0
39:
- uid: paravance-56
- kind: node
- port: eth1
+ uid: paravance-56-eth1
40:
uid: paravance-56
- kind: node
- port: eth0
41:
- uid: paravance-57
- kind: node
- port: eth1
+ uid: paravance-57-eth1
42:
uid: paravance-57
- kind: node
- port: eth0
43:
- uid: paravance-58
- kind: node
- port: eth1
+ uid: paravance-58-eth1
44:
uid: paravance-58
- kind: node
- port: eth0
45:
- uid: paravance-59
- kind: node
- port: eth1
+ uid: paravance-59-eth1
46:
uid: paravance-59
- kind: node
- port: eth0
47:
- uid: paravance-60
- kind: node
- port: eth1
+ uid: paravance-60-eth1
48:
uid: paravance-60
- kind: node
- port: eth0
51:
- uid: gw-rennes
+ uid: port-channel4
rate: 40000000000
- kind: router
- port: Ethernet1/49
- aggregation: lacp
+ kind: channel
52:
- uid: gw-rennes
+ uid: port-channel4
rate: 40000000000
- kind: router
- port: Ethernet1/50
- aggregation: lacp
+ kind: channel
2:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
rate: 10000000000
+ kind: node
ports:
1:
- uid: paravance-61
- kind: node
- port: eth1
+ uid: paravance-61-eth1
2:
uid: paravance-61
- kind: node
- port: eth0
3:
- uid: paravance-62
- kind: node
- port: eth1
+ uid: paravance-62-eth1
4:
uid: paravance-62
- kind: node
- port: eth0
5:
- uid: paravance-63
- kind: node
- port: eth1
+ uid: paravance-63-eth1
6:
uid: paravance-63
- kind: node
- port: eth0
7:
- uid: paravance-64
- kind: node
- port: eth1
+ uid: paravance-64-eth1
8:
uid: paravance-64
- kind: node
- port: eth0
9:
- uid: paravance-65
- kind: node
- port: eth1
+ uid: paravance-65-eth1
10:
uid: paravance-65
- kind: node
- port: eth0
11:
- uid: paravance-66
- kind: node
- port: eth1
+ uid: paravance-66-eth1
12:
uid: paravance-66
- kind: node
- port: eth0
13:
- uid: paravance-67
- kind: node
- port: eth1
+ uid: paravance-67-eth1
14:
uid: paravance-67
- kind: node
- port: eth0
15:
- uid: paravance-68
- kind: node
- port: eth1
+ uid: paravance-68-eth1
16:
uid: paravance-68
- kind: node
- port: eth0
17:
- uid: paravance-69
- kind: node
- port: eth1
+ uid: paravance-69-eth1
18:
uid: paravance-69
- kind: node
- port: eth0
19:
- uid: paravance-70
- kind: node
- port: eth1
+ uid: paravance-70-eth1
20:
uid: paravance-70
- kind: node
- port: eth0
21:
- uid: paravance-71
- kind: node
- port: eth1
+ uid: paravance-71-eth1
22:
uid: paravance-71
- kind: node
- port: eth0
23:
- uid: paravance-72
- kind: node
- port: eth1
+ uid: paravance-72-eth1
24:
uid: paravance-72
- kind: node
- port: eth0
+ channels:
+ port-channel4:
+ uid: gw
+ port: port-channel3
+ rate: 80000000000
+ kind: router
diff --git a/input/grid5000/sites/sophia/networks/edgeiron.yaml b/input/grid5000/sites/sophia/networks/edgeiron.yaml
deleted file mode 100644
index 53874719c69bf3679552161c907824643a895382..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/networks/edgeiron.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
----
-edgeiron:
- model: Foundry
- warranty: expired
- kind: switch
- site: sophia
- snmp_community: public
- sensors:
- network:
- available: true
- resolution: 1
- weathermap:
- use_cacti: "no"
- vlans:
- "vlan100":
- administrative: yes
- addresses:
- - 172.16.143.250
- backplane_bps: 40000000000
- linecards:
- 0:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kind: router
- rate: 1000000000
- ports:
- 1:
- uid: gw-sophia
- port: ethernet2/1
- 2:
- uid: gw-sophia
- port: ethernet2/2
- 1:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kind: node
- rate: 1000000000
- ports:
- 48:
- 47:
- 46:
- 45:
- 44:
- 43:
- 42:
- 41:
- 40:
- 39:
- 38:
- 37:
- 36:
- 35:
- 34:
- 33:
- 32:
- 31:
- 28:
- 27:
- 26:
- 25:
- 20:
- 17:
- 8:
- 13:
- 2:
- 7:
- 10:
- 9:
- 24:
- 23:
- 22:
- 11:
- 14:
- 16:
- 15:
- 12:
- 5:
- 1:
- 3:
- 19:
- 18:
- 21:
- 3:
- snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
- kind: node
- rate: 1000000000
- ports:
- 13:
- 29:
- 1:
- 2:
- 12:
- 11:
- 10:
- 9:
- 8:
- 7:
- 6:
- 5:
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 385fe331b84862a5d876c78ef83665ef72d78557..fdd3b1e197ac9cc6cdb5bb55baa6bed7afde6bf2 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -1,14 +1,14 @@
---
-gw-sophia:
+gw:
+ role: production
model: Foundry
warranty: expired
kind: router
site: sophia
snmp_community: g5kadmin
- sensors:
- network:
- available: true
- resolution: 1
+ alias:
+ - gw-sophia
+ ip: 172.16.143.254
vlans:
"vlan100":
administrative: yes
@@ -85,28 +85,15 @@ gw-sophia:
ports:
1:
uid: renater5-FON
- kind: other
+ kind: backbone
2:
uid: swx1nef
kind: switch
port: 0/5
- 2:
- snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
- kind: switch
- backplane_bps: 20000000000
- rate: 10000000000
- ports:
- 1:
- uid: edgeiron
- port: 0/1
- 2:
- uid: edgeiron
- port: 0/2
7:
snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
kavlan_pattern: "%LINECARD%/%PORT%"
kind: node
- port: eth0
backplane_bps: 24000000000
rate: 1000000000
ports:
@@ -122,16 +109,13 @@ gw-sophia:
10: suno-45
23:
uid: srv
- port: eth0
- kind: other
+ kind: server
24:
uid: srv-stock
- port: eth0
- kind: other
+ kind: server
18:
- uid: srv2
- port: eth1
- kind: other
+ uid: srv2-eth1
+ kind: server
9:
snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
kavlan_pattern: "%LINECARD%/%PORT%"
@@ -141,12 +125,10 @@ gw-sophia:
ports:
10:
uid: stock
- kind: other
- port: eth0
+ kind: server
12:
- uid: stock
- kind: other
- port: eth1
+ uid: stock-eth1
+ kind: server
5:
snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
kavlan_pattern: "%LINECARD%/%PORT%"
@@ -199,26 +181,20 @@ gw-sophia:
17: suno-34
18: suno-35
19:
- uid: srv-stock
- port: eth2
- kind: other
+ uid: srv-stock-eth2
+ kind: server
20:
- uid: srv
- port: eth1
- kind: other
+ uid: srv-eth1
+ kind: server
21:
- uid: srv
- port: eth3
- kind: other
+ uid: srv-eth3
+ kind: server
22:
- uid: srv
- port: eth2
- kind: other
+ uid: srv-eth2
+ kind: server
23:
- uid: srv-stock
- port: eth3
- kind: other
+ uid: srv-stock-eth3
+ kind: server
24:
- uid: srv-stock
- port: eth1
- kind: other
+ uid: srv-stock-eth1
+ kind: server
diff --git a/input/grid5000/sites/sophia/networks/swx1nef.yaml b/input/grid5000/sites/sophia/networks/swx1nef.yaml
index b8c02b250aece5a3c6a0649df5c6e9ff2c14f000..98c0cfa2e040242181273e07a63249686062d6e2 100644
--- a/input/grid5000/sites/sophia/networks/swx1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swx1nef.yaml
@@ -1,5 +1,6 @@
---
swx1nef:
+ role: production
model: Juniper EX2500-24F-FB
warranty: expired
kind: switch
@@ -13,7 +14,7 @@ swx1nef:
rate: 10000000000
ports:
5:
- uid: gw-sophia
+ uid: gw
kind: router
port: 1/2
18:
diff --git a/input/grid5000/sites/sophia/networks/swy1nef.yaml b/input/grid5000/sites/sophia/networks/swy1nef.yaml
index 65eae1faec8feb0fec12420ec2c201ce342882fa..d0b37cd7624ed331f47d115779a0b83ddf3a3202 100644
--- a/input/grid5000/sites/sophia/networks/swy1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swy1nef.yaml
@@ -1,17 +1,18 @@
---
swy1nef:
+ role: production
model: Dell PowerConnect 6248
warranty: expired
kind: switch
site: sophia
snmp_community: g5kadmin
+ ip: 172.16.143.249
backplane_bps: 184000000000
linecards:
0:
snmp_pattern: "Port: %PORT% Gigabit"
kavlan_pattern: "%PORT%"
kind: node
- port: eth0
rate: 1000000000
ports:
53: uvb-27
@@ -34,7 +35,7 @@ swy1nef:
71: uvb-15
72:
uid: opensm
- kind: other
+ kind: server
73: uvb-19
74: uvb-14
75: uvb-17