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

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

Hide file tree

Showing 4 changed files with 49 additions and 59 deletions.
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -6,6 +6,18 @@
     {
     },
     {
+      "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
+      "ports": [
+        {
+        },
+        {
+          "kind": "router",
+          "snmp_name": "ethernet1/1/1:1",
+          "uid": "gw"
+        }
+      ],
+      "rate": 40000000000,
+      "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
     },
     {
     },
@@ -1122,22 +1134,6 @@
       ],
       "rate": 25000000000,
       "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
-    },
-    {
-    },
-    {
-      "kavlan_pattern": "ethernet1/1/%LINECARD%",
-      "ports": [
-        {
-        },
-        {
-          "kind": "router",
-          "snmp_name": "ethernet1/1/65",
-          "uid": "gw"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "ethernet1/1/%LINECARD%"
     }
   ],
   "model": "Dell Z9264F-ON",

diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -6,6 +6,18 @@
     {
     },
     {
+      "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
+      "ports": [
+        {
+        },
+        {
+          "kind": "router",
+          "snmp_name": "ethernet1/1/1:1",
+          "uid": "gw"
+        }
+      ],
+      "rate": 40000000000,
+      "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
     },
     {
     },
@@ -1122,24 +1134,6 @@
       ],
       "rate": 25000000000,
       "snmp_pattern": "ethernet1/1/%LINECARD%:%PORT%"
-    },
-    {
-    },
-    {
-    },
-    {
-      "kavlan_pattern": "ethernet1/1/%LINECARD%",
-      "ports": [
-        {
-        },
-        {
-          "kind": "router",
-          "snmp_name": "ethernet1/1/66",
-          "uid": "gw"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "ethernet1/1/%LINECARD%"
     }
   ],
   "model": "Dell Z9264F-ON",

diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -9,16 +9,24 @@ sgros1:
   ip: 172.17.79.208
   backplane_bps: 6400000000000
   linecards:
+    1:
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      rate: 40_000_000_000
+      ports:
+        1:
+          uid: gw
+          kind: router
     3:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-117
-         2: gros-118
-         3: gros-119
-         4: gros-120
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-117
+        2: gros-118
+        3: gros-119
+        4: gros-120
     5:
        snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
@@ -319,11 +327,3 @@ sgros1:
          2: gros-2
          3: gros-3
          4: gros-4
-    65:
-       snmp_pattern: "ethernet1/1/%LINECARD%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%"
-       rate: 10000000000
-       ports:
-         1:
-           uid: gw
-           kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -9,6 +9,14 @@ sgros2:
   ip: 172.17.79.209
   backplane_bps: 6400000000000
   linecards:
+    1:
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      rate: 40_000_000_000
+      ports:
+        1:
+          uid: gw
+          kind: router
     3:
        snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
@@ -319,11 +327,3 @@ sgros2:
          2: gros-2-eth1
          3: gros-3-eth1
          4: gros-4-eth1
-    66:
-       snmp_pattern: "ethernet1/1/%LINECARD%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%"
-       rate: 10000000000
-       ports:
-         1:
-           uid: gw
-           kind: router