Merge branch 'servan' into 'master'

[grenoble/servan] Edit kwollect information about network

See merge request !351

data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw",
-      "switch_port": "ethernet1/1/81:1",
+      "switch_port": "ethernet1/1/81",
       "vendor": "Intel"
     },
     {

data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json

@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw",
-      "switch_port": "ethernet1/1/82:1",
+      "switch_port": "ethernet1/1/82",
       "vendor": "Intel"
     },
     {

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

@@ -414,14 +414,14 @@
           "kind": "node",
           "port": "eth0",
           "rate": 25000000000,
-          "snmp_name": "ethernet1/1/81:1",
+          "snmp_name": "ethernet1/1/81",
           "uid": "servan-1"
         },
         {
           "kind": "node",
           "port": "eth0",
           "rate": 25000000000,
-          "snmp_name": "ethernet1/1/82:1",
+          "snmp_name": "ethernet1/1/82",
           "uid": "servan-2"
         },
         {

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

@@ -189,9 +189,11 @@ gw:
           rate: 25000000000
         81:
           uid: servan-1
+          snmp_pattern: "ethernet1/1/%PORT%"
           rate: 25000000000
         82:
           uid: servan-2
+          snmp_pattern: "ethernet1/1/%PORT%"
           rate: 25000000000
         83:
           uid: port-channel10