From 1de24be0c300fa65b5a2bf64e4565bf9f2895b24 Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Wed, 28 Aug 2013 14:42:38 +0200
Subject: [PATCH] [rennes] - kavlan name added -
---
.../rennes/network_equipments/gw-rennes.json | 30 ++++++++++++-------
.../sites/rennes/net-links/gw-rennes.yaml | 10 +++++++
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json b/data/grid5000/sites/rennes/network_equipments/gw-rennes.json
index 33c44697d80..efc8bca380d 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw-rennes.json
@@ -896,52 +896,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.24.0.0/18"
- ]
+ ],
+ "name": "kavlan-4"
},
"vlan705": {
"addresses": [
"10.24.64.0/18"
- ]
+ ],
+ "name": "kavlan-5"
},
"vlan706": {
"addresses": [
"10.24.128.0/18"
- ]
+ ],
+ "name": "kavlan-6"
},
"vlan707": {
"addresses": [
"10.24.192.0/18"
- ]
+ ],
+ "name": "kavlan-7"
},
"vlan708": {
"addresses": [
"10.25.0.0/18"
- ]
+ ],
+ "name": "kavlan-8"
},
"vlan709": {
"addresses": [
"10.25.64.0/18"
- ]
+ ],
+ "name": "kavlan-9"
},
"vlan716": {
"addresses": [
"10.27.192.0/18"
- ]
+ ],
+ "name": "kavlan-16"
}
},
"weathermap": {
diff --git a/generators/input/sites/rennes/net-links/gw-rennes.yaml b/generators/input/sites/rennes/net-links/gw-rennes.yaml
index 71b328c21a0..2214297aa36 100644
--- a/generators/input/sites/rennes/net-links/gw-rennes.yaml
+++ b/generators/input/sites/rennes/net-links/gw-rennes.yaml
@@ -19,33 +19,43 @@ gw-rennes:
addresses:
- 192.168.4.19
"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.24.0.0/18
"vlan705":
+ name: kavlan-5
addresses:
- 10.24.64.0/18
"vlan706":
+ name: kavlan-6
addresses:
- 10.24.128.0/18
"vlan707":
+ name: kavlan-7
addresses:
- 10.24.192.0/18
"vlan708":
+ name: kavlan-8
addresses:
- 10.25.0.0/18
"vlan709":
+ name: kavlan-9
addresses:
- 10.25.64.0/18
"vlan716":
+ name: kavlan-16
addresses:
- 10.27.192.0/18
--
GitLab