Merge branch 'sophia_update_switch' into 'master'

[sophia][network] add sw-5 and update config for gw-sophia sw-{2,3,6}...

See merge request !1103

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

@@ -231,6 +231,10 @@
           "uid": "LABO"
         },
         {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/44",
+          "uid": "sw-5"
         },
         {
           "kind": "switch",

data/grid5000/sites/sophia/network_equipments/sw-2.json

@@ -135,9 +135,6 @@
         {
         },
         {
-          "kind": "switch",
-          "snmp_name": "1/1/40",
-          "uid": "swadmin-2"
         },
         {
         },
@@ -150,9 +147,6 @@
         {
         },
         {
-          "kind": "switch",
-          "snmp_name": "1/1/46",
-          "uid": "swadmin-3"
         },
         {
         },
@@ -168,7 +162,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/50",
-          "uid": "swadmin-5"
+          "uid": "swadmin-2"
         }
       ],
       "rate": 1000000000,

data/grid5000/sites/sophia/network_equipments/sw-3.json

@@ -247,6 +247,12 @@
           "rate": 10000000000,
           "snmp_name": "1/1/51",
           "uid": "gw"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/52",
+          "uid": "swadmin-3"
         }
       ],
       "rate": 1000000000,

data/grid5000/sites/sophia/network_equipments/sw-5.json

+{
+  "ip": "172.17.143.242",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "router",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "gw"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/26",
+          "uid": "swadmin-5"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-5",
+  "warranty": "2029-11"
+}
\ No newline at end of file

data/grid5000/sites/sophia/network_equipments/swadmin-2.json

@@ -86,9 +86,12 @@
         },
         {
         },
+        {
+        },
         {
           "kind": "switch",
-          "snmp_name": "1/1/24",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
           "uid": "sw-2"
         }
       ],

data/grid5000/sites/sophia/network_equipments/swadmin-3.json

@@ -120,11 +120,12 @@
         {
         },
         {
-          "kind": "switch",
-          "snmp_name": "1/1/24",
-          "uid": "sw-2"
         },
         {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "sw-3"
         },
         {
           "kind": "switch",

data/grid5000/sites/sophia/network_equipments/swadmin-5.json

@@ -62,7 +62,7 @@
           "kind": "switch",
           "rate": 10000000000,
           "snmp_name": "1/1/25",
-          "uid": "sw-2"
+          "uid": "sw-5"
         }
       ],
       "rate": 1000000000,

input/grid5000/sites/sophia/networks/gw-sophia.yaml

@@ -145,6 +145,10 @@ gw:
           uid: LABO
           kind: other
           rate: 10000000000
+        44:
+          uid: sw-5
+          kind: switch
+          rate: 10000000000
         45:
           uid: sw-3
           kind: switch

input/grid5000/sites/sophia/networks/sw-2.yaml

@@ -55,17 +55,11 @@ sw-2:
           port: eth1
         36:
           uid: esterel41-1
-        40:
-          uid: swadmin-2
-          kind: switch
-        46:
-          uid: swadmin-3
-          kind: switch
         49:
           uid: gw
           kind: router
           rate: 10000000000
         50:
-          uid: swadmin-5
+          uid: swadmin-2
           kind: switch
           rate: 10000000000

input/grid5000/sites/sophia/networks/sw-3.yaml

@@ -84,4 +84,7 @@ sw-3:
           uid: gw
           kind: router
           rate: 10000000000
-
+        52:
+          uid: swadmin-3
+          kind: switch
+          rate: 10000000000

input/grid5000/sites/sophia/networks/sw-5.yaml

+---
+sw-5:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.242
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        25:
+          uid: gw
+          kind: router
+          rate: 10000000000
+        26:
+          uid: swadmin-5
+          kind: switch
+          rate: 10000000000
+

input/grid5000/sites/sophia/networks/sw-6.yaml

@@ -38,4 +38,3 @@ sw-6:
           uid: swadmin-6
           kind: switch
           rate: 10000000000
-

input/grid5000/sites/sophia/networks/swadmin-2.yaml

@@ -44,6 +44,7 @@ swadmin-2:
         10:
           uid: esterel41-1-bmc
           kind: other
-        24:
+        25:
           uid: sw-2
           kind: switch
+          rate: 10000000000

input/grid5000/sites/sophia/networks/swadmin-3.yaml

@@ -77,10 +77,11 @@ swadmin-3:
         22:
            uid: uvb-9-bmc
            kind: other
-        24:
-           uid: sw-2
+        25:
+           uid: sw-3
            kind: switch
+           rate: 10000000000
         26:
-          uid: swadmin-4
-          kind: switch
-          rate: 10000000000
+           uid: swadmin-4
+           kind: switch
+           rate: 10000000000

input/grid5000/sites/sophia/networks/swadmin-5.yaml

@@ -15,6 +15,6 @@ swadmin-5:
       kind: node
       ports:
         25:
-          uid: sw-2
+          uid: sw-5
           kind: switch
           rate: 10000000000