From 3365d666be079dd11887329fa9f4d43fb2782e9a Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Mon, 23 Nov 2020 19:37:01 +0100
Subject: [PATCH] [grenoble] Update network topology (see Bug #12472)
---
.../grenoble/clusters/drac/nodes/drac-1.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-10.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-11.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-12.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-2.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-3.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-4.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-5.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-6.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-7.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-8.json | 4 +-
.../grenoble/clusters/drac/nodes/drac-9.json | 4 +-
.../{sw-ibm.json => gw-new.json} | 143 ++++++++++++++----
.../sites/grenoble/network_equipments/gw.json | 18 ++-
.../network_equipments/sw-aci-333.json | 133 ++++++++++++++++
.../sites/grenoble/networks/gw-new.yaml | 31 ++++
.../grid5000/sites/grenoble/networks/gw.yaml | 16 +-
.../sites/grenoble/networks/sw-aci-333.yaml | 32 ++++
.../sites/grenoble/networks/sw-ibm.yaml | 30 ----
19 files changed, 361 insertions(+), 90 deletions(-)
rename data/grid5000/sites/grenoble/network_equipments/{sw-ibm.json => gw-new.json} (54%)
create mode 100644 data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
create mode 100644 input/grid5000/sites/grenoble/networks/gw-new.yaml
create mode 100644 input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
delete mode 100644 input/grid5000/sites/grenoble/networks/sw-ibm.yaml
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
index 0a3d700700..d816512d8a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-1.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "41",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
index 3a75e06b24..3bdacbef34 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-10.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "50",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
index 691710939d..ebe7113e8a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-11.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "51",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
index 95dc8244ab..c4c81fadeb 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-12.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "52",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
index ab26c7f4e7..adeebec073 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-2.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "42",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
index 4885749fb2..b07287199e 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-3.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "43",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
index 39dd6075ae..86dfc03a9f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-4.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "44",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
index 69134a7c59..703a89c4c9 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-5.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "45",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
index 3dc6978d89..02423ff424 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-6.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "46",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
index 215bc81cee..b78a8eaac6 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-7.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "47",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
index 12a1f66f6f..50839ed878 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-8.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "48",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
index a9ca16abcb..937ab2ab9a 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json
@@ -80,8 +80,8 @@
"name": "enP1p1s0f0",
"network_address": "drac-9.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null,
+ "switch": "gw-new",
+ "switch_port": "49",
"vendor": "Broadcom"
},
{
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-ibm.json b/data/grid5000/sites/grenoble/network_equipments/gw-new.json
similarity index 54%
rename from data/grid5000/sites/grenoble/network_equipments/sw-ibm.json
rename to data/grid5000/sites/grenoble/network_equipments/gw-new.json
index d7e5aa55d2..0f400df119 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-ibm.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw-new.json
@@ -1,9 +1,67 @@
{
+ "ip": "172.16.31.252",
"kind": "switch",
"linecards": [
{
+ "kavlan_pattern": "%PORT%",
"kind": "node",
"ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
{
},
{
@@ -32,74 +90,74 @@
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "13",
+ "port": "eth0",
+ "snmp_name": "41",
"uid": "drac-1"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "14",
+ "port": "eth0",
+ "snmp_name": "42",
"uid": "drac-2"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "15",
+ "port": "eth0",
+ "snmp_name": "43",
"uid": "drac-3"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "16",
+ "port": "eth0",
+ "snmp_name": "44",
"uid": "drac-4"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "17",
+ "port": "eth0",
+ "snmp_name": "45",
"uid": "drac-5"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "18",
+ "port": "eth0",
+ "snmp_name": "46",
"uid": "drac-6"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "19",
+ "port": "eth0",
+ "snmp_name": "47",
"uid": "drac-7"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "20",
+ "port": "eth0",
+ "snmp_name": "48",
"uid": "drac-8"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "21",
+ "port": "eth0",
+ "snmp_name": "49",
"uid": "drac-9"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "22",
+ "port": "eth0",
+ "snmp_name": "50",
"uid": "drac-10"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "23",
+ "port": "eth0",
+ "snmp_name": "51",
"uid": "drac-11"
},
{
"kind": "node",
- "port": "eth3",
- "snmp_name": "24",
+ "port": "eth0",
+ "snmp_name": "52",
"uid": "drac-12"
},
{
@@ -157,21 +215,42 @@
{
},
{
- "kind": "router",
- "rate": 10000000000,
- "snmp_name": "52",
- "uid": "gw"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "91",
+ "uid": "sw-aci-333"
}
],
- "rate": 1000000000,
+ "rate": 10000000000,
"snmp_pattern": "%PORT%"
}
],
- "model": "IBM RackSwitch G8052",
+ "model": "Dell S5296F-ON",
"role": "production",
"site": "grenoble",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "sw-ibm",
- "warranty": "expired"
+ "uid": "gw-new",
+ "warranty": "N/A"
}
\ 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 920928311e..fea929bcdf 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -4,6 +4,14 @@
"gw-grenoble"
],
"backplane_bps": 800000000000,
+ "channels": {
+ "TN-G5K-INT": {
+ "kind": "switch",
+ "port": "TN-G5K-INT",
+ "rate": 30000000000,
+ "uid": "sw-aci-333"
+ }
+ },
"ip": "172.16.31.254",
"kind": "router",
"linecards": [
@@ -265,13 +273,19 @@
"uid": "dighyp2"
},
{
+ "kind": "channel",
+ "snmp_name": "X670V-48x Port 43",
+ "uid": "TN-G5K-INT"
},
{
+ "kind": "channel",
+ "snmp_name": "X670V-48x Port 44",
+ "uid": "TN-G5K-INT"
},
{
- "kind": "switch",
+ "kind": "channel",
"snmp_name": "X670V-48x Port 45",
- "uid": "sw-ibm"
+ "uid": "TN-G5K-INT"
},
{
"kind": "server",
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
new file mode 100644
index 0000000000..bdafca8f85
--- /dev/null
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
@@ -0,0 +1,133 @@
+{
+ "channels": {
+ "TN-G5K-INT": {
+ "kind": "switch",
+ "port": "TN-G5K-INT",
+ "rate": 30000000000,
+ "uid": "gw"
+ }
+ },
+ "kind": "switch",
+ "linecards": [
+ {
+ "kind": "switch",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "17",
+ "uid": "TN-G5K-INT"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "18",
+ "uid": "TN-G5K-INT"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "19",
+ "uid": "TN-G5K-INT"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "46",
+ "uid": "gw-new"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "%PORT%"
+ }
+ ],
+ "model": "Cisco ACI leaf",
+ "role": "production",
+ "site": "grenoble",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sw-aci-333",
+ "warranty": "N/A"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/networks/gw-new.yaml b/input/grid5000/sites/grenoble/networks/gw-new.yaml
new file mode 100644
index 0000000000..f294c6a93a
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/gw-new.yaml
@@ -0,0 +1,31 @@
+---
+gw-new:
+ role: production
+ model: Dell S5296F-ON
+ kind: switch
+ site: grenoble
+ warranty: N/A
+ snmp_community: public
+ ip: 172.16.31.252
+ linecards:
+ 0:
+ snmp_pattern: "%PORT%"
+ kavlan_pattern: "%PORT%"
+ kind: node
+ rate: 10000000000
+ ports:
+ 41: drac-1
+ 42: drac-2
+ 43: drac-3
+ 44: drac-4
+ 45: drac-5
+ 46: drac-6
+ 47: drac-7
+ 48: drac-8
+ 49: drac-9
+ 50: drac-10
+ 51: drac-11
+ 52: drac-12
+ 91:
+ uid: sw-aci-333
+ kind: switch
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
index 6a67a9d305..a1effd8a45 100644
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw.yaml
@@ -129,12 +129,24 @@ gw:
42:
uid: dighyp2
kind: server
+ 43:
+ uid: TN-G5K-INT
+ kind: channel
+ 44:
+ uid: TN-G5K-INT
+ kind: channel
45:
- uid: sw-ibm
- kind: switch
+ uid: TN-G5K-INT
+ kind: channel
46:
uid: digwatt
kind: server
48:
uid: renater5
kind: backbone
+ channels:
+ TN-G5K-INT:
+ uid: sw-aci-333
+ port: TN-G5K-INT
+ kind: switch
+ rate: 30000000000
diff --git a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
new file mode 100644
index 0000000000..96ea135c22
--- /dev/null
+++ b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
@@ -0,0 +1,32 @@
+---
+sw-aci-333:
+ role: production
+ model: Cisco ACI leaf
+ kind: switch
+ site: grenoble
+ warranty: N/A
+ snmp_community: public
+ linecards:
+ 0:
+ snmp_pattern: "%PORT%"
+ kind: switch
+ rate: 10000000000
+ ports:
+ 17:
+ uid: TN-G5K-INT
+ kind: channel
+ 18:
+ uid: TN-G5K-INT
+ kind: channel
+ 19:
+ uid: TN-G5K-INT
+ kind: channel
+ 46:
+ uid: gw-new
+ kind: switch
+ channels:
+ TN-G5K-INT:
+ uid: gw
+ port: TN-G5K-INT
+ kind: switch
+ rate: 30000000000
diff --git a/input/grid5000/sites/grenoble/networks/sw-ibm.yaml b/input/grid5000/sites/grenoble/networks/sw-ibm.yaml
deleted file mode 100644
index fbef6f59fb..0000000000
--- a/input/grid5000/sites/grenoble/networks/sw-ibm.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-sw-ibm:
- role: production
- model: IBM RackSwitch G8052
- kind: switch
- site: grenoble
- warranty: expired
- snmp_community: public
- linecards:
- 0:
- snmp_pattern: "%PORT%"
- kind: node
- rate: 1000000000
- ports:
- 13: drac-1-eth3
- 14: drac-2-eth3
- 15: drac-3-eth3
- 16: drac-4-eth3
- 17: drac-5-eth3
- 18: drac-6-eth3
- 19: drac-7-eth3
- 20: drac-8-eth3
- 21: drac-9-eth3
- 22: drac-10-eth3
- 23: drac-11-eth3
- 24: drac-12-eth3
- 52:
- uid: gw
- kind: router
- rate: 10000000000
--
GitLab