diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index 2ba36d33fdc096f409683476dc5ff4737db3daba..409ae014d949221a18551c52983127c4d71a0ad6 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -11,13 +11,10 @@
"network_adapters": [
{
"enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.196",
- "network_address": "borderline-1.bordeaux.grid5000.fr",
+ "interface": "InfiniBand SDR",
"rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
+ "vendor": "Mellanox",
+ "version": "InfiniHost MT25408"
},
{
"enabled": true,
@@ -25,18 +22,6 @@
"rate": 10000000000,
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
- },
- {
- "driver": "e1000",
- "enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index 142e27f93b4d01ebbb3bc27b0ebf7dafa6c24af4..b09238aef0b513b09704909c53e2ef3434544b6b 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
- {
- "enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.205",
- "network_address": "borderline-10.bordeaux.grid5000.fr",
- "rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
- },
{
"enabled": true,
"interface": "InfiniBand SDR",
@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
- "driver": "e1000",
"enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.205",
+ "network_address": "borderline-10.bordeaux.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index 2755f1a00041d2590f5ced510f26ae776ba84c40..9c27723795124b3ece4af183803cf5cf01405ded 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -11,13 +11,10 @@
"network_adapters": [
{
"enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.197",
- "network_address": "borderline-2.bordeaux.grid5000.fr",
+ "interface": "InfiniBand SDR",
"rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
+ "vendor": "Mellanox",
+ "version": "InfiniHost MT25408"
},
{
"enabled": true,
@@ -25,18 +22,6 @@
"rate": 10000000000,
"vendor": "Mellanox",
"version": "InfiniHost MT25408"
- },
- {
- "driver": "e1000",
- "enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index 6fa6ca05ff5b79bbf12272306f79ff6b359c7b35..5d4c0fce1b4eb9e19a0c9f109beb4c22dfd6c427 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -21,22 +21,13 @@
},
{
"enabled": true,
- "interface": "InfiniBand SDR",
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.198",
+ "network_address": "borderline-2.bordeaux.grid5000.fr",
"rate": 10000000000,
- "vendor": "Mellanox",
- "version": "InfiniHost MT25408"
- },
- {
- "driver": "e1000",
- "enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index bf33c182f889666978e308154e96bd3b659984f8..f72df1c16866b1c2c5355239cd67b0181da970a4 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -21,22 +21,13 @@
},
{
"enabled": true,
- "interface": "InfiniBand SDR",
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.199",
+ "network_address": "borderline-1.bordeaux.grid5000.fr",
"rate": 10000000000,
- "vendor": "Mellanox",
- "version": "InfiniHost MT25408"
- },
- {
- "driver": "e1000",
- "enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index 037398950becd09a23c823c1f1360f7d64db64c6..a59f1de50587e10e3c6ebae753f69dd99c2ad373 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
- {
- "enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.200",
- "network_address": "borderline-5.bordeaux.grid5000.fr",
- "rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
- },
{
"enabled": true,
"interface": "InfiniBand SDR",
@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
- "driver": "e1000",
"enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.200",
+ "network_address": "borderline-5.bordeaux.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index 982ad15aa59b8d0de794624068a800defafac02e..f8d631456e3f11284b7380affe26236edad31feb 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
- {
- "enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.201",
- "network_address": "borderline-6.bordeaux.grid5000.fr",
- "rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
- },
{
"enabled": true,
"interface": "InfiniBand SDR",
@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
- "driver": "e1000",
"enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.201",
+ "network_address": "borderline-6.bordeaux.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index 15382880d457b8c38d7848341da2488ccf56c016..6ec7a79ec86f097ad649b5e93708840fb36e1d7d 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
- {
- "enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.202",
- "network_address": "borderline-7.bordeaux.grid5000.fr",
- "rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
- },
{
"enabled": true,
"interface": "InfiniBand SDR",
@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
- "driver": "e1000",
"enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.202",
+ "network_address": "borderline-7.bordeaux.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index 450f83edee08b85a1c68de6bfc8fb0ed7ea88692..b8504f82b1c588e7a17c9aeb328d5a0e678cacf3 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
- {
- "enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.203",
- "network_address": "borderline-8.bordeaux.grid5000.fr",
- "rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
- },
{
"enabled": true,
"interface": "InfiniBand SDR",
@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
- "driver": "e1000",
"enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.203",
+ "network_address": "borderline-8.bordeaux.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index e49da01a2d8d37e9153457970b79e9a13192a2af..32bfff00c36dc3de0b2bb32ff534a678f4b991c6 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -9,16 +9,6 @@
"virtual_size": null
},
"network_adapters": [
- {
- "enabled": true,
- "interface": "Myrinet 10G",
- "ip": "172.16.1.204",
- "network_address": "borderline-9.bordeaux.grid5000.fr",
- "rate": 10000000000,
- "switch": null,
- "vendor": "Myrinet",
- "version": "10G-PCIE-8A-C"
- },
{
"enabled": true,
"interface": "InfiniBand SDR",
@@ -27,16 +17,14 @@
"version": "InfiniHost MT25408"
},
{
- "driver": "e1000",
"enabled": true,
- "interface": "Ethernet",
- "rate": 1000000000
- },
- {
- "driver": "e1000",
- "enabled": false,
- "interface": "Ethernet",
- "rate": 1000000000
+ "interface": "Myrinet 10G",
+ "ip": "172.16.1.204",
+ "network_address": "borderline-9.bordeaux.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "vendor": "Myrinet",
+ "version": "10G-PCIE-8A-C"
}
],
"operating_system": {
diff --git a/generators/input/bordeaux.rb b/generators/input/bordeaux.rb
index fa2f4590ec431380aa420a87b73c86b6b6b4240f..1f36873fdcfdafe43526950ecb68eaf7272d2afc 100755
--- a/generators/input/bordeaux.rb
+++ b/generators/input/bordeaux.rb
@@ -197,13 +197,29 @@ version 1.48"
{:interface => 'SAS', :size => 600.GB, :driver => nil}
]
network_adapters [
- {:interface => 'Myrinet 10G', :rate => 10.G,
- :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
- :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
- {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
{:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "e1000"},
{:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000"}
]
+#some cards have been swapped between hosts - refer to bug 2681 for explanations
+ if i == 0 or i == 1
+ network_adapters [
+ {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
+ {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true}]
+ elsif i == 2 or i == 3
+ network_adapters [
+ {:interface => 'Myrinet 10G', :rate => 10.G,
+ :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+ :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true},
+ {:interface => 'Myrinet 10G', :rate => 10.G,
+ :switch => nil, :network_address => "#{cluster_uid}-#{(i-2)-(i-3)*2}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+ :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}]
+ else
+ network_adapters [
+ {:interface => 'InfiniBand SDR', :rate => 10.G, :vendor => 'Mellanox', :version => "InfiniHost MT25408", :enabled => true},
+ {:interface => 'Myrinet 10G', :rate => 10.G,
+ :switch => nil, :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+ :vendor => 'Myrinet', :version => "10G-PCIE-8A-C", :enabled => true}]
+ end
end
end
end # cluster borderline