From fca865089fb161a3c57156f047609a65d2b8bdf2 Mon Sep 17 00:00:00 2001 From: Vidal WATAT Date: Wed, 28 Aug 2013 15:01:37 +0200 Subject: [PATCH] [reims] -Network API, Kavlan name added --- .../reims/network_equipments/gw-reims.json | 30 ++++++++++++------- .../input/sites/reims/net-links/gw-reims.yaml | 10 +++++++ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/data/grid5000/sites/reims/network_equipments/gw-reims.json b/data/grid5000/sites/reims/network_equipments/gw-reims.json index 3aad6dfa0b..5f9cd42859 100644 --- a/data/grid5000/sites/reims/network_equipments/gw-reims.json +++ b/data/grid5000/sites/reims/network_equipments/gw-reims.json @@ -199,52 +199,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.36.0.0/18" - ] + ], + "name": "kavlan-4" }, "vlan705": { "addresses": [ "10.36.64.0/18" - ] + ], + "name": "kavlan-5" }, "vlan706": { "addresses": [ "10.36.128.0/18" - ] + ], + "name": "kavlan-6" }, "vlan707": { "addresses": [ "10.36.192.0/18" - ] + ], + "name": "kavlan-7" }, "vlan708": { "addresses": [ "10.37.0.0/18" - ] + ], + "name": "kavlan-8" }, "vlan709": { "addresses": [ "10.37.64.0/18" - ] + ], + "name": "kavlan-9" }, "vlan719": { "addresses": [ "10.39.192.0/18" - ] + ], + "name": "kavlan-19" } }, "weathermap": { diff --git a/generators/input/sites/reims/net-links/gw-reims.yaml b/generators/input/sites/reims/net-links/gw-reims.yaml index 877c14ef07..c2b98250cc 100644 --- a/generators/input/sites/reims/net-links/gw-reims.yaml +++ b/generators/input/sites/reims/net-links/gw-reims.yaml @@ -20,33 +20,43 @@ gw-reims: addresses: - 192.168.69.1 "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.36.0.0/18 "vlan705": + name: kavlan-5 addresses: - 10.36.64.0/18 "vlan706": + name: kavlan-6 addresses: - 10.36.128.0/18 "vlan707": + name: kavlan-7 addresses: - 10.36.192.0/18 "vlan708": + name: kavlan-8 addresses: - 10.37.0.0/18 "vlan709": + name: kavlan-9 addresses: - 10.37.64.0/18 "vlan719": + name: kavlan-19 addresses: - 10.39.192.0/18 routes: {} -- GitLab