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

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

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

@@ -503,13 +503,13 @@
   "type": "network_equipment",
   "uid": "gw-grenoble",
   "vlans": {
-    "1": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan1": {
       "addresses": [
         "172.16.16.254"
       ],
       "administrative": true
-    },
-    "naming_pattern": "Vlan%VLANID%"
+    }
   },
   "weathermap": {
 

generators/input/sites/grenoble/net-links/gw-grenoble.yaml

---- 
-gw-grenoble: 
+---
+gw-grenoble:
   model: ExtremeNetworks
   kind: router
   site: grenoble
   backplane_bps: 800000000000
   snmp_community: public
-  vlans: 
+  vlans:
     naming_pattern: Vlan%VLANID%
-    "1": 
+    "vlan1":
       administrative: yes
-      addresses: 
+      addresses:
         - 172.16.16.254
   routes: {}
 
-  linecards: 
-    2: 
+  linecards:
+    2:
       naming_pattern: "%LINECARD%:%PORT%"
       backplane_bps: 48000000000
       kind: switch
       rate: 1000000000
-      ports: 
+      ports:
         1:
           uid: edel-sw-2
           port: 0/1
@@ -68,12 +68,12 @@ gw-grenoble:
           uid: grimage-10
           port: bmc
           kind: node
-    3: 
+    3:
       naming_pattern: "%LINECARD%:%PORT%"
       kind: node
       backplane_bps: 48000000000
       rate: 1000000000
-      ports: 
+      ports:
         1:
           uid: digmgt
           port: eth0
@@ -190,13 +190,13 @@ gw-grenoble:
         42:
           uid: genepi-2
           port: eth1
-    4: 
+    4:
       naming_pattern: "%LINECARD%:%PORT%"
       backplane_bps: 48000000000
       kind: node
       rate: 1000000000
-      ports: 
-        1: 
+      ports:
+        1:
           uid: summit-grimage
           kind: switch
         3:
@@ -257,49 +257,49 @@ gw-grenoble:
           uid: digmgt
           port: eth4
           kind: other
-        24: 
+        24:
           uid: alpes
           port: eth0
           kind: other
-        25: 
+        25:
           uid: grimage-1
           port: eth0
-        26: 
+        26:
           uid: grimage-2
           port: eth0
-        27: 
+        27:
           uid: grimage-3
           port: eth0
-        28: 
+        28:
           uid: grimage-4
           port: eth0
-        29: 
+        29:
           uid: grimage-5
           port: eth0
-        30: 
+        30:
           uid: grimage-6
           port: eth0
-        31: 
+        31:
           uid: grimage-7
           port: eth0
-        32: 
+        32:
           uid: grimage-8
           port: eth0
-    10: 
+    10:
       naming_pattern: "%LINECARD%:%PORT%"
       backplane_bps: 48000000000
       kind: other
       rate: 1000000000
-      ports: 
-        1: 
+      ports:
+        1:
           uid: dignfs
           port: eth2
           rate: 10000000000
-        2: 
+        2:
           uid: summit-idpot
           kind: switch
         3:
           kind: virtual
           uid: renater-grenoble
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%