diff --git a/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-1.json b/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-1.json
index c5a15ccaa7988d20ff8bcfc8f8b4a7736eaf35e3..8aa8cb38ae2f98113f016b728154655e0b5a8501 100644
--- a/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-1.json
@@ -164,8 +164,8 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "mc-fake-sw",
- "switch_port": "Ethernet1/25",
+ "switch": "swdc-a035-02-rba",
+ "switch_port": "Eth1/47",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-2.json b/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-2.json
index b8a9f628a0b6fad4156f039affb7711f190db8f3..4b4cd9583475acc1db0e4502b42fe3a18fac8ab5 100644
--- a/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-2.json
+++ b/data/grid5000/sites/rennes/clusters/abacus25/nodes/abacus25-2.json
@@ -164,8 +164,8 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "mc-fake-sw",
- "switch_port": "Ethernet1/26",
+ "switch": "swdc-a035-02-rba",
+ "switch_port": "Eth1/48",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json
index 3cfd1a763f2a94717d00fb190374682f4276d598..99a36c2347d7c42ca4e83e58733e9036873aacd3 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -4,21 +4,21 @@
],
"backplane_bps": 1440000000000,
"channels": {
- "lag1": {
+ "port-channel1": {
"kind": "switch",
- "port": "lag1",
+ "port": "port-channel1",
"rate": 200000000000,
"uid": "sw-1"
},
- "lag2": {
+ "port-channel2": {
"kind": "server",
- "port": "lag2",
+ "port": "port-channel2",
"rate": 50000000000,
"uid": "srv-data"
},
- "lag3": {
+ "port-channel3": {
"kind": "switch",
- "port": "lag3",
+ "port": "port-channel3",
"rate": 20000000000,
"uid": "vss-inria"
}
@@ -114,12 +114,12 @@
{
"kind": "channel",
"snmp_name": "1/1/35",
- "uid": "lag2"
+ "uid": "port-channel2"
},
{
"kind": "channel",
"snmp_name": "1/1/36",
- "uid": "lag2"
+ "uid": "port-channel2"
},
{
},
@@ -153,25 +153,25 @@
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/47",
- "uid": "lag3"
+ "uid": "port-channel3"
},
{
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/48",
- "uid": "lag3"
+ "uid": "port-channel3"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
- "uid": "lag1"
+ "uid": "port-channel1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
- "uid": "lag1"
+ "uid": "port-channel1"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/rennes/network_equipments/sw-1.json b/data/grid5000/sites/rennes/network_equipments/sw-1.json
index 1cf0bfd8f7a6feef5d0948c9e0b2d91ab7a7b87d..b2687a60e9453f04e4c30922e99448f04a5890e2 100644
--- a/data/grid5000/sites/rennes/network_equipments/sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/sw-1.json
@@ -1,9 +1,9 @@
{
"backplane_bps": 1440000000000,
"channels": {
- "lag1": {
+ "port-channel1": {
"kind": "switch",
- "port": "lag1",
+ "port": "port-channel1",
"rate": 200000000000,
"uid": "gw"
}
@@ -118,13 +118,13 @@
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
- "uid": "lag1"
+ "uid": "port-channel1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
- "uid": "lag1"
+ "uid": "port-channel1"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/rennes/network_equipments/mc-fake-sw.json b/data/grid5000/sites/rennes/network_equipments/swdc-a035-02-rba.json
similarity index 98%
rename from data/grid5000/sites/rennes/network_equipments/mc-fake-sw.json
rename to data/grid5000/sites/rennes/network_equipments/swdc-a035-02-rba.json
index 33c41f697af50a60fa22a633a6a3a5c6e1649026..20cdee559d5411e170b2f1a5ef80f1c16b562424 100644
--- a/data/grid5000/sites/rennes/network_equipments/mc-fake-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/swdc-a035-02-rba.json
@@ -4,7 +4,7 @@
{
},
{
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+ "kavlan_pattern": "Eth%LINECARD%/%PORT%",
"kind": "node",
"ports": [
{
@@ -58,16 +58,8 @@
{
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/25",
- "uid": "abacus25-1"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/26",
- "uid": "abacus25-2"
},
{
},
@@ -110,8 +102,16 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Eth1/47",
+ "uid": "abacus25-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Eth1/48",
+ "uid": "abacus25-2"
},
{
},
@@ -2014,21 +2014,21 @@
{
},
{
- "kind": "router",
- "port": "lag3",
- "snmp_name": "Ethernet1/999",
- "uid": "gw"
+ "kind": "switch",
+ "port": 999,
+ "snmp_name": "Eth1/999",
+ "uid": "vss-inria"
}
],
"rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
+ "snmp_pattern": "Eth%LINECARD%/%PORT%"
}
],
"managed_by_us": false,
- "model": "Unknown",
+ "model": "Nexus 2000 FEX",
"site": "rennes",
"snmp_community": "none",
"type": "network_equipment",
- "uid": "mc-fake-sw",
+ "uid": "swdc-a035-02-rba",
"warranty": "N/A"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/vss-inria.json b/data/grid5000/sites/rennes/network_equipments/vss-inria.json
new file mode 100644
index 0000000000000000000000000000000000000000..7026e9969129d3cd155803555bed84c5ff8b45d0
--- /dev/null
+++ b/data/grid5000/sites/rennes/network_equipments/vss-inria.json
@@ -0,0 +1,2040 @@
+{
+ "channels": {
+ "port-channel3": {
+ "kind": "router",
+ "port": "port-channel3",
+ "rate": 20000000000,
+ "uid": "gw"
+ }
+ },
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "Eth%LINECARD%/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "Eth1/997",
+ "uid": "port-channel3"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "Eth1/998",
+ "uid": "port-channel3"
+ },
+ {
+ "kind": "switch",
+ "port": 999,
+ "snmp_name": "Eth1/999",
+ "uid": "swdc-a035-02-rba"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "Eth%LINECARD%/%PORT%"
+ }
+ ],
+ "managed_by_us": false,
+ "model": "Nexus 5596",
+ "site": "rennes",
+ "snmp_community": "none",
+ "type": "network_equipment",
+ "uid": "vss-inria",
+ "warranty": "N/A"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index dedf0d64f5d75e9b2f7900c6f6de2d0efe31100f..0c6444d768541910ab4bea6348d90ccb52f3d686 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -79,10 +79,10 @@ gw:
uid: srv-3
kind: server
35:
- uid: lag2
+ uid: port-channel2
kind: channel
36:
- uid: lag2
+ uid: port-channel2
kind: channel
45:
uid: parasilo-sw-1
@@ -93,34 +93,34 @@ gw:
kind: backbone
rate: 10000000000
47:
- uid: lag3
+ uid: port-channel3
kind: channel
rate: 10000000000
48:
- uid: lag3
+ uid: port-channel3
kind: channel
rate: 10000000000
49:
- uid: lag1
+ uid: port-channel1
kind: channel
rate: 100000000000
50:
- uid: lag1
+ uid: port-channel1
kind: channel
rate: 100000000000
channels:
- lag1:
+ port-channel1:
kind: switch
rate: 200000000000
uid: sw-1
- port: lag1
- lag2:
+ port: port-channel1
+ port-channel2:
kind: server
rate: 50000000000
uid: srv-data
- port: lag2
- lag3:
+ port: port-channel2
+ port-channel3:
kind: switch
rate: 20000000000
uid: vss-inria
- port: lag3
+ port: port-channel3
diff --git a/input/grid5000/sites/rennes/networks/sw-1.yaml b/input/grid5000/sites/rennes/networks/sw-1.yaml
index e6a61a9cb9fefced459025b27d44c838c34bee67..bd8922a9ace85f14ac7278dff19aedafd9188fdf 100644
--- a/input/grid5000/sites/rennes/networks/sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/sw-1.yaml
@@ -15,16 +15,16 @@ sw-1:
rate: 25000000000
ports:
49:
- uid: lag1
+ uid: port-channel1
kind: channel
rate: 100000000000
50:
- uid: lag1
+ uid: port-channel1
kind: channel
rate: 100000000000
channels:
- lag1:
+ port-channel1:
kind: switch
rate: 200000000000
uid: gw
- port: lag1
+ port: port-channel1
diff --git a/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml b/input/grid5000/sites/rennes/networks/swdc-a035-02-rba.yaml
similarity index 51%
rename from input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
rename to input/grid5000/sites/rennes/networks/swdc-a035-02-rba.yaml
index 1363676e0928a293d72f0aa3049c4d51c1316f1f..9bc8cc17adfea68707130b689df582be10b21fa3 100644
--- a/input/grid5000/sites/rennes/networks/mc-fake-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/swdc-a035-02-rba.yaml
@@ -1,6 +1,6 @@
---
-mc-fake-sw:
- model: Unknown
+swdc-a035-02-rba:
+ model: Nexus 2000 FEX
warranty: N/A
kind: switch
managed_by_us: false
@@ -8,16 +8,16 @@ mc-fake-sw:
site: rennes
linecards:
1:
- snmp_pattern: "Ethernet%LINECARD%/%PORT%"
- kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
+ snmp_pattern: "Eth%LINECARD%/%PORT%"
+ kavlan_pattern: "Eth%LINECARD%/%PORT%"
rate: 10000000000
kind: node
ports:
- 25:
+ 47:
uid: abacus25-1
- 26:
+ 48:
uid: abacus25-2
999:
- uid: gw
- kind: router
- port: lag3
+ uid: vss-inria
+ kind: switch
+ port: 999
diff --git a/input/grid5000/sites/rennes/networks/vss-inria.yaml b/input/grid5000/sites/rennes/networks/vss-inria.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..84da752d2b3944283acb976f27dd5fd4f403e2ef
--- /dev/null
+++ b/input/grid5000/sites/rennes/networks/vss-inria.yaml
@@ -0,0 +1,31 @@
+---
+vss-inria:
+ model: Nexus 5596
+ warranty: N/A
+ kind: switch
+ managed_by_us: false
+ snmp_community: none
+ site: rennes
+ linecards:
+ 1:
+ snmp_pattern: "Eth%LINECARD%/%PORT%"
+ kavlan_pattern: "Eth%LINECARD%/%PORT%"
+ rate: 10000000000
+ kind: node
+ ports:
+ 997:
+ uid: port-channel3
+ kind: channel
+ 998:
+ uid: port-channel3
+ kind: channel
+ 999:
+ uid: swdc-a035-02-rba
+ kind: switch
+ port: 999
+ channels:
+ port-channel3:
+ uid: gw
+ kind: router
+ port: port-channel3
+ rate: 20000000000