[grenoble,lyon,reims,sophia,toulouse] Add Renater network link, correct...

[grenoble,lyon,reims,sophia,toulouse] Add Renater network link, correct golden_network_naming cf #4367

data/grid5000/sites/grenoble/network_equipments/aspen.json

@@ -480,6 +480,10 @@
         {
           "kind": "switch",
           "uid": "summit-idpot"
+        },
+        {
+          "kind": "virtual",
+          "uid": "renater-grenoble"
         }
       ],
       "rate": 1000000000

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

@@ -474,7 +474,7 @@
         {
           "kind": "virtual",
           "site": "renater",
-          "uid": "renater5-lyon"
+          "uid": "renater-lyon"
         }
       ],
       "rate": 10000000000

data/grid5000/sites/reims/network_equipments/sw-grid-a.json

@@ -142,6 +142,22 @@
         },
         {
           "uid": "stremi-44"
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+          "kind": "virtual",
+          "uid": "renater-reims"
         }
       ],
       "rate": 1000000000

data/grid5000/sites/sophia/network_equipments/fastiron.json

@@ -487,7 +487,7 @@
           "uid": "front-sop"
         },
         {
-          "uid": "renater-1g"
+          "uid": "renater-sophia"
         },
         {
           "port": "eth0",

data/grid5000/sites/toulouse/network_equipments/c6500-grid5000.json

@@ -15,7 +15,7 @@
 
         },
         {
-          "uid": "RENATER"
+          "uid": "renater-toulouse"
         },
         {
           "kind": "router",

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

@@ -293,5 +293,8 @@ aspen:
         2: 
           uid: summit-idpot
           kind: switch
+        3:
+          kind: virtual
+          uid: renater-grenoble
   channels: 
     naming_pattern: Po%CHANNELID%

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

@@ -154,7 +154,7 @@ aspen-8810:
           uid: salome
           port: "0:49"
         4:
-          uid: renater5-lyon
+          uid: renater-lyon
           site: renater
           kind: virtual
   channels: 

generators/input/sites/reims/net-links/sw-grid-a.yaml

@@ -62,5 +62,8 @@ sw-grid-a:
         42: stremi-42
         43: stremi-43
         44: stremi-44
+        49:
+          kind: virtual
+          uid: renater-reims
   channels: 
     naming_pattern: Po%CHANNELID%

generators/input/sites/sophia/net-links/fastiron.yaml

@@ -131,7 +131,7 @@ fastiron:
           uid: services2
           port: eth1
         8: front-sop
-        9: renater-1g
+        9: renater-sophia
         10: 
           uid: stock
           port: eth0

generators/input/sites/toulouse/net-links/c6500-grid5000.yaml

@@ -12,14 +12,14 @@ c6500-grid5000:
       administrative: yes
       addresses:
         - 172.16.127.254
-  linecards: 
-    1: 
+  linecards:
+    1:
       kind: renater
       naming_pattern: Te%LINECARD%/%PORT%
       rate: 10000000000
-      ports: 
-        1: RENATER
-        2: 
+      ports:
+        1: renater-toulouse
+        2:
           kind: router
           uid: r4.toulouse.grid5000.fr
     2: