From 7a58ba318e1758041e7a8d2562c3dc565c3533ef Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Thu, 24 Jan 2013 16:30:03 +0100
Subject: [PATCH] [Lille] port change, Line card issue
---
.../clusters/chinqchint/nodes/chinqchint-1.json | 2 +-
.../clusters/chinqchint/nodes/chinqchint-13.json | 2 +-
.../clusters/chinqchint/nodes/chinqchint-14.json | 2 +-
.../clusters/chinqchint/nodes/chinqchint-34.json | 2 +-
.../clusters/chinqchint/nodes/chinqchint-35.json | 2 +-
.../clusters/chinqchint/nodes/chinqchint-36.json | 2 +-
.../clusters/chirloute/nodes/chirloute-1.json | 4 ++--
.../clusters/chirloute/nodes/chirloute-2.json | 4 ++--
.../clusters/chirloute/nodes/chirloute-3.json | 4 ++--
.../clusters/chirloute/nodes/chirloute-4.json | 4 ++--
.../clusters/chirloute/nodes/chirloute-5.json | 4 ++--
.../clusters/chirloute/nodes/chirloute-6.json | 4 ++--
.../clusters/chirloute/nodes/chirloute-7.json | 4 ++--
.../clusters/chirloute/nodes/chirloute-8.json | 4 ++--
.../input/sites/lille/clusters/chinqchint.yaml | 12 ++++++------
.../input/sites/lille/clusters/chirloute.rb | 2 +-
.../input/sites/lille/clusters/chirloute.yaml | 16 ++++++++--------
17 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
index b0712dbdf72..ba7c48e0f40 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -45,7 +45,7 @@
"network_address": "chinqchint-1.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw",
- "switch_port": "Gi2/1",
+ "switch_port": "Gi4/48",
"vendor": "Intel",
"version": "80003ES2LAN"
},
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
index 5aca5e9b928..e186a54ae81 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -45,7 +45,7 @@
"network_address": "chinqchint-13.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw",
- "switch_port": "Gi2/13",
+ "switch_port": "Gi3/32",
"vendor": "Intel",
"version": "80003ES2LAN"
},
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
index f18eb6946bc..83896882b21 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
@@ -45,7 +45,7 @@
"network_address": "chinqchint-14.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw",
- "switch_port": "Gi2/14",
+ "switch_port": "Gi3/31",
"vendor": "Intel",
"version": "80003ES2LAN"
},
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
index 2bbe47784a5..212db004bea 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
@@ -45,7 +45,7 @@
"network_address": "chinqchint-34.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw",
- "switch_port": "Gi2/34",
+ "switch_port": "Gi2/1",
"vendor": "Intel",
"version": "80003ES2LAN"
},
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
index 9d290edb9ab..9f96c570e3a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
@@ -45,7 +45,7 @@
"network_address": "chinqchint-35.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw",
- "switch_port": "Gi2/35",
+ "switch_port": "Gi3/26",
"vendor": "Intel",
"version": "80003ES2LAN"
},
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
index b38b901db47..0927447ba2f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
@@ -45,7 +45,7 @@
"network_address": "chinqchint-36.lille.grid5000.fr",
"rate": 1000000000,
"switch": "gw",
- "switch_port": "Gi2/36",
+ "switch_port": "Gi3/25",
"vendor": "Intel",
"version": "80003ES2LAN"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
index 54a6cfe4ab9..61bcfa95b3c 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-1.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi3/29",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/26",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
index 5a795c9c070..cfe813b9bac 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-2.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi3/25",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/20",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
index 5d08d9b2ec2..a57a97f8b83 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-3.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi3/30",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/25",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
index 3c2f5663310..fb8ce999f2f 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-4.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi3/26",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/18",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
index f98cf018e75..f495a7ebd14 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-5.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi3/33",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/24",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
index dd7c1574ff0..7d83e1bf158 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-6.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi3/31",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/27",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
index da13995b4f6..b970d37a693 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-7.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi4/48",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/23",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
index 30599d911b5..a409767714e 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
@@ -51,8 +51,8 @@
"mounted": true,
"network_address": "chirloute-8.lille.grid5000.fr",
"rate": 1000000000,
- "switch": "gw",
- "switch_port": "Gi3/32",
+ "switch": "sw-admin5",
+ "switch_port": "Gi0/28",
"vendor": "Intel",
"version": "82576EB"
},
diff --git a/generators/input/sites/lille/clusters/chinqchint.yaml b/generators/input/sites/lille/clusters/chinqchint.yaml
index 50d45490fa5..e76b06bba76 100644
--- a/generators/input/sites/lille/clusters/chinqchint.yaml
+++ b/generators/input/sites/lille/clusters/chinqchint.yaml
@@ -9,7 +9,7 @@ chinqchint-1:
eth1:
mac: 00:30:48:7c:7c:87
ip: 192.168.159.100
- switch_port: Gi2/1
+ switch_port: Gi4/48
myri0:
mac: 00:60:dd:47:4d:4a
ip: 192.168.162.100
@@ -189,7 +189,7 @@ chinqchint-13:
eth1:
mac: 00:30:48:7c:00:87
ip: 192.168.159.112
- switch_port: Gi2/13
+ switch_port: Gi3/32
myri0:
mac: 00:60:dd:47:49:8d
ip: 192.168.162.112
@@ -204,7 +204,7 @@ chinqchint-14:
eth1:
mac: 00:30:48:7c:00:75
ip: 192.168.159.113
- switch_port: Gi2/14
+ switch_port: Gi3/31
myri0:
mac: 00:60:dd:47:49:8a
ip: 192.168.162.113
@@ -504,7 +504,7 @@ chinqchint-34:
eth1:
mac: 00:30:48:7a:5f:17
ip: 192.168.159.133
- switch_port: Gi2/34
+ switch_port: Gi2/1
myri0:
mac: 00:60:dd:47:49:b8
ip: 192.168.162.133
@@ -519,7 +519,7 @@ chinqchint-35:
eth1:
mac: 00:30:48:7c:3d:f5
ip: 192.168.159.134
- switch_port: Gi2/35
+ switch_port: Gi3/26
myri0:
mac: 00:60:dd:47:49:e2
ip: 192.168.162.134
@@ -534,7 +534,7 @@ chinqchint-36:
eth1:
mac: 00:30:48:7d:2d:05
ip: 192.168.159.135
- switch_port: Gi2/36
+ switch_port: Gi3/25
myri0:
mac: 00:60:dd:47:49:b7
ip: 192.168.162.135
diff --git a/generators/input/sites/lille/clusters/chirloute.rb b/generators/input/sites/lille/clusters/chirloute.rb
index 65b38f8eaea..ec578be87bd 100644
--- a/generators/input/sites/lille/clusters/chirloute.rb
+++ b/generators/input/sites/lille/clusters/chirloute.rb
@@ -70,7 +70,7 @@ site :lille do |site_uid|
:device => 'eth1',
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
:ip => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'ip'),
- :switch => 'gw',
+ :switch => 'sw-admin5',
:switch_port => lookup('chirloute', node_uid, 'network_interfaces', 'eth1', 'switch_port')
},{
:interface => 'Ethernet',
diff --git a/generators/input/sites/lille/clusters/chirloute.yaml b/generators/input/sites/lille/clusters/chirloute.yaml
index 74f6f6e310f..9695b864269 100644
--- a/generators/input/sites/lille/clusters/chirloute.yaml
+++ b/generators/input/sites/lille/clusters/chirloute.yaml
@@ -13,7 +13,7 @@ chirloute-1:
eth1:
mac: 00:26:6c:f9:18:e5
ip: 192.168.159.21
- switch_port: Gi3/29
+ switch_port: Gi0/26
chassis:
serial_number: D385Z4J
manufacturer: Dell
@@ -42,7 +42,7 @@ chirloute-2:
eth1:
mac: 00:26:6c:f9:17:e9
ip: 192.168.159.22
- switch_port: Gi3/25
+ switch_port: Gi0/20
chassis:
serial_number: D385Z4J
manufacturer: Dell
@@ -71,7 +71,7 @@ chirloute-3:
eth1:
mac: 00:26:6c:f9:15:71
ip: 192.168.159.23
- switch_port: Gi3/30
+ switch_port: Gi0/25
chassis:
serial_number: D385Z4J
manufacturer: Dell
@@ -100,7 +100,7 @@ chirloute-4:
eth1:
mac: 00:26:6c:f9:19:61
ip: 192.168.159.24
- switch_port: Gi3/26
+ switch_port: Gi0/18
chassis:
serial_number: D385Z4J
manufacturer: Dell
@@ -129,7 +129,7 @@ chirloute-5:
eth1:
mac: 00:26:6c:f9:16:09
ip: 192.168.159.25
- switch_port: Gi3/33
+ switch_port: Gi0/24
chassis:
serial_number: F385Z4J
manufacturer: Dell
@@ -158,7 +158,7 @@ chirloute-6:
eth1:
mac: 00:26:6c:f9:17:21
ip: 192.168.159.26
- switch_port: Gi3/31
+ switch_port: Gi0/27
chassis:
serial_number: F385Z4J
manufacturer: Dell
@@ -187,7 +187,7 @@ chirloute-7:
eth1:
mac: 00:26:6c:f9:17:b9
ip: 192.168.159.27
- switch_port: Gi4/48
+ switch_port: Gi0/23
chassis:
serial_number: F385Z4J
manufacturer: Dell
@@ -216,7 +216,7 @@ chirloute-8:
eth1:
mac: 00:26:6c:f9:19:81
ip: 192.168.159.28
- switch_port: Gi3/32
+ switch_port: Gi0/28
chassis:
serial_number: F385Z4J
manufacturer: Dell
--
GitLab