Merge branch 'merc6net' into 'master'

[mercantour6] define network

See merge request !1063

data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json

@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/17",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {

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

@@ -99,6 +99,10 @@
           "uid": "mercantour2-4"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/17",
+          "uid": "mercantour6-1"
         },
         {
         },

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

@@ -42,6 +42,8 @@ sw-3:
           uid: mercantour2-3
         16:
           uid: mercantour2-4
+        17:
+          uid: mercantour6-1
         33:
           uid: mercantour2-2
         34: