From f70a37f3c6ff9a0f44880c318e2049da782b6134 Mon Sep 17 00:00:00 2001
From: Elodie Bertoncello <elodie.bertoncello@inria.fr>
Date: Wed, 4 Jul 2012 15:20:33 +0200
Subject: [PATCH] [Grenoble] fix bug #4362 - Reference API: 'switch' property
undocumented for some nodes' for adonis cluster
---
.../clusters/adonis/nodes/adonis-1.json | 4 +++-
.../clusters/adonis/nodes/adonis-10.json | 4 +++-
.../clusters/adonis/nodes/adonis-2.json | 4 +++-
.../clusters/adonis/nodes/adonis-3.json | 4 +++-
.../clusters/adonis/nodes/adonis-4.json | 4 +++-
.../clusters/adonis/nodes/adonis-5.json | 4 +++-
.../clusters/adonis/nodes/adonis-6.json | 4 +++-
.../clusters/adonis/nodes/adonis-7.json | 4 +++-
.../clusters/adonis/nodes/adonis-8.json | 4 +++-
.../clusters/adonis/nodes/adonis-9.json | 4 +++-
.../input/sites/grenoble/clusters/adonis.rb | 5 ++++-
.../input/sites/grenoble/clusters/adonis.yaml | 20 +++++++++++++++++++
12 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index b9206404f60..1bb4bd1e9c3 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-1-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/11",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index c7fb02e39f0..d2e30bf48c4 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-10-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/20",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index 2e43f84cad3..26247895524 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-2-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/12",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 1d79c6741e0..427e49b1fa5 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-3-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/13",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index 2fb06348107..0acb08e110b 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-4-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/14",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index ab8c181137c..30d018f8552 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-5-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/15",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index 2d9c10ea075..7903c388d87 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-6-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/16",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 9a57ff18151..b1c99882ece 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-7-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/17",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index 3a057701a73..21fb9594fe0 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-8-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/18",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index eb950c00bb6..5cb9a3bd033 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -46,6 +46,8 @@
"mounted": true,
"network_address": "adonis-9-eth0.grenoble.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw",
+ "switch_port": "Gi3/19",
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
},
@@ -98,7 +100,7 @@
"driver": "ahci",
"interface": "SATA",
"model": "WD2502ABYS-0",
- "size": 232830643653.87
+ "size": 232830643653.86963
}
],
"supported_job_types": {
diff --git a/generators/input/sites/grenoble/clusters/adonis.rb b/generators/input/sites/grenoble/clusters/adonis.rb
index cd6cd2c6100..d2721be067a 100644
--- a/generators/input/sites/grenoble/clusters/adonis.rb
+++ b/generators/input/sites/grenoble/clusters/adonis.rb
@@ -68,7 +68,10 @@ site :grenoble do |site_uid|
:network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
:ip => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip'),
:mac => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mac'),
- :driver => "igb"
+ :driver => "igb",
+ :switch => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+ :switch_port => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_port')
+
},
{
:interface => 'Ethernet',
diff --git a/generators/input/sites/grenoble/clusters/adonis.yaml b/generators/input/sites/grenoble/clusters/adonis.yaml
index cb4bfd6e2cd..33f924eae4e 100644
--- a/generators/input/sites/grenoble/clusters/adonis.yaml
+++ b/generators/input/sites/grenoble/clusters/adonis.yaml
@@ -22,6 +22,8 @@ adonis-1:
eth0:
mac: 00:30:48:cc:7f:d8
ip: 172.16.16.131
+ switch_name: gw
+ switch_port: Gi3/11
eth1:
mac: 00:30:48:cc:7f:d9
adonis-2:
@@ -48,6 +50,8 @@ adonis-2:
eth0:
mac: 00:30:48:cc:7f:da
ip: 172.16.16.132
+ switch_name: gw
+ switch_port: Gi3/12
eth1:
mac: 00:30:48:cc:7f:db
adonis-3:
@@ -74,6 +78,8 @@ adonis-3:
eth0:
mac: 00:30:48:cd:c6:a4
ip: 172.16.16.133
+ switch_name: gw
+ switch_port: Gi3/13
eth1:
mac: 00:30:48:cd:c6:a5
adonis-4:
@@ -100,6 +106,8 @@ adonis-4:
eth0:
mac: 00:30:48:cd:c0:ac
ip: 172.16.16.134
+ switch_name: gw
+ switch_port: Gi3/14
eth1:
mac: 00:30:48:cd:c0:ad
adonis-5:
@@ -126,6 +134,8 @@ adonis-5:
eth0:
mac: 00:30:48:cc:7e:0a
ip: 172.16.16.135
+ switch_name: gw
+ switch_port: Gi3/15
eth1:
mac: 00:30:48:cc:7e:0b
adonis-6:
@@ -152,6 +162,8 @@ adonis-6:
eth0:
mac: 00:30:48:cc:7a:bc
ip: 172.16.16.136
+ switch_name: gw
+ switch_port: Gi3/16
eth1:
mac: 00:30:48:cc:7a:bd
adonis-7:
@@ -178,6 +190,8 @@ adonis-7:
eth0:
mac: 00:30:48:cd:c6:80
ip: 172.16.16.137
+ switch_name: gw
+ switch_port: Gi3/17
eth1:
mac: 00:30:48:cd:c6:81
adonis-8:
@@ -204,6 +218,8 @@ adonis-8:
eth0:
mac: 00:30:48:cd:c0:ae
ip: 172.16.16.138
+ switch_name: gw
+ switch_port: Gi3/18
eth1:
mac: 00:30:48:cd:c0:af
adonis-9:
@@ -230,6 +246,8 @@ adonis-9:
eth0:
mac: 00:30:48:cb:cf:7e
ip: 172.16.16.139
+ switch_name: gw
+ switch_port: Gi3/19
eth1:
mac: 00:30:48:cb:cf:7f
adonis-10:
@@ -256,5 +274,7 @@ adonis-10:
eth0:
mac: 00:30:48:cc:83:10
ip: 172.16.16.140
+ switch_name: gw
+ switch_port: Gi3/20
eth1:
mac: 00:30:48:cc:83:11
--
GitLab