[nancy] fix sgros{1,2} uplink on gw

grid5000 · Feb 11, 2020 · 95ed070 · 95ed070
1 parent ff74d5c
commit 95ed070
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -1776,6 +1776,18 @@
           "port": "eth0",
           "snmp_name": "Ethernet6/48",
           "uid": "grimani-3"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 40000000000,
+          "snmp_name": "Ethernet6/52",
+          "uid": "sgros2"
         }
       ],
       "rate": 10000000000,
@@ -1936,18 +1948,12 @@
         {
         },
         {
-          "kind": "switch",
-          "snmp_name": "Ethernet7/36",
-          "uid": "sgros2"
         },
         {
         },
         {
         },
         {
-          "kind": "switch",
-          "snmp_name": "Ethernet7/39",
-          "uid": "sgros1"
         },
         {
         },
@@ -1990,6 +1996,18 @@
           "port": "eth2",
           "snmp_name": "Ethernet7/48",
           "uid": "graffiti-4"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 40000000000,
+          "snmp_name": "Ethernet7/52",
+          "uid": "sgros1"
         }
       ],
       "rate": 10000000000,

diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -702,6 +702,11 @@ gw:
           uid: grimani-2
         48:
           uid: grimani-3
+        52:
+          uid: sgros2
+          kind: switch
+          rate: 40_000_000_000
+
     7:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -748,12 +753,6 @@ gw:
           uid: grue-4
         19:
           uid: grue-5
-        36:
-          uid: sgros2
-          kind: switch
-        39:
-          uid: sgros1
-          kind: switch
         41:
           uid: graffiti-13-eth2
         43:
@@ -766,3 +765,7 @@ gw:
           uid: graffiti-9-eth2
         48:
           uid: graffiti-4-eth2
+        52:
+          uid: sgros1
+          kind: switch
+          rate: 40_000_000_000