Merge branch 'bug_16767' into 'master'

[grenoble] network - Remove dighyp1, dighyp2, dignfs

See merge request !1231

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

@@ -5,12 +5,6 @@
   ],
   "backplane_bps": 6400000000000,
   "channels": {
-    "port-channel10": {
-      "kind": "server",
-      "port": "port-channel10",
-      "rate": 50000000000,
-      "uid": "dignfs"
-    },
     "port-channel100": {
       "kind": "other",
       "port": "port-channel100",
@@ -467,16 +461,8 @@
           "uid": "servan-2"
         },
         {
-          "kind": "channel",
-          "rate": 25000000000,
-          "snmp_name": "ethernet1/1/83",
-          "uid": "port-channel10"
         },
         {
-          "kind": "channel",
-          "rate": 25000000000,
-          "snmp_name": "ethernet1/1/84",
-          "uid": "port-channel10"
         },
         {
           "kind": "channel",
@@ -489,15 +475,8 @@
           "uid": "port-channel20"
         },
         {
-          "kind": "server",
-          "snmp_name": "ethernet1/1/87:1",
-          "uid": "dighyp1"
         },
         {
-          "kind": "server",
-          "snmp_name": "ethernet1/1/88:1",
-          "trunk": true,
-          "uid": "dighyp2"
         },
         {
           "kind": "server",

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

@@ -224,29 +224,12 @@ gw:
           snmp_pattern: "ethernet1/1/%PORT%"
           kavlan_pattern: "ethernet1/1/%PORT%"
           rate: 25000000000
-        83:
-          uid: port-channel10
-          kind: channel
-          snmp_pattern: "ethernet1/1/%PORT%"
-          rate: 25000000000
-        84:
-          uid: port-channel10
-          kind: channel
-          snmp_pattern: "ethernet1/1/%PORT%"
-          rate: 25000000000
         85:
           uid: port-channel20
           kind: channel
         86:
           uid: port-channel20
           kind: channel
-        87:
-          uid: dighyp1
-          kind: server
-        88:
-          uid: dighyp2
-          kind: server
-          trunk: true
         89:
           uid: digwatt
           kind: server
@@ -289,11 +272,6 @@ gw:
           kavlan_pattern: "ethernet1/1/%PORT%"
           rate: 100000000000
   channels:
-    port-channel10:
-      uid: dignfs
-      port: port-channel10
-      kind: server
-      rate: 50000000000
     port-channel20:
       uid: digsed
       port: port-channel20