[lyon] Network golden naming, add renater link

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

@@ -159,7 +159,7 @@
         {
           "kind": "router",
           "port": "5:17",
-          "uid": "aspen-8810"
+          "uid": "gw-lyon"
         }
       ],
       "rate": 100000000

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

@@ -172,7 +172,7 @@
           "kind": "router",
           "port": "4:47",
           "rate": 1000000000,
-          "uid": "aspen-8810"
+          "uid": "gw-lyon"
         }
       ],
       "rate": 100000000

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

@@ -140,7 +140,7 @@
         {
           "kind": "router",
           "port": "9:2",
-          "uid": "aspen-8810"
+          "uid": "gw-lyon"
         }
       ],
       "rate": 10000000000
@@ -158,7 +158,7 @@
       "rate": 1000000000
     }
   ],
-  "model": "Force10 S4810P",
+  "model": "cisco",
   "routes": {
 
   },

data/grid5000/sites/lyon/network_equipments/aspen-8810.json → data/grid5000/sites/lyon/network_equipments/gw-lyon.json

@@ -487,7 +487,7 @@
   "site": "lyon",
   "snmp_community": "public",
   "type": "network_equipment",
-  "uid": "aspen-8810",
+  "uid": "gw-lyon",
   "vlans": {
     "naming_pattern": "Vlan%VLANID%"
   },

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

@@ -159,7 +159,7 @@
         },
         {
           "rate": 10000000000,
-          "uid": "aspen-8810"
+          "uid": "gw-lyon"
         }
       ],
       "rate": 1000000000

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

@@ -156,12 +156,12 @@
         {
           "kind": "router",
           "port": "5:15",
-          "uid": "aspen-8810"
+          "uid": "gw-lyon"
         },
         {
           "kind": "router",
           "port": "5:16",
-          "uid": "aspen-8810"
+          "uid": "gw-lyon"
         }
       ],
       "rate": 100000000

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

@@ -56,7 +56,7 @@ bettie:
         39: sagittaire-78
         40: sagittaire-79
         48: 
-          uid: aspen-8810
+          uid: gw-lyon
           kind: router
           port: "5:17"
   channels: 

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

@@ -61,7 +61,7 @@ chris:
           kind: switch
           port: "1:0"
         49: 
-          uid: aspen-8810 
+          uid: gw-lyon 
           kind: router
           port: "4:47"
           rate: 1000000000

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

 --- 
 force10: 
-  model: Force10 S4810P
+  model: cisco
   kind: switch
   site: lyon
   snmp_community: public
@@ -46,7 +46,7 @@ force10:
           uid: pollux
           kind: other
         42: 
-          uid: aspen-8810 
+          uid: gw-lyon 
           kind: router
           port: "9:2"
     1: 

generators/input/sites/lyon/net-links/aspen-8810.yaml → generators/input/sites/lyon/net-links/gw-lyon.yaml

 --- 
-aspen-8810: 
+gw-lyon: 
   model: Extreme Networks version 12.1.3.14
   kind: router
   site: lyon

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

@@ -15,7 +15,7 @@ salome:
       rate: 1000000000
       ports: 
         49: 
-            uid: aspen-8810
+            uid: gw-lyon
             rate: 10000000000
         47: 
             uid: mizar

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

@@ -55,11 +55,11 @@ zybline:
         38: sagittaire-73
         39: sagittaire-74
         47: 
-          uid: aspen-8810
+          uid: gw-lyon
           kind: router
           port: "5:15"
         48: 
-          uid: aspen-8810
+          uid: gw-lyon
           kind: router
           port: "5:16"
   channels: