diff --git a/data/grid5000/sites/nancy/network_equipments/gw-next.json b/data/grid5000/sites/nancy/network_equipments/gw-next.json
index d6bc844beed62ec3cfd4693fe84ea5c2d354cb8a..c304782847ad227684437b2f9be2be2a44a5c0bc 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-next.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-next.json
@@ -196,8 +196,16 @@
"uid": "sgros1"
},
{
+ "kind": "switch",
+ "rate": 40000000000,
+ "snmp_name": "1/1/50",
+ "uid": "sgruss"
},
{
+ "kind": "switch",
+ "rate": 40000000000,
+ "snmp_name": "1/1/51",
+ "uid": "sgrappe"
},
{
},
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index a9a613efdc3fdc31f964aa654dfaaa56137fb1fc..1de4fe944915aaf84a8e5894b6ba3e6c66abc475 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -10,18 +10,6 @@
"port": "port-channel1",
"rate": 80000000000,
"uid": "sgros2"
- },
- "port-channel4": {
- "kind": "switch",
- "port": "port-channel1",
- "rate": 80000000000,
- "uid": "sgrappe"
- },
- "port-channel5": {
- "kind": "switch",
- "port": "port-channel1",
- "rate": 80000000000,
- "uid": "sgruss"
}
},
"ip": "172.16.79.254",
@@ -151,252 +139,12 @@
"snmp_pattern": "Ethernet%LINECARD%/%PORT%"
},
{
- "backplane_bps": 1280000000000,
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "node",
- "model": "N9K-X9464PX",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet2/49",
- "uid": "port-channel5"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet2/50",
- "uid": "port-channel5"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
},
{
},
{
},
{
- "backplane_bps": 1280000000000,
- "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
- "kind": "node",
- "model": "N9K-X9464PX",
- "ports": [
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet5/51",
- "uid": "port-channel4"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "Ethernet5/52",
- "uid": "port-channel4"
- }
- ],
- "rate": 10000000000,
- "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
},
{
"backplane_bps": 1280000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 97348e9d04eb0ffe70e6be0c5359efade8c9a512..b7aed43fef046e6117e5e5dd49de842c720b240f 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -1,13 +1,5 @@
{
"backplane_bps": 2160000000000,
- "channels": {
- "port-channel1": {
- "kind": "router",
- "port": "port-channel4",
- "rate": 80000000000,
- "uid": "gw"
- }
- },
"ip": "172.17.79.205",
"kind": "switch",
"linecards": [
@@ -132,16 +124,10 @@
{
},
{
- "kind": "channel",
+ "kind": "switch",
"rate": 40000000000,
"snmp_name": "ethernet1/1/25:1",
- "uid": "port-channel1"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "ethernet1/1/26:1",
- "uid": "port-channel1"
+ "uid": "gw-next"
}
],
"rate": 25000000000,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgruss.json b/data/grid5000/sites/nancy/network_equipments/sgruss.json
index 1a3dc056a0cd1013f4e32f3cdd10859d5d0a94e0..0ff5d5e379afbfa82f4b6d2adcb5911e6b77b921 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgruss.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgruss.json
@@ -1,13 +1,5 @@
{
"backplane_bps": 2160000000000,
- "channels": {
- "port-channel1": {
- "kind": "router",
- "port": "port-channel5",
- "rate": 80000000000,
- "uid": "gw"
- }
- },
"ip": "172.17.79.212",
"kind": "switch",
"linecards": [
@@ -100,16 +92,10 @@
{
},
{
- "kind": "channel",
+ "kind": "switch",
"rate": 40000000000,
"snmp_name": "ethernet1/1/25:1",
- "uid": "port-channel1"
- },
- {
- "kind": "channel",
- "rate": 40000000000,
- "snmp_name": "ethernet1/1/26:1",
- "uid": "port-channel1"
+ "uid": "gw-next"
}
],
"rate": 25000000000,
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 536b80ed5c3b39384e11f0b0d18134870c5e71be..dc69ceedb0fe0581d9e412d4362182df0486fc97 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -142,39 +142,6 @@ gw:
48:
uid: renater-nancy
kind: backbone
- 2:
- snmp_pattern: "Ethernet%LINECARD%/%PORT%"
- kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
- backplane_bps: 1280000000000
- model: N9K-X9464PX
- kind: node
- rate: 10000000000
- ports:
- 49:
- uid: port-channel5
- kind: channel
- rate: 40_000_000_000
- 50:
- uid: port-channel5
- kind: channel
- rate: 40_000_000_000
- 5:
- snmp_pattern: "Ethernet%LINECARD%/%PORT%"
- kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
- backplane_bps: 1280000000000
- model: N9K-X9464PX
- kind: node
- rate: 10000000000
- ports:
- 51:
- uid: port-channel4
- kind: channel
- rate: 40_000_000_000
- 52:
- uid: port-channel4
- kind: channel
- rate: 40_000_000_000
-
6:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -191,7 +158,6 @@ gw:
uid: port-channel3
kind: channel
rate: 40_000_000_000
-
7:
snmp_pattern: "Ethernet%LINECARD%/%PORT%"
kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -238,13 +204,3 @@ gw:
uid: sgros2
kind: switch
rate: 80_000_000_000
- port-channel4:
- port: port-channel1
- uid: sgrappe
- kind: switch
- rate: 80_000_000_000
- port-channel5:
- port: port-channel1
- uid: sgruss
- kind: switch
- rate: 80_000_000_000
diff --git a/input/grid5000/sites/nancy/networks/gw-next.yaml b/input/grid5000/sites/nancy/networks/gw-next.yaml
index 8f652dad809f70887da7a71b2c457ca4654c3c71..ec971baba2c92b605170aee943cfd98f1748f8f6 100644
--- a/input/grid5000/sites/nancy/networks/gw-next.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-next.yaml
@@ -109,6 +109,14 @@ gw-next:
uid: sgros1
kind: switch
rate: 40_000_000_000
+ 50:
+ uid: sgruss
+ kind: switch
+ rate: 40_000_000_000
+ 51:
+ uid: sgrappe
+ kind: switch
+ rate: 40_000_000_000
53:
uid: sgrvingt
kind: switch
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index ce16e830cfb8d98a384435ff59f7cb146010175f..83e273e2bab019286b4ad11b00a66ee8a9852d89 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -97,18 +97,7 @@ sgrappe:
16:
uid: grappe-16
25:
- snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
- rate: 40_000_000_000
- uid: port-channel1
- kind: channel
- 26:
- snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
- rate: 40_000_000_000
- uid: port-channel1
- kind: channel
- channels:
- port-channel1:
- port: port-channel4
- uid: gw
- kind: router
- rate: 80_000_000_000
+ snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
+ uid: gw-next
+ rate: 40_000_000_000
+ kind: switch
diff --git a/input/grid5000/sites/nancy/networks/sgruss.yaml b/input/grid5000/sites/nancy/networks/sgruss.yaml
index 48643a34008e941449bbb46b852896584295221b..3470960b832bcff1b08df9d43ddeb37c6c4e2e42 100644
--- a/input/grid5000/sites/nancy/networks/sgruss.yaml
+++ b/input/grid5000/sites/nancy/networks/sgruss.yaml
@@ -81,18 +81,7 @@ sgruss:
18:
uid: grouille-2-eth2
25:
- snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
- rate: 40_000_000_000
- uid: port-channel1
- kind: channel
- 26:
- snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
- rate: 40_000_000_000
- uid: port-channel1
- kind: channel
- channels:
- port-channel1:
- port: port-channel5
- uid: gw
- kind: router
- rate: 80_000_000_000
+ snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
+ uid: gw-next
+ rate: 40_000_000_000
+ kind: switch