[grenoble] nodes on wrong port on sw-edel-1

bac9244a · DELABROYE Dimitri · d4fee2d7 · bac9244a · bac9244a · bac9244a
Commit bac9244a authored Sep 27, 2017 by DELABROYE Dimitri
7 changed files
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -65,7 +65,7 @@
      "network_address": "edel-15.grenoble.grid5000.fr",
      "rate": 1000000000,
      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
+      "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
      "vendor": "Intel",
      "version": "82576 Gigabit Network Connection"
    },

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -65,7 +65,7 @@
      "network_address": "edel-16.grenoble.grid5000.fr",
      "rate": 1000000000,
      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
+      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
      "vendor": "Intel",
      "version": "82576 Gigabit Network Connection"
    },

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -65,7 +65,7 @@
      "network_address": "edel-17.grenoble.grid5000.fr",
      "rate": 1000000000,
      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
+      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
      "vendor": "Intel",
      "version": "82576 Gigabit Network Connection"
    },

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -62,7 +62,7 @@
      "network_address": "edel-18.grenoble.grid5000.fr",
      "rate": 1000000000,
      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
+      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
      "vendor": "Intel",
      "version": "82576 Gigabit Network Connection"
    },

--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
@@ -64,16 +64,16 @@
          "uid": "edel-14"
        },
        {
-          "uid": "edel-15"
+          "uid": "edel-18"
        },
        {
-          "uid": "edel-16"
+          "uid": "edel-17"
        },
        {
-          "uid": "edel-17"
+          "uid": "edel-16"
        },
        {
-          "uid": "edel-18"
+          "uid": "edel-15"
        },
        {
        },

--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -1524,7 +1524,7 @@
                  "network_address": "edel-15.grenoble.grid5000.fr",
                  "rate": 1000000000,
                  "switch": "sw-edel-1",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
+                  "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
                  "vendor": "Intel",
                  "version": "82576 Gigabit Network Connection"
                },
@@ -1730,7 +1730,7 @@
                  "network_address": "edel-16.grenoble.grid5000.fr",
                  "rate": 1000000000,
                  "switch": "sw-edel-1",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
+                  "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
                  "vendor": "Intel",
                  "version": "82576 Gigabit Network Connection"
                },
@@ -1934,7 +1934,7 @@
                  "network_address": "edel-17.grenoble.grid5000.fr",
                  "rate": 1000000000,
                  "switch": "sw-edel-1",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
+                  "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
                  "vendor": "Intel",
                  "version": "82576 Gigabit Network Connection"
                },
@@ -2137,7 +2137,7 @@
                  "network_address": "edel-18.grenoble.grid5000.fr",
                  "rate": 1000000000,
                  "switch": "sw-edel-1",
-                  "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
+                  "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
                  "vendor": "Intel",
                  "version": "82576 Gigabit Network Connection"
                },
@@ -21985,10 +21985,10 @@
                "16": "edel-12",
                "17": "edel-13",
                "18": "edel-14",
-                "19": "edel-15",
-                "20": "edel-16",
-                "21": "edel-17",
-                "22": "edel-18",
+                "19": "edel-18",
+                "20": "edel-17",
+                "21": "edel-16",
+                "22": "edel-15",
                "25": {
                  "kind": "router",
                  "port": "2:4",
--- a/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
+++ b/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
--- 
+---
 sw-edel-1:
  model: Broadcom
  kind: switch
@@ -9,7 +9,7 @@ sw-edel-1:
      available: true
      resolution: 1
  mtu: 9216
-  weathermap: 
+  weathermap:
    use_cacti: "no"
  vlans: {}
  backplane_bps: 2880000000000
@@ -25,9 +25,9 @@ sw-edel-1:
      port: eth0
      rate: 1000000000
      ports:
-        4: 
+        4:
          uid: edel-cmc-1
-          kind: other 
+          kind: other
        5: edel-1
        6: edel-2
        7: edel-3
@@ -42,11 +42,11 @@ sw-edel-1:
        16: edel-12
        17: edel-13
        18: edel-14
-        19: edel-15
-        20: edel-16
-        21: edel-17
-        22: edel-18
-        25: 
+        19: edel-18
+        20: edel-17
+        21: edel-16
+        22: edel-15
+        25:
          uid: gw-grenoble
          port: "2:4"
          kind: router