From dba952c246776c08a8c4178f1970980a724b0e12 Mon Sep 17 00:00:00 2001
From: Patrice RINGOT <patrice.ringot@loria.fr>
Date: Sun, 7 Jul 2024 23:16:26 +0200
Subject: [PATCH] [nancy] remove network config of grvingt-pdus
---
.../sites/nancy/network_equipments/gw-next.json | 4 +++-
.../sites/nancy/network_equipments/sgrvingt.json | 2 +-
data/grid5000/sites/nancy/pdus/grvingt-pdu1.json | 8 --------
data/grid5000/sites/nancy/pdus/grvingt-pdu2.json | 8 --------
input/grid5000/sites/nancy/networks/gw-next.yaml | 2 +-
input/grid5000/sites/nancy/networks/sgrvingt.yaml | 1 +
input/grid5000/sites/nancy/pdus.yaml | 12 ------------
7 files changed, 6 insertions(+), 31 deletions(-)
delete mode 100644 data/grid5000/sites/nancy/pdus/grvingt-pdu1.json
delete mode 100644 data/grid5000/sites/nancy/pdus/grvingt-pdu2.json
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-next.json b/data/grid5000/sites/nancy/network_equipments/gw-next.json
index edc1eb95f9a..29a42535d7d 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-next.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-next.json
@@ -127,10 +127,12 @@
},
{
},
+ {
+ },
{
"kind": "switch",
"rate": 40000000000,
- "snmp_name": "1/1/52",
+ "snmp_name": "1/1/53",
"uid": "sgrvingt"
}
],
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 2e925ec7cfa..cce26b2e726 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -299,7 +299,7 @@
{
"kind": "switch",
"rate": 40000000000,
- "snmp_name": "TenGigabitEthernet 1/54",
+ "snmp_name": "fortyGigE 1/54",
"uid": "gw-next"
}
],
diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json
deleted file mode 100644
index 88a512524ff..00000000000
--- a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "ip": "172.17.79.220",
- "mac": "00:C0:B7:E3:22:41",
- "model": "AP8886",
- "type": "pdu",
- "uid": "grvingt-pdu1",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json
deleted file mode 100644
index 819516fdc84..00000000000
--- a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "ip": "172.17.79.221",
- "mac": "00:C0:B7:E2:B6:68",
- "model": "AP8886",
- "type": "pdu",
- "uid": "grvingt-pdu2",
- "vendor": "APC"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/nancy/networks/gw-next.yaml b/input/grid5000/sites/nancy/networks/gw-next.yaml
index e5c2fce23da..bfc721a14e9 100644
--- a/input/grid5000/sites/nancy/networks/gw-next.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-next.yaml
@@ -24,7 +24,7 @@ gw-next:
uid: sgros1
kind: switch
rate: 40_000_000_000
- 52:
+ 53:
uid: sgrvingt
kind: switch
rate: 40_000_000_000
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index a7a8f14cadf..38dc674c05c 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -113,6 +113,7 @@ sgrvingt:
47: grvingt-45
54:
uid: gw-next
+ snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
rate: 40_000_000_000
kind: switch
49:
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index 0b54ed56953..74dff979f9b 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -1,9 +1,5 @@
---
pdus:
- grvingt-pdu[1-2]:
- vendor: APC
- model: AP8886
-
graoully-pdu[1-2]:
vendor: APC
model: AP8653
@@ -78,14 +74,6 @@ pdus:
ip: 172.17.79.219
mac: 00:C0:B7:F2:27:DE
- grvingt-pdu1:
- ip: 172.17.79.220
- mac: 00:C0:B7:E3:22:41
-
- grvingt-pdu2:
- ip: 172.17.79.221
- mac: 00:C0:B7:E2:B6:68
-
graffiti-pdu1:
ip: 172.17.79.226
mac: 28:29:86:0B:3B:06
--
GitLab