[grenoble] network - Fix uplink connection on imag switchs

data/grid5000/sites/grenoble/network_equipments/imag-1b-F1-prod-01.json

@@ -77,11 +77,6 @@
         {
         },
         {
-          "kind": "switch",
-          "rate": 10000000000,
-          "snmp_name": "1/1/33",
-          "trunk": false,
-          "uid": "imag-1b-F1-admin"
         },
         {
         },
@@ -104,6 +99,11 @@
         {
         },
         {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/44",
+          "trunk": false,
+          "uid": "imag-1b-F1-admin-01"
         },
         {
         },
@@ -115,13 +115,9 @@
         },
         {
           "kind": "switch",
+          "rate": 100000000000,
           "snmp_name": "1/1/49",
           "uid": "imag-1b-F3-prod-01"
-        },
-        {
-          "kind": "switch",
-          "snmp_name": "1/1/50",
-          "uid": "imag-1b-F2-prod-01"
         }
       ],
       "rate": 25000000000,

data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json

@@ -103,7 +103,7 @@
           "rate": 10000000000,
           "snmp_name": "1/1/44",
           "trunk": false,
-          "uid": "imag-1b-F2-admin"
+          "uid": "imag-1b-F2-admin-01"
         },
         {
         },
@@ -115,12 +115,8 @@
         },
         {
           "kind": "switch",
+          "rate": 100000000000,
           "snmp_name": "1/1/49",
-          "uid": "imag-1b-F1-prod-01"
-        },
-        {
-          "kind": "switch",
-          "snmp_name": "1/1/50",
           "uid": "imag-1b-F3-prod-01"
         }
       ],

data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json

@@ -139,7 +139,7 @@
           "rate": 10000000000,
           "snmp_name": "1/1/44",
           "trunk": false,
-          "uid": "imag-1b-F3-admin"
+          "uid": "imag-1b-F3-admin-01"
         },
         {
           "kind": "server",
@@ -163,11 +163,13 @@
         },
         {
           "kind": "switch",
+          "rate": 100000000000,
           "snmp_name": "1/1/49",
           "uid": "imag-1b-F2-prod-01"
         },
         {
           "kind": "switch",
+          "rate": 100000000000,
           "snmp_name": "1/1/50",
           "uid": "imag-1b-F1-prod-01"
         }

input/grid5000/sites/grenoble/networks/imag-1b-F1-prod-01.yaml

@@ -16,16 +16,14 @@ imag-1b-F1-prod-01:
       rate: 25_000_000_000
       backplane_bps: 4_800_000_000_000
       ports:
-        33:
-          uid: imag-1b-F1-admin
+        44:
+          uid: imag-1b-F1-admin-01
           kind: switch
           rate: 10_000_000_000
           trunk: false
         49:
           uid: imag-1b-F3-prod-01
           kind: switch
-        50:
-          uid: imag-1b-F2-prod-01
-          kind: switch
+          rate: 100_000_000_000
   channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
 

input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml

@@ -17,15 +17,13 @@ imag-1b-F2-prod-01:
       backplane_bps: 4_800_000_000_000
       ports:
         44:
-          uid: imag-1b-F2-admin
+          uid: imag-1b-F2-admin-01
           kind: switch
           rate: 10_000_000_000
           trunk: false
         49:
-          uid: imag-1b-F1-prod-01
-          kind: switch
-        50:
           uid: imag-1b-F3-prod-01
           kind: switch
+          rate: 100_000_000_000
   channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
 

input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml

@@ -34,7 +34,7 @@ imag-1b-F3-prod-01:
         22:
           uid: nessie-1
         44:
-          uid: imag-1b-F3-admin
+          uid: imag-1b-F3-admin-01
           kind: switch
           rate: 10_000_000_000
           trunk: false
@@ -53,9 +53,11 @@ imag-1b-F3-prod-01:
         49:
           uid: imag-1b-F2-prod-01
           kind: switch
+          rate: 100_000_000_000
         50:
           uid: imag-1b-F1-prod-01
           kind: switch
+          rate: 100_000_000_000
   channels_ssh_pattern: '#{/\D+/.match("%CHANNEL%")} #{/\d+/.match("%CHANNEL%")}'
   channels:
     lag1: