From d4371a67a0892d0e8c426688d4069ed198d3a8e6 Mon Sep 17 00:00:00 2001
From: Pierre JACQUOT <pierre.jacquot@inria.fr>
Date: Thu, 20 Jul 2023 17:07:32 +0200
Subject: [PATCH] [toulouse][network] Replace Toulouse temporary GW with Aruba
6300.
---
.../clusters/montcalm/nodes/montcalm-1.json | 2 +-
.../clusters/montcalm/nodes/montcalm-2.json | 2 +-
.../clusters/montcalm/nodes/montcalm-3.json | 2 +-
.../clusters/montcalm/nodes/montcalm-4.json | 2 +-
.../clusters/montcalm/nodes/montcalm-5.json | 2 +-
.../clusters/montcalm/nodes/montcalm-6.json | 2 +-
.../clusters/montcalm/nodes/montcalm-7.json | 2 +-
.../clusters/montcalm/nodes/montcalm-8.json | 2 +-
.../clusters/montcalm/nodes/montcalm-9.json | 2 +-
.../network_equipments/gw-toulouse.json | 40 +++++++++----------
.../sites/toulouse/networks/gw-toulouse.yaml | 8 ++--
11 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
index e9a8f72c62e..b0ca941bb0b 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/1",
+ "switch_port": "1/1/1",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
index 4ceb67a439a..00be632d933 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/2",
+ "switch_port": "1/1/2",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
index a49e429092c..a226c80a51a 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/3",
+ "switch_port": "1/1/3",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
index 624d61ba400..ca4920d0c8c 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/4",
+ "switch_port": "1/1/4",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
index 2673f6b82f4..1de8261d197 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/5",
+ "switch_port": "1/1/5",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
index e24fcf63d82..05025d25770 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/6",
+ "switch_port": "1/1/6",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
index cbe03b78b7d..935d2e5c790 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/7",
+ "switch_port": "1/1/7",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
index 43010af5ddf..29a721471aa 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/8",
+ "switch_port": "1/1/8",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
index 3de1a459a2c..794302f7a82 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
@@ -132,7 +132,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw-toulouse",
- "switch_port": "tengigabitethernet1/1/9",
+ "switch_port": "1/1/9",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
index 0b202cf0d6d..fd06ac2d1bd 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
@@ -17,60 +17,60 @@
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/1",
+ "snmp_name": "1/1/1",
"uid": "montcalm-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/2",
+ "snmp_name": "1/1/2",
"uid": "montcalm-2"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/3",
+ "snmp_name": "1/1/3",
"uid": "montcalm-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/4",
+ "snmp_name": "1/1/4",
"uid": "montcalm-4"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/5",
+ "snmp_name": "1/1/5",
"uid": "montcalm-5"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/6",
+ "snmp_name": "1/1/6",
"uid": "montcalm-6"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/7",
+ "snmp_name": "1/1/7",
"uid": "montcalm-7"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/8",
+ "snmp_name": "1/1/8",
"uid": "montcalm-8"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "tengigabitethernet1/1/9",
+ "snmp_name": "1/1/9",
"uid": "montcalm-9"
},
{
"kind": "server",
- "snmp_name": "tengigabitethernet1/1/10",
+ "snmp_name": "1/1/10",
"uid": "montcalm-10"
},
{
@@ -83,43 +83,43 @@
},
{
"kind": "server",
- "snmp_name": "tengigabitethernet1/1/15",
+ "snmp_name": "1/1/15",
"uid": "oobm"
},
{
"kind": "server",
- "snmp_name": "tengigabitethernet1/1/16",
+ "snmp_name": "1/1/16",
"uid": "oobm"
},
{
"kind": "server",
- "snmp_name": "tengigabitethernet1/1/17",
+ "snmp_name": "1/1/17",
"uid": "pve-1"
},
{
"kind": "server",
- "snmp_name": "tengigabitethernet1/1/18",
+ "snmp_name": "1/1/18",
"uid": "pve-2"
},
{
"kind": "server",
- "snmp_name": "tengigabitethernet1/1/19",
+ "snmp_name": "1/1/19",
"uid": "nfs"
},
{
"kind": "server",
- "snmp_name": "tengigabitethernet1/1/20",
+ "snmp_name": "1/1/20",
"uid": "nfs"
}
],
"rate": 10000000000,
- "snmp_pattern": "tengigabitethernet1/%LINECARD%/%PORT%"
+ "snmp_pattern": "1/%LINECARD%/%PORT%"
}
],
- "model": "Temporary-Dell-OS6",
- "serial": "unknown",
+ "model": "Aruba 6300",
+ "serial": "SG27KMX1X6",
"site": "toulouse",
- "snmp_community": "Unknown",
+ "snmp_community": "g5kadmin",
"type": "network_equipment",
"uid": "gw-toulouse",
"vlans": {
diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
index 91bb524cff9..50504a2a82f 100644
--- a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
@@ -1,14 +1,14 @@
---
gw-toulouse:
- model: Temporary-Dell-OS6
- serial: unknown
+ model: Aruba 6300
+ serial: SG27KMX1X6
alias:
- gw
ip: 172.17.127.254
ip6: 2001:660:4406:900::ffff:ffff
kind: router
site: toulouse
- snmp_community: Unknown
+ snmp_community: g5kadmin
vlans:
"vlan100":
administrative: yes
@@ -63,7 +63,7 @@ gw-toulouse:
linecards:
1:
rate: 10000000000
- snmp_pattern: "tengigabitethernet1/%LINECARD%/%PORT%"
+ snmp_pattern: "1/%LINECARD%/%PORT%"
kavlan_pattern: "%PORT%"
kind: node
ports:
--
GitLab