From 1f45104b7a9143f338b9b7395b2a52227143b9c1 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Wed, 2 Sep 2020 16:06:58 +0200
Subject: [PATCH] [sgrappe] Fix network
---
.../sites/nancy/network_equipments/gw.json | 6 ++++
.../nancy/network_equipments/sgrappe.json | 34 +++++++++++++++++++
.../sites/nancy/networks/gw-nancy.yaml | 6 ++++
.../sites/nancy/networks/sgrappe.yaml | 12 +++++++
4 files changed, 58 insertions(+)
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index 3cb12eac73..9587f52b1f 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -16,6 +16,12 @@
"port": "port-channel1",
"rate": 800000000000,
"uid": "sgros2"
+ },
+ "port-channel4": {
+ "kind": "switch",
+ "port": "port-channel1",
+ "rate": 1000000000000,
+ "uid": "sgrappe"
}
},
"ip": "172.16.79.254",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 4e52b260b3..260bd21c36 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -1,4 +1,12 @@
{
+ "channels": {
+ "port-channel1": {
+ "kind": "router",
+ "port": "port-channel4",
+ "rate": 1000000000000,
+ "uid": "gw"
+ }
+ },
"ip": "172.17.79.205",
"kind": "switch",
"linecards": [
@@ -105,6 +113,32 @@
"port": "eth0",
"snmp_name": "Ethernet1/1/16",
"uid": "grappe-16"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "Ethernet1/1/25",
+ "uid": "port-channel1"
+ },
+ {
+ "kind": "channel",
+ "snmp_name": "Ethernet1/1/26",
+ "uid": "port-channel1"
}
],
"rate": 25000000000,
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index bf57505ac9..7db7d8e074 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -801,3 +801,9 @@ gw:
uid: sgros2
kind: switch
rate: 800000000000
+ port-channel4:
+ port: port-channel1
+ uid: sgrappe
+ kind: switch
+ rate: 1000000000000
+
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index 60cd2a2190..a21baa46ba 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -46,3 +46,15 @@ sgrappe:
uid: grappe-15
16:
uid: grappe-16
+ 25:
+ uid: port-channel1
+ kind: channel
+ 26:
+ uid: port-channel1
+ kind: channel
+ channels:
+ port-channel1:
+ port: port-channel4
+ uid: gw
+ kind: router
+ rate: 1000000000000
--
GitLab