Merge branch 'monitoring_nantes' into 'master'

[nantes] Update network ports

See merge request !1019

data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json

@@ -137,7 +137,7 @@
       "sriov": true,
       "sriov_totalvfs": 63,
       "switch": "gw",
-      "switch_port": "TenGigabitEthernet 0/17",
+      "switch_port": "TenGigabitEthernet 0/40",
       "vendor": "Intel"
     },
     {

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

@@ -15,6 +15,12 @@
       "port": "Port-channel 1",
       "rate": 80000000000,
       "uid": "ecotype-prod2"
+    },
+    "Port-channel 3": {
+      "kind": "server",
+      "port": "Port-channel 3",
+      "rate": 20000000000,
+      "uid": "srv-data2"
     }
   },
   "ip": "172.16.207.254",
@@ -37,8 +43,14 @@
         {
         },
         {
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/4",
+          "uid": "Port-channel 3"
         },
         {
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/5",
+          "uid": "Port-channel 3"
         },
         {
         },
@@ -53,6 +65,7 @@
         {
           "kind": "server",
           "snmp_name": "TenGigabitEthernet 0/9",
+          "trunk": true,
           "uid": "srv-3"
         },
         {
@@ -90,10 +103,6 @@
           "uid": "econome-8"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "TenGigabitEthernet 0/17",
-          "uid": "econome-7"
         },
         {
           "kind": "node",
@@ -190,6 +199,10 @@
           "uid": "econome-13"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/40",
+          "uid": "econome-7"
         },
         {
           "kind": "node",

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

@@ -130,8 +130,8 @@ gw:
         14: econome-4
         43: econome-5
         42: econome-6
+        40: econome-7
         16: econome-8
-        17: econome-7
         41: econome-9
         10: econome-10
         19: econome-11
@@ -146,6 +146,12 @@ gw:
         28: econome-20
         31: econome-21
         32: econome-22
+        4:
+          uid: Port-channel 3
+          kind: channel
+        5:
+          uid: Port-channel 3
+          kind: channel
         8:
           uid: srv-4
           kind: server
@@ -153,6 +159,7 @@ gw:
         9:
           uid: srv-3
           kind: server
+          trunk: true
         26:
           uid: pve-99
           kind: server
@@ -190,3 +197,8 @@ gw:
       rate: 80000000000
       uid: ecotype-prod2
       port: Port-channel 1
+    Port-channel 3:
+      kind: server
+      rate: 20000000000
+      uid: srv-data2
+      port: Port-channel 3