[lyon] Network - Correct vlan naming (xml mime type disallow tags by numbers,...

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

data/grid5000/sites/lyon/network_equipments/force10.json

@@ -156,13 +156,13 @@
   "type": "network_equipment",
   "uid": "force10",
   "vlans": {
-    "1": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan1": {
       "addresses": [
         "10.69.143.253"
       ],
       "administrative": true
-    },
-    "naming_pattern": "Vlan%VLANID%"
+    }
   },
   "weathermap": {
 

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

@@ -485,13 +485,13 @@
   "type": "network_equipment",
   "uid": "gw-lyon",
   "vlans": {
-    "690": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan690": {
       "addresses": [
         "10.69.7.254"
       ],
       "administrative": true
-    },
-    "naming_pattern": "Vlan%VLANID%"
+    }
   },
   "weathermap": {
 

data/grid5000/sites/lyon/network_equipments/salome.json

@@ -175,13 +175,13 @@
   "type": "network_equipment",
   "uid": "salome",
   "vlans": {
-    "690": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan690": {
       "addresses": [
         "10.69.7.194"
       ],
       "administrative": true
-    },
-    "naming_pattern": "Vlan%VLANID%"
+    }
   },
   "weathermap": {
 

generators/input/sites/lyon/net-links/force10.yaml

---- 
-force10: 
+---
+force10:
   model: Force10 S4810
   kind: switch
   site: lyon
   snmp_community: public
   vlans:
     naming_pattern: Vlan%VLANID%
-    "1":
+    "vlan1":
       administrative: yes
       addresses:
         - 10.69.143.253
   routes: {}
   backplane_bps: 1280000000000,
-  linecards: 
-    0: 
+  linecards:
+    0:
       naming_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
       kind: node
-      rate: 10000000000 
-      port: eth0 
-      ports: 
+      rate: 10000000000
+      port: eth0
+      ports:
         1: taurus-1
         2: taurus-2
         3: taurus-3
@@ -43,15 +43,15 @@ force10:
         25: hercule-2
         26: hercule-3
         27: hercule-4
-        36: 
+        36:
           uid: castor
           kind: other
-        37: 
+        37:
           uid: pollux
           kind: other
-        42: 
+        42:
           uid: gw-lyon
           kind: router
           port: "9:2"
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%

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

---- 
-gw-lyon: 
+---
+gw-lyon:
   model: Extreme Networks version 12.1.3.14
   kind: router
   site: lyon
   snmp_community: public
   vlans:
     naming_pattern: Vlan%VLANID%
-    "690":
+    "vlan690":
       administrative: yes
       addresses:
         - 10.69.7.254
@@ -19,7 +19,7 @@ gw-lyon:
       kind: node
       rate: 1000000000
       port: eth1
-      ports: 
+      ports:
         10: sagittaire-10
         11: sagittaire-11
         12: sagittaire-12
@@ -67,13 +67,13 @@ gw-lyon:
         7: sagittaire-7
         8: sagittaire-8
         9: sagittaire-9
-    2: 
+    2:
       naming_pattern: "%LINECARD%:%PORT%"
       backplane_bps: 48000000000,
       kind: node
-      rate: 1000000000 
+      rate: 1000000000
       port: eth1
-      ports: 
+      ports:
         1: sagittaire-49
         2: sagittaire-50
         3: sagittaire-51
@@ -103,46 +103,46 @@ gw-lyon:
         29: sagittaire-77
         30: sagittaire-78
         31: sagittaire-79
-    4: 
+    4:
       naming_pattern: "%LINECARD%:%PORT%"
       backplane_bps: 48000000000,
       kind: switch
-      rate: 1000000000 
-      ports: 
-        6: 
+      rate: 1000000000
+      ports:
+        6:
           uid: cyrrus
           port: eth1
           kind: other
-        7: 
+        7:
           uid: flow
           port: eth1
           kind: other
-        21: 
+        21:
           uid: nebula
           port: eth1
           kind: other
-        36: 
+        36:
           uid: wattmetre
           port: eth1
           kind: other
-        48: 
+        48:
           uid: ENS-Lyon
           kind: virtual # Through castor, nat VM to ENS-Lyon network
-    9: 
+    9:
       naming_pattern: "%LINECARD%:%PORT%"
       backplane_bps: 48000000000,
       kind: switch
-      rate: 10000000000 
-      ports: 
-        2: 
+      rate: 10000000000
+      ports:
+        2:
           uid: force10
           port: "0:42"
-        3: 
+        3:
           uid: salome
           port: "0:49"
         4:
           uid: renater-lyon
           site: renater
           kind: virtual
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%

generators/input/sites/lyon/net-links/salome.yaml

 ---
-salome: 
+salome:
   model: Foundry FES-X 448
   kind: switch
   site: lyon
   snmp_community: public
-  vlans: 
+  vlans:
     naming_pattern: Vlan%VLANID%
-    "690":
+    "vlan690":
       administrative: yes
       addresses:
         - 10.69.7.194
   routes: {}
   backplane_bps: 136000000000,
-  linecards: 
-    0: 
+  linecards:
+    0:
       naming_pattern: "ethernet%PORT%"
       kind: router
       rate: 1000000000
-      ports: 
-        49: 
+      ports:
+        49:
             uid: gw-lyon
             rate: 10000000000
-        48: 
+        48:
             uid: mizar
             port: eth0
             kind: other
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%