diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 966a6e4b27907ff720d83a09f5e1b23d37e69c63..4662002d3a181d8d60c96cfa49660380f9e10153 100644
--- 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"
},
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index 1872291da712873dba4b87c763f8030a3410a2d3..b1917b99e31d0783c1445954166760ccc7dd1dab 100644
--- 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"
},
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index e2c9cd320dccbc96703765ba19ffaea6a1bf68ab..f8e24c5e1c027d22d497dc28e73fd36d0fe13ad5 100644
--- 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"
},
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index 709da749221899b58ed9fd66bfed9d7562ff2c22..b86127c4046084e87b4c5b50a16238225b618ec1 100644
--- 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"
},
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
index 73b46c1e926c8671f7c9f65ae527133834704dc2..2ca354a45ba2669231f0f7db708c8e21ef09ba0c 100644
--- 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"
},
{
},
diff --git a/grid5000-all.json b/grid5000-all.json
index 5e945e591f8d4acf31b3b5e2fb02b04af731648a..49550f6dda606d4a44f345150754c7d6f7e1c58b 100644
--- 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",
diff --git a/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
index f3941f721b602d405d870f37fe47b1ff4af6245f..9ece476c373a66a4dc1e0398a9d9d9c0bc967bea 100644
--- a/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
+++ b/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
@@ -1,4 +1,4 @@
----
+---
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