From 0b625b83fcdfefcfd2f8850cea0a875143388edc Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Wed, 18 Jun 2014 09:18:50 +0200
Subject: [PATCH] [reims] Using network lookup functions (Florentin work)
---
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json | 2 +-
.../grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json | 2 +-
data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json | 2 +-
generators/input/sites/reims/clusters/stremi.rb | 4 ++--
45 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
index bae2eae4fd2..32a709d2432 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
@@ -40,7 +40,7 @@
"network_address": "stremi-1.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/1"
+ "switch_port": "GigabitEthernet0/1"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
index 2f1c945de5e..935bfcd3678 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
@@ -40,7 +40,7 @@
"network_address": "stremi-10.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/10"
+ "switch_port": "GigabitEthernet0/10"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
index 8e0b70769c8..4459fe582fa 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
@@ -40,7 +40,7 @@
"network_address": "stremi-11.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/11"
+ "switch_port": "GigabitEthernet0/11"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
index 6e07b91e508..1e043d09852 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
@@ -40,7 +40,7 @@
"network_address": "stremi-12.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/12"
+ "switch_port": "GigabitEthernet0/12"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
index 114182a507d..7121d736bc5 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
@@ -40,7 +40,7 @@
"network_address": "stremi-13.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/13"
+ "switch_port": "GigabitEthernet0/13"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
index 303da24ecd5..47ad3a09cb0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
@@ -40,7 +40,7 @@
"network_address": "stremi-14.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/14"
+ "switch_port": "GigabitEthernet0/14"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
index 60c1492d51f..38138ccec54 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
@@ -40,7 +40,7 @@
"network_address": "stremi-15.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/15"
+ "switch_port": "GigabitEthernet0/15"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
index 915f8cb655d..cb11d1a705a 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
@@ -40,7 +40,7 @@
"network_address": "stremi-16.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/16"
+ "switch_port": "GigabitEthernet0/16"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
index 538bc1c514b..cce80846105 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
@@ -40,7 +40,7 @@
"network_address": "stremi-17.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/17"
+ "switch_port": "GigabitEthernet0/17"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
index 36d34179cc6..be5fa0f7e9e 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
@@ -40,7 +40,7 @@
"network_address": "stremi-18.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/18"
+ "switch_port": "GigabitEthernet0/18"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
index 195e30c6adb..dabcf57e110 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
@@ -40,7 +40,7 @@
"network_address": "stremi-19.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/19"
+ "switch_port": "GigabitEthernet0/19"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
index 8c1fae3d54f..283b08de33b 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
@@ -40,7 +40,7 @@
"network_address": "stremi-2.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/2"
+ "switch_port": "GigabitEthernet0/2"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
index 909a0470398..6d4f18a8f21 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
@@ -40,7 +40,7 @@
"network_address": "stremi-20.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/20"
+ "switch_port": "GigabitEthernet0/20"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
index 57db9283b94..37455733edf 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
@@ -40,7 +40,7 @@
"network_address": "stremi-21.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/21"
+ "switch_port": "GigabitEthernet0/21"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
index c842788e7c2..8e2df120ef8 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
@@ -40,7 +40,7 @@
"network_address": "stremi-22.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/22"
+ "switch_port": "GigabitEthernet0/22"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
index 810d1bc999a..bf70b7416c7 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
@@ -40,7 +40,7 @@
"network_address": "stremi-23.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/23"
+ "switch_port": "GigabitEthernet0/23"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
index 9fb41b749c2..45c1b585b0e 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
@@ -40,7 +40,7 @@
"network_address": "stremi-24.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/24"
+ "switch_port": "GigabitEthernet0/24"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
index 1e9c129904d..14fdb894df6 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
@@ -40,7 +40,7 @@
"network_address": "stremi-25.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/25"
+ "switch_port": "GigabitEthernet0/25"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
index 7bec773336f..2625e927db0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
@@ -40,7 +40,7 @@
"network_address": "stremi-26.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/26"
+ "switch_port": "GigabitEthernet0/26"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
index 84b5f8799ae..817636ca4c0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
@@ -40,7 +40,7 @@
"network_address": "stremi-27.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/27"
+ "switch_port": "GigabitEthernet0/27"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
index cba3166d575..448805eb731 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
@@ -40,7 +40,7 @@
"network_address": "stremi-28.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/28"
+ "switch_port": "GigabitEthernet0/28"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
index 6e4ea5718b1..6f54defaa4f 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
@@ -40,7 +40,7 @@
"network_address": "stremi-29.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/29"
+ "switch_port": "GigabitEthernet0/29"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
index 9d0a6229bde..8f574219b79 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
@@ -40,7 +40,7 @@
"network_address": "stremi-3.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/3"
+ "switch_port": "GigabitEthernet0/3"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
index e59ee7f640c..61c2c73f655 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
@@ -40,7 +40,7 @@
"network_address": "stremi-30.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/30"
+ "switch_port": "GigabitEthernet0/30"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
index 6ac769c95c4..aff341ab38f 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
@@ -40,7 +40,7 @@
"network_address": "stremi-31.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/31"
+ "switch_port": "GigabitEthernet0/31"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
index 27733b92123..a1dcbd4c2ab 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
@@ -40,7 +40,7 @@
"network_address": "stremi-32.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/32"
+ "switch_port": "GigabitEthernet0/32"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
index 0f5dfd79903..ebe4644b153 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
@@ -40,7 +40,7 @@
"network_address": "stremi-33.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/34"
+ "switch_port": "GigabitEthernet0/34"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
index b3efd9a5125..7754dbe2769 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
@@ -40,7 +40,7 @@
"network_address": "stremi-34.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/33"
+ "switch_port": "GigabitEthernet0/33"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
index 6c8ec481568..35745af3351 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
@@ -40,7 +40,7 @@
"network_address": "stremi-35.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/35"
+ "switch_port": "GigabitEthernet0/35"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
index b07e2a9a67e..72f6166d214 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
@@ -40,7 +40,7 @@
"network_address": "stremi-36.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/36"
+ "switch_port": "GigabitEthernet0/36"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
index 3a96c9813c0..f89262b33b6 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
@@ -40,7 +40,7 @@
"network_address": "stremi-37.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/37"
+ "switch_port": "GigabitEthernet0/37"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
index ab5af4a5738..c3e52c4e57a 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
@@ -40,7 +40,7 @@
"network_address": "stremi-38.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/38"
+ "switch_port": "GigabitEthernet0/38"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
index e3debb4ddb5..eae2ec3a420 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
@@ -40,7 +40,7 @@
"network_address": "stremi-39.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/39"
+ "switch_port": "GigabitEthernet0/39"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
index 359bbfcc1a7..bc03eafb71c 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
@@ -40,7 +40,7 @@
"network_address": "stremi-4.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/4"
+ "switch_port": "GigabitEthernet0/4"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
index e61c4b5548f..6257f55ed3c 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
@@ -40,7 +40,7 @@
"network_address": "stremi-40.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/40"
+ "switch_port": "GigabitEthernet0/40"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
index a4acf435e92..a289287b990 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
@@ -40,7 +40,7 @@
"network_address": "stremi-41.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/41"
+ "switch_port": "GigabitEthernet0/41"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
index 895325f144a..878f7c57e61 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
@@ -40,7 +40,7 @@
"network_address": "stremi-42.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/42"
+ "switch_port": "GigabitEthernet0/42"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
index bc1d2197254..8039e2bc609 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
@@ -40,7 +40,7 @@
"network_address": "stremi-43.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/43"
+ "switch_port": "GigabitEthernet0/43"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
index f03b5a981c3..7a7c39301b8 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
@@ -40,7 +40,7 @@
"network_address": "stremi-44.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/44"
+ "switch_port": "GigabitEthernet0/44"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
index 80900bd5ac7..96b036d38d0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
@@ -40,7 +40,7 @@
"network_address": "stremi-5.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/5"
+ "switch_port": "GigabitEthernet0/5"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
index 69a8058aa45..2bcec800381 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
@@ -40,7 +40,7 @@
"network_address": "stremi-6.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/6"
+ "switch_port": "GigabitEthernet0/6"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
index ad3bf176813..28c2aae4fa5 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
@@ -40,7 +40,7 @@
"network_address": "stremi-7.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/7"
+ "switch_port": "GigabitEthernet0/7"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
index 08a18993e9f..f571f412ce4 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
@@ -40,7 +40,7 @@
"network_address": "stremi-8.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/8"
+ "switch_port": "GigabitEthernet0/8"
},
{
"bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
index 4c8fdcc68d0..00f3b7a58c9 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
@@ -40,7 +40,7 @@
"network_address": "stremi-9.reims.grid5000.fr",
"rate": 1000000000,
"switch": "gw-reims",
- "switch_port": "Gi0/9"
+ "switch_port": "GigabitEthernet0/9"
},
{
"bridged": false,
diff --git a/generators/input/sites/reims/clusters/stremi.rb b/generators/input/sites/reims/clusters/stremi.rb
index d8928a00c46..1ef9f9329be 100644
--- a/generators/input/sites/reims/clusters/stremi.rb
+++ b/generators/input/sites/reims/clusters/stremi.rb
@@ -75,8 +75,8 @@ site :reims do |site_uid|
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
:ip6 => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
- :switch => lookup('stremi_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
- :switch_port => lookup('stremi_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+ :switch => net_switch_lookup('reims', 'stremi', node_uid),
+ :switch_port => net_port_lookup('reims', 'stremi', node_uid),
:mac => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
},
{
--
GitLab