Merge branch 'gw_toulouse' into 'master'

sw-estats description for supervision

See merge request !548

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

@@ -11,7 +11,7 @@
     },
     "lag2": {
       "kind": "switch",
-      "port": "port-channel1",
+      "port": "lacp-key-1",
       "rate": 20000000000,
       "uid": "sw-estats"
     }

data/grid5000/sites/toulouse/network_equipments/sw-estats.json

@@ -3,7 +3,7 @@
     "sw-uagx"
   ],
   "channels": {
-    "port-channel1": {
+    "lacp key 1": {
       "kind": "router",
       "port": "lag2",
       "rate": 20000000000,
@@ -135,13 +135,15 @@
         },
         {
           "kind": "channel",
-          "snmp_name": "GigabitEthernet 1/33",
-          "uid": "port-channel1"
+          "rate": 10000000000,
+          "snmp_name": "10GigabitEthernet 1/1",
+          "uid": "lacp key 1"
         },
         {
           "kind": "channel",
-          "snmp_name": "GigabitEthernet 1/34",
-          "uid": "port-channel1"
+          "rate": 10000000000,
+          "snmp_name": "10GigabitEthernet 1/2",
+          "uid": "lacp key 1"
         }
       ],
       "rate": 1000000000,

input/grid5000/sites/toulouse/networks/gw.yaml

@@ -108,4 +108,4 @@ gw:
       uid: sw-estats
       kind: switch
       rate: 20000000000
-      port: port-channel1
+      port: lacp-key-1

input/grid5000/sites/toulouse/networks/sw-estats.yaml

@@ -29,13 +29,17 @@ sw-estats:
         19: estats-11
         20: estats-12
         33:
-          uid: port-channel1
+          uid: lacp key 1
           kind: channel
+          rate: 10000000000
+          snmp_pattern: "10GigabitEthernet 1/1"
         34:
-          uid: port-channel1
+          uid: lacp key 1
           kind: channel
+          rate: 10000000000
+          snmp_pattern: "10GigabitEthernet 1/2"
   channels:
-    port-channel1:
+    lacp key 1:
       uid: gw
       kind: router
       rate: 20000000000