From f98407d75323d30dcd6f5c4bb541c48963f743f9 Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Wed, 29 Nov 2017 14:46:37 +0100
Subject: [PATCH] [lille] lacp links description
---
.../network_equipments/sw-chiclet-1.json | 8 ++---
.../network_equipments/sw-chiclet-2.json | 10 +++---
.../network_equipments/sw-chiclet-3.json | 8 ++---
grid5000-all.json | 34 +++++++++++--------
.../sites/lille/networks/sw-chiclet-1.yaml | 8 ++---
.../sites/lille/networks/sw-chiclet-2.yaml | 16 +++++----
.../sites/lille/networks/sw-chiclet-3.yaml | 8 ++---
7 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index 083c3785008..1458977f34e 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -118,15 +118,15 @@
},
{
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/52",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
},
{
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/51",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
}
],
"rate": 10000000000,
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index b4dc26d3a3f..d4e509f5589 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -77,11 +77,13 @@
{
},
{
+ "kind": "other",
"uid": "renater5-FON"
},
{
},
{
+ "kind": "other",
"uid": "labo"
},
{
@@ -118,25 +120,25 @@
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/54",
- "uid": "lacp-sw-chiclet-1"
+ "uid": "sw-chiclet-1"
},
{
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/53",
- "uid": "lacp-sw-chiclet-1"
+ "uid": "sw-chiclet-1"
},
{
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/53",
- "uid": "lacp-sw-chiclet-3"
+ "uid": "sw-chiclet-3"
},
{
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/54",
- "uid": "lacp-sw-chiclet-3"
+ "uid": "sw-chiclet-3"
}
],
"rate": 10000000000,
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
index 0dde5ce0ed7..26fc801f9db 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -141,15 +141,15 @@
},
{
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/53",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
},
{
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/54",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
}
],
"rate": 10000000000,
diff --git a/grid5000-all.json b/grid5000-all.json
index 5da1416494e..0c08eee108e 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -27907,15 +27907,15 @@
"ports": {
"53": {
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/52",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
},
"54": {
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/51",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
}
},
"rate": 10000000000,
@@ -27947,31 +27947,37 @@
"kind": "virtual",
"port": "eth0",
"ports": {
- "33": "renater5-FON",
- "35": "labo",
+ "33": {
+ "kind": "other",
+ "uid": "renater5-FON"
+ },
+ "35": {
+ "kind": "other",
+ "uid": "labo"
+ },
"51": {
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/54",
- "uid": "lacp-sw-chiclet-1"
+ "uid": "sw-chiclet-1"
},
"52": {
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/53",
- "uid": "lacp-sw-chiclet-1"
+ "uid": "sw-chiclet-1"
},
"53": {
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/53",
- "uid": "lacp-sw-chiclet-3"
+ "uid": "sw-chiclet-3"
},
"54": {
"aggregation": "lacp",
"kind": "switch",
"port": "Ethernet1/54",
- "uid": "lacp-sw-chiclet-3"
+ "uid": "sw-chiclet-3"
}
},
"rate": 10000000000,
@@ -28102,15 +28108,15 @@
"5": "chetemi-5",
"53": {
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/53",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
},
"54": {
"aggregation": "lacp",
- "kind": "switch",
+ "kind": "router",
"port": "Ethernet1/54",
- "uid": "lacp-sw-chiclet-2"
+ "uid": "sw-chiclet-2"
},
"6": "chetemi-6",
"7": "chetemi-7",
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index 631c35d4bbe..48d16473848 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -20,12 +20,12 @@ sw-chiclet-1:
port: eth0
ports:
53:
- uid: lacp-sw-chiclet-2
- kind: switch
+ uid: sw-chiclet-2
+ kind: router
port: Ethernet1/52
aggregation: lacp
54:
- uid: lacp-sw-chiclet-2
- kind: switch
+ uid: sw-chiclet-2
+ kind: router
port: Ethernet1/51
aggregation: lacp
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index c8ac2a34cbe..4dc556a7935 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -70,25 +70,29 @@ sw-chiclet-2:
rate: 10000000000
port: eth0
ports:
- 33: renater5-FON
- 35: labo
+ 33:
+ uid: renater5-FON
+ kind: other
+ 35:
+ uid: labo
+ kind: other
51:
- uid: lacp-sw-chiclet-1
+ uid: sw-chiclet-1
kind: switch
port: Ethernet1/54
aggregation: lacp
52:
- uid: lacp-sw-chiclet-1
+ uid: sw-chiclet-1
kind: switch
port: Ethernet1/53
aggregation: lacp
53:
- uid: lacp-sw-chiclet-3
+ uid: sw-chiclet-3
kind: switch
port: Ethernet1/53
aggregation: lacp
54:
- uid: lacp-sw-chiclet-3
+ uid: sw-chiclet-3
kind: switch
port: Ethernet1/54
aggregation: lacp
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index 79f1ac50898..0596e0d59f9 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -43,12 +43,12 @@ sw-chiclet-3:
23: chifflet-7
24: chifflet-8
53:
- uid: lacp-sw-chiclet-2
- kind: switch
+ uid: sw-chiclet-2
+ kind: router
port: Ethernet1/53
aggregation: lacp
54:
- uid: lacp-sw-chiclet-2
- kind: switch
+ uid: sw-chiclet-2
+ kind: router
port: Ethernet1/54
aggregation: lacp
--
GitLab