From cd4242af02ff2e225da81e44967d6444cfa902f3 Mon Sep 17 00:00:00 2001
From: PARISOT Clement <clement.parisot@inria.fr>
Date: Mon, 25 Nov 2024 18:19:03 +0100
Subject: [PATCH] [grenoble] network - Remove chartreuse and servers not yet
provisionned, fix port-channel definition, remove admin switch
---
.../imag-1b-F1-prod-01.json | 5 ---
.../imag-1b-F2-prod-01.json | 5 ---
.../imag-1b-F3-prod-01.json | 35 +------------------
.../grenoble/networks/imag-1b-F1-prod-01.yaml | 5 ---
.../grenoble/networks/imag-1b-F2-prod-01.yaml | 5 ---
.../grenoble/networks/imag-1b-F3-prod-01.yaml | 27 +-------------
6 files changed, 2 insertions(+), 80 deletions(-)
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json
index 61ed1f3c45..8f8fb1bdcb 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json
@@ -77,11 +77,6 @@
{
},
{
- "kind": "switch",
- "rate": 10000000000,
- "snmp_name": "1/1/33",
- "trunk": false,
- "uid": "imag-1b-F1-admin"
},
{
},
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
index e276a2485e..00a299145f 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
@@ -77,11 +77,6 @@
{
},
{
- "kind": "switch",
- "rate": 10000000000,
- "snmp_name": "1/1/33",
- "trunk": false,
- "uid": "imag-1b-F2-admin"
},
{
},
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
index 61fed4e07c..21a60d7166 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -3,7 +3,7 @@
"channels": {
"lag1": {
"kind": "router",
- "port": "lag1",
+ "port": "port-channel50",
"rate": 50000000000,
"ssh_name": "lag 1",
"uid": "gw"
@@ -55,24 +55,12 @@
{
},
{
- "kind": "server",
- "snmp_name": "1/1/14",
- "uid": "pve-1"
},
{
- "kind": "server",
- "snmp_name": "1/1/15",
- "uid": "pve-2"
},
{
- "kind": "server",
- "snmp_name": "1/1/16",
- "uid": "nfs-1"
},
{
- "kind": "server",
- "snmp_name": "1/1/17",
- "uid": "group-storage-1"
},
{
},
@@ -131,35 +119,14 @@
{
},
{
- "kind": "switch",
- "rate": 10000000000,
- "snmp_name": "1/1/44",
- "trunk": false,
- "uid": "imag-1b-F3-admin"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/45",
- "uid": "chartreuse1-1"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/46",
- "uid": "chartreuse1-2"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/47",
- "uid": "chartreuse1-3"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "1/1/48",
- "uid": "chartreuse1-4"
},
{
"kind": "switch",
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml
index ddb422180c..a97e3e4258 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml
@@ -16,11 +16,6 @@ imag-1b-F1-prod-01:
rate: 25_000_000_000
backplane_bps: 4_800_000_000_000
ports:
- 33:
- uid: imag-1b-F1-admin
- kind: switch
- rate: 10_000_000_000
- trunk: false
49:
uid: imag-1b-F3-prod-01
kind: switch
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
index 1ad54014c0..85c2d1e585 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
@@ -16,11 +16,6 @@ imag-1b-F2-prod-01:
rate: 25_000_000_000
backplane_bps: 4_800_000_000_000
ports:
- 33:
- uid: imag-1b-F2-admin
- kind: switch
- rate: 10_000_000_000
- trunk: false
49:
uid: imag-1b-F1-prod-01
kind: switch
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
index e372ea86c7..80bf058881 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -23,33 +23,8 @@ imag-1b-F3-prod-01:
2:
uid: lag1
kind: channel
- 14:
- uid: pve-1
- kind: server
- 15:
- uid: pve-2
- kind: server
- 16:
- uid: nfs-1
- kind: server
- 17:
- uid: group-storage-1
- kind: server
22:
uid: nessie-1
- 44:
- uid: imag-1b-F3-admin
- kind: switch
- rate: 10_000_000_000
- trunk: false
- 45:
- uid: chartreuse1-1
- 46:
- uid: chartreuse1-2
- 47:
- uid: chartreuse1-3
- 48:
- uid: chartreuse1-4
49:
uid: imag-1b-F1-prod-01
kind: switch
@@ -62,4 +37,4 @@ imag-1b-F3-prod-01:
kind: router
rate: 50_000_000_000
uid: gw
- port: lag1
+ port: port-channel50
--
GitLab