Merge branch 'servan-eth1-eth2-10G' into 'master'

[grenoble][servan] Fix servan eth1/eth2 ports (10G cables) See merge request !1340

Merge branch 'servan-eth1-eth2-10G' into 'master'
704e29f9 · Pierre Neyron · 4eab5930 · 8eaf5dea · 704e29f9 · 704e29f9
Commit 704e29f9 authored 1 month ago by Pierre Neyron
--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
@@ -329,7 +329,7 @@
      "sriov": false,
      "sriov_totalvfs": 0,
      "switch": "gw",
-      "switch_port": "ethernet1/1/69",
+      "switch_port": "ethernet1/1/69:1",
      "vendor": "Intel"
    },
    {
@@ -352,7 +352,7 @@
      "sriov": false,
      "sriov_totalvfs": 0,
      "switch": "gw",
-      "switch_port": "ethernet1/1/70",
+      "switch_port": "ethernet1/1/70:1",
      "vendor": "Intel"
    },
    {

--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
@@ -329,7 +329,7 @@
      "sriov": false,
      "sriov_totalvfs": 0,
      "switch": "gw",
-      "switch_port": "ethernet1/1/71",
+      "switch_port": "ethernet1/1/71:1",
      "vendor": "Intel"
    },
    {
@@ -352,7 +352,7 @@
      "sriov": false,
      "sriov_totalvfs": 0,
      "switch": "gw",
-      "switch_port": "ethernet1/1/72",
+      "switch_port": "ethernet1/1/72:1",
      "vendor": "Intel"
    },
    {

--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -415,35 +415,27 @@
          "uid": "port-channel50"
        },
        {
-          "kavlan_pattern": "ethernet1/1/%PORT%",
          "kind": "node",
          "port": "eth1",
-          "rate": 10000000000,
+          "snmp_name": "ethernet1/1/69:1",
-          "snmp_name": "ethernet1/1/69",
          "uid": "servan-1"
        },
        {
-          "kavlan_pattern": "ethernet1/1/%PORT%",
          "kind": "node",
          "port": "eth2",
-          "rate": 10000000000,
+          "snmp_name": "ethernet1/1/70:1",
-          "snmp_name": "ethernet1/1/70",
          "uid": "servan-1"
        },
        {
-          "kavlan_pattern": "ethernet1/1/%PORT%",
          "kind": "node",
          "port": "eth1",
-          "rate": 10000000000,
+          "snmp_name": "ethernet1/1/71:1",
-          "snmp_name": "ethernet1/1/71",
          "uid": "servan-2"
        },
        {
-          "kavlan_pattern": "ethernet1/1/%PORT%",
          "kind": "node",
          "port": "eth2",
-          "rate": 10000000000,
+          "snmp_name": "ethernet1/1/72:1",
-          "snmp_name": "ethernet1/1/72",
          "uid": "servan-2"
        },
        {

--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -208,26 +208,10 @@ gw:
          kind: channel
          rate: 25_000_000_000
          snmp_pattern: "ethernet1/1/%PORT%"
-        69:
+        69: servan-1-eth1  # 10G DAC cable
-          uid: servan-1-eth1
+        70: servan-1-eth2  # 10G DAC cable
-          snmp_pattern: "ethernet1/1/%PORT%"
+        71: servan-2-eth1  # 10G DAC cable
-          kavlan_pattern: "ethernet1/1/%PORT%"
+        72: servan-2-eth2  # 10G DAC cable
-          rate: 10000000000
-        70:
-          uid: servan-1-eth2
-          snmp_pattern: "ethernet1/1/%PORT%"
-          kavlan_pattern: "ethernet1/1/%PORT%"
-          rate: 10000000000
-        71:
-          uid: servan-2-eth1
-          snmp_pattern: "ethernet1/1/%PORT%"
-          kavlan_pattern: "ethernet1/1/%PORT%"
-          rate: 10000000000
-        72:
-          uid: servan-2-eth2
-          snmp_pattern: "ethernet1/1/%PORT%"
-          kavlan_pattern: "ethernet1/1/%PORT%"
-          rate: 10000000000
        75:
          uid: port-channel30
          kind: channel