From a25a0ed209249df76a857f566aacaa9edb2e615d Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Thu, 14 Mar 2013 19:39:24 +0100
Subject: [PATCH] [luxembourg] Network - Correct vlan naming (xml mime type
disallow tags by numbers, refs: http://www.w3.org/TR/REC-xml/), test lacp
---
.../network_equipments/gw-luxembourg.json | 20 +++++++++----------
.../network_equipments/ul-grid5000-sw02.json | 6 +++---
.../luxembourg/net-links/gw-luxembourg.yaml | 16 +++++++--------
.../net-links/ul-grid5000-sw02.yaml | 2 +-
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
index 72542ac6f54..f730760ed86 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
@@ -1,7 +1,7 @@
{
"backplane_bps": 720000000000,
"channels": {
- "1": [
+ "lacp1": [
{
"linecard": 1,
"port": 35
@@ -11,7 +11,7 @@
"port": 44
}
],
- "2": [
+ "lacp2": [
{
"linecard": 1,
"port": 36
@@ -21,7 +21,7 @@
"port": 40
}
],
- "3": [
+ "lacp3": [
{
"linecard": 1,
"port": 23
@@ -552,37 +552,37 @@
"type": "network_equipment",
"uid": "gw-luxembourg",
"vlans": {
- "10": {
+ "naming_pattern": "Vlan%VLANID%",
+ "vlan10": {
"addresses": [
"172.17.191.254"
],
"administrative": true
},
- "103": {
+ "vlan103": {
"addresses": [
"192.168.69.1"
],
"administrative": true
},
- "30": {
+ "vlan30": {
"addresses": [
"172.16.191.254"
],
"administrative": true
},
- "50": {
+ "vlan50": {
"addresses": [
"192.168.15.254"
],
"administrative": true
},
- "550": {
+ "vlan550": {
"addresses": [
"192.168.4.21"
],
"administrative": true
- },
- "naming_pattern": "Vlan%VLANID%"
+ }
},
"weathermap": {
diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
index cde9e820cf3..54405f0c403 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -201,13 +201,13 @@
"type": "network_equipment",
"uid": "ul-grid5000-sw02",
"vlans": {
- "50": {
+ "naming_pattern": "Vlan%VLANID%",
+ "vlan50": {
"addresses": [
"172.17.191.253"
],
"administrative": true
- },
- "naming_pattern": "Vlan%VLANID%"
+ }
},
"weathermap": {
"use_cacti": "yes"
diff --git a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml b/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml
index 5bf6cea85e6..12564295f24 100644
--- a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml
+++ b/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml
@@ -7,23 +7,23 @@ gw-luxembourg:
backplane_bps: 720000000000
vlans:
naming_pattern: Vlan%VLANID%
- "30":
+ "vlan30":
administrative: yes
addresses:
- 172.16.191.254
- "10":
+ "vlan10":
administrative: yes
addresses:
- 172.17.191.254
- "50":
+ "vlan50":
administrative: yes
addresses:
- 192.168.15.254
- "103":
+ "vlan103":
administrative: yes
addresses:
- 192.168.69.1
- "550":
+ "vlan550":
administrative: yes
addresses:
- 192.168.4.21
@@ -365,17 +365,17 @@ gw-luxembourg:
rate: 10000000000
channels:
naming_pattern: Po%CHANNELID%
- "1":
+ "lacp1":
- linecard: 1
port: 35
- linecard: 2
port: 44
- "2":
+ "lacp2":
- linecard: 1
port: 36
- linecard: 1
port: 40
- "3":
+ "lacp3":
- linecard: 1
port: 23
- linecard: 2
diff --git a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml b/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml
index c35b3ac290d..cbf0863ba04 100644
--- a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml
+++ b/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml
@@ -9,7 +9,7 @@ ul-grid5000-sw02:
use_cacti: "yes"
vlans:
naming_pattern: Vlan%VLANID%
- "50":
+ "vlan50":
administrative: yes
addresses:
- 172.17.191.253
--
GitLab