From 9d943048644d08f5f83224f72430f679be6f0271 Mon Sep 17 00:00:00 2001
From: Patrice RINGOT <patrice.ringot@loria.fr>
Date: Mon, 7 Oct 2019 16:37:05 +0200
Subject: [PATCH] [nancy][gros] fix sgros2 uplink - itf 1/1/65 pb on sgros2
---
data/grid5000/sites/nancy/network_equipments/gw-nancy.json | 4 ++--
data/grid5000/sites/nancy/network_equipments/sgros2.json | 2 ++
input/grid5000/sites/nancy/networks/gw-nancy.yaml | 6 +++---
input/grid5000/sites/nancy/networks/sgros2.yaml | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
index d74ffa402a2..dc30ab2f17e 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
@@ -1614,6 +1614,8 @@
{
},
{
+ "kind": "switch",
+ "uid": "sgros2"
},
{
},
@@ -1624,8 +1626,6 @@
"uid": "sgros1"
},
{
- "kind": "switch",
- "uid": "sgros2"
},
{
"kind": "node",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index 1d77fc62cd0..4533b1a5f51 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -1031,6 +1031,8 @@
},
{
},
+ {
+ },
{
"kavlan_pattern": "ethernet1/1/%LINECARD%",
"ports": [
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 940da7f3aba..9ef22ced91f 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -1312,12 +1312,12 @@ gw-nancy:
uid: grele-14
kind: node
port: eth0
+ 36:
+ uid: sgros2
+ kind: switch
39:
uid: sgros1
kind: switch
- 40:
- uid: sgros2
- kind: switch
41:
uid: graffiti-13
kind: node
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 8da7fff033b..8a8a6411b7a 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -359,7 +359,7 @@ sgros2:
2: gros-2
3: gros-3
4: gros-4
- 65:
+ 66:
snmp_pattern: "ethernet 1/1/%LINECARD%"
kavlan_pattern: "ethernet1/1/%LINECARD%"
rate: 10000000000
--
GitLab