[luxembourg] Network - Correct vlan naming (xml mime type disallow tags by...

[luxembourg] Network - Correct vlan naming (xml mime type disallow tags by numbers, refs: http://www.w3.org/TR/REC-xml/), test lacp

data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json

 {
   "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": {
 

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"

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

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