From 21bd940ca0effa77cbfae349d3513ca65734735f Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Wed, 28 Aug 2013 15:20:00 +0200
Subject: [PATCH] [lyon] - Network API. Kavlan description -
---
.../lyon/network_equipments/gw-lyon.json | 30 ++++++++++++-------
.../input/sites/lyon/net-links/gw-lyon.yaml | 10 +++++++
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
index cf7ebb2f698..562c90d27e4 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
@@ -506,52 +506,62 @@
"vlan701": {
"addresses": [
"192.168.192.0/20"
- ]
+ ],
+ "name": "kavlan-1"
},
"vlan702": {
"addresses": [
"192.168.208.0/20"
- ]
+ ],
+ "name": "kavlan-2"
},
"vlan703": {
"addresses": [
"192.168.224.0/20"
- ]
+ ],
+ "name": "kavlan-3"
},
"vlan704": {
"addresses": [
"10.12.0.0/18"
- ]
+ ],
+ "name": "kavlan-4"
},
"vlan705": {
"addresses": [
"10.12.64.0/18"
- ]
+ ],
+ "name": "kavlan-5"
},
"vlan706": {
"addresses": [
"10.12.128.0/18"
- ]
+ ],
+ "name": "kavlan-6"
},
"vlan707": {
"addresses": [
"10.12.192.0/18"
- ]
+ ],
+ "name": "kavlan-7"
},
"vlan708": {
"addresses": [
"10.13.0.0/18"
- ]
+ ],
+ "name": "kavlan-8"
},
"vlan709": {
"addresses": [
"10.13.64.0/18"
- ]
+ ],
+ "name": "kavlan-9"
},
"vlan713": {
"addresses": [
"10.15.192.0/18"
- ]
+ ],
+ "name": "kavlan-13"
}
},
"weathermap": {
diff --git a/generators/input/sites/lyon/net-links/gw-lyon.yaml b/generators/input/sites/lyon/net-links/gw-lyon.yaml
index 181bb750e86..ac9405a2d65 100644
--- a/generators/input/sites/lyon/net-links/gw-lyon.yaml
+++ b/generators/input/sites/lyon/net-links/gw-lyon.yaml
@@ -17,33 +17,43 @@ gw-lyon:
addresses:
- 192.168.4.13
"vlan701":
+ name: kavlan-1
addresses:
- 192.168.192.0/20
"vlan702":
+ name: kavlan-2
addresses:
- 192.168.208.0/20
"vlan703":
+ name: kavlan-3
addresses:
- 192.168.224.0/20
"vlan704":
+ name: kavlan-4
addresses:
- 10.12.0.0/18
"vlan705":
+ name: kavlan-5
addresses:
- 10.12.64.0/18
"vlan706":
+ name: kavlan-6
addresses:
- 10.12.128.0/18
"vlan707":
+ name: kavlan-7
addresses:
- 10.12.192.0/18
"vlan708":
+ name: kavlan-8
addresses:
- 10.13.0.0/18
"vlan709":
+ name: kavlan-9
addresses:
- 10.13.64.0/18
"vlan713":
+ name: kavlan-13
addresses:
- 10.15.192.0/18
routes: {}
--
GitLab