[grenoble] update network API post golden rules modifications

data/grid5000/sites/grenoble/network_equipments/edel-sw-1.json

@@ -26,7 +26,7 @@
         },
         {
           "kind": "other",
-          "uid": "blade-1"
+          "uid": "edel-cmc-1"
         },
         {
           "uid": "edel-1"

data/grid5000/sites/grenoble/network_equipments/edel-sw-2.json

@@ -26,7 +26,7 @@
         },
         {
           "kind": "other",
-          "uid": "blade-2"
+          "uid": "edel-cmc-2"
         },
         {
           "uid": "edel-19"

data/grid5000/sites/grenoble/network_equipments/edel-sw-3.json

@@ -26,7 +26,7 @@
         },
         {
           "kind": "other",
-          "uid": "blade-3"
+          "uid": "edel-cmc-3"
         },
         {
           "uid": "edel-37"

data/grid5000/sites/grenoble/network_equipments/edel-sw-4.json

@@ -26,7 +26,7 @@
         },
         {
           "kind": "other",
-          "uid": "blade-4"
+          "uid": "edel-cmc-4"
         },
         {
           "uid": "edel-55"

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

@@ -505,7 +505,7 @@
   "uid": "gw-grenoble",
   "vlans": {
     "naming_pattern": "Vlan%VLANID%",
-    "vlan1": {
+    "vlan100": {
       "addresses": [
         "172.16.31.254"
       ],

generators/input/sites/grenoble/net-links/edel-sw-1.yaml

@@ -18,7 +18,7 @@ edel-sw-1:
       rate: 1000000000
       ports:
         4: 
-          uid: blade-1
+          uid: edel-cmc-1
           kind: other 
         5: edel-1
         6: edel-2

generators/input/sites/grenoble/net-links/edel-sw-2.yaml

@@ -18,7 +18,7 @@ edel-sw-2:
       rate: 1000000000
       ports: 
         4: 
-          uid: blade-2
+          uid: edel-cmc-2
           kind: other
         5: edel-19
         6: edel-20

generators/input/sites/grenoble/net-links/edel-sw-3.yaml

@@ -18,7 +18,7 @@ edel-sw-3:
       rate: 1000000000
       ports: 
         4: 
-          uid: blade-3
+          uid: edel-cmc-3
           kind: other
         5: edel-37
         6: edel-38

generators/input/sites/grenoble/net-links/edel-sw-4.yaml

@@ -19,7 +19,7 @@ edel-sw-4:
       ports: 
         4:
           kind: other
-          uid: blade-4
+          uid: edel-cmc-4
         5: edel-55
         6: edel-56
         7: edel-57

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

@@ -6,14 +6,13 @@ gw-grenoble:
   backplane_bps: 800000000000
   mtu: 9216
   snmp_community: public
+  routes: {}
   vlans:
     naming_pattern: Vlan%VLANID%
-    "vlan1":
+    "vlan100":
       administrative: yes
       addresses: 
         - 172.16.31.254
-  routes: {}
-
   linecards:
     2:
       naming_pattern: "%LINECARD%:%PORT%"