From 9b2d7396d4c8aa9d9ff9c761cf07789e63f85e6f Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Thu, 14 Mar 2013 20:08:00 +0100
Subject: [PATCH] [toulouse] Network - Correct vlan naming (xml mime type
disallow tags by numbers, refs: http://www.w3.org/TR/REC-xml/)
---
.../sites/toulouse/network_equipments/gw-toulouse.json | 7 ++++---
data/grid5000/sites/toulouse/network_equipments/r4.json | 7 ++++---
generators/input/sites/toulouse/net-links/gw-toulouse.yaml | 2 +-
generators/input/sites/toulouse/net-links/r4.yaml | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
index 8647a23a7b4..96abbc9aa6f 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": null,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
@@ -349,13 +350,13 @@
"type": "network_equipment",
"uid": "gw-toulouse",
"vlans": {
- "100": {
+ "naming_pattern": "Vlan%VLANID%",
+ "vlan100": {
"addresses": [
"172.16.127.254"
],
"administrative": true
- },
- "naming_pattern": "Vlan%VLANID%"
+ }
},
"weathermap": {
diff --git a/data/grid5000/sites/toulouse/network_equipments/r4.json b/data/grid5000/sites/toulouse/network_equipments/r4.json
index c68c800c474..53d3a3462aa 100644
--- a/data/grid5000/sites/toulouse/network_equipments/r4.json
+++ b/data/grid5000/sites/toulouse/network_equipments/r4.json
@@ -1,4 +1,5 @@
{
+ "backplane_bps": null,
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
@@ -293,13 +294,13 @@
"type": "network_equipment",
"uid": "r4",
"vlans": {
- "100": {
+ "naming_pattern": "Vlan%VLANID%",
+ "vlan100": {
"addresses": [
"172.16.127.201"
],
"administrative": true
- },
- "naming_pattern": "Vlan%VLANID%"
+ }
},
"weathermap": {
diff --git a/generators/input/sites/toulouse/net-links/gw-toulouse.yaml b/generators/input/sites/toulouse/net-links/gw-toulouse.yaml
index f0422629c47..080f52c502f 100644
--- a/generators/input/sites/toulouse/net-links/gw-toulouse.yaml
+++ b/generators/input/sites/toulouse/net-links/gw-toulouse.yaml
@@ -8,7 +8,7 @@ gw-toulouse:
vlans:
naming_pattern: Vlan%VLANID%
- "100":
+ "vlan100":
administrative: yes
addresses:
- 172.16.127.254
diff --git a/generators/input/sites/toulouse/net-links/r4.yaml b/generators/input/sites/toulouse/net-links/r4.yaml
index caba7a76de6..519fd7239ae 100644
--- a/generators/input/sites/toulouse/net-links/r4.yaml
+++ b/generators/input/sites/toulouse/net-links/r4.yaml
@@ -8,7 +8,7 @@ r4:
vlans:
naming_pattern: Vlan%VLANID%
- "100":
+ "vlan100":
administrative: yes
addresses:
- 172.16.127.201
--
GitLab