Merge branch 'gruss' into 'master'

[nancy/gruss] Add information on link sgruss <-> gw

See merge request !291

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

@@ -22,6 +22,12 @@
       "port": "port-channel1",
       "rate": 800000000000,
       "uid": "sgrappe"
+    },
+    "port-channel5": {
+      "kind": "switch",
+      "port": "port-channel1",
+      "rate": 800000000000,
+      "uid": "sgruss"
     }
   },
   "ip": "172.16.79.254",
@@ -592,6 +598,16 @@
           "port": "eth0",
           "snmp_name": "Ethernet2/48",
           "uid": "grimoire-8"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "Ethernet2/49",
+          "uid": "port-channel5"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "Ethernet2/50",
+          "uid": "port-channel5"
         }
       ],
       "rate": 10000000000,

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

@@ -320,6 +320,12 @@ gw:
           uid: grimoire-7
         48:
           uid: grimoire-8
+        49:
+          uid: port-channel5
+          kind: channel
+        50:
+          uid: port-channel5
+          kind: channel
     3:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -838,4 +844,8 @@ gw:
       uid: sgrappe
       kind: switch
       rate: 800000000000
-
+    port-channel5:
+      port: port-channel1
+      uid: sgruss
+      kind: switch
+      rate: 800000000000