From 94fb2adb4ea6d38a2b20da95f0a2aab702369f76 Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Thu, 21 Jun 2012 13:08:06 +0200
Subject: [PATCH] [Bordeaux] add Borderline switch properties
---
.../sites/bordeaux/clusters/borderline/nodes/borderline-1.json | 1 +
.../bordeaux/clusters/borderline/nodes/borderline-10.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-2.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-3.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-4.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-5.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-6.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-7.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-8.json | 1 +
.../sites/bordeaux/clusters/borderline/nodes/borderline-9.json | 1 +
generators/input/sites/bordeaux/clusters/borderline.rb | 3 ++-
11 files changed, 12 insertions(+), 1 deletion(-)
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 9c02cd40235..f9d43e7dca3 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-1.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 cf0bbcec4e6..704a60b1a5a 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-10.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 502fcfd9b8b..97b466cf0ee 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-2.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 f4332f3d0bb..dc9664b2064 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-3.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 ca991fd2f1d..3bbe775a135 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-4.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 73ab4b611f3..ffbdba7f735 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-5.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 a77bed5c0a6..46066489e3b 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-6.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 06efea5311b..9a406d13b29 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-7.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 52af947bf9d..003b0bcac01 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-8.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
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 114552b923f..6f1b5347505 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -31,6 +31,7 @@
"mounted": true,
"network_address": "borderline-9.bordeaux.grid5000.fr",
"rate": 1000000000,
+ "switch": "gw Pro-Curve-HP",
"vendor": "Broadcom",
"version": "NetXtreme II BCM5708"
},
diff --git a/generators/input/sites/bordeaux/clusters/borderline.rb b/generators/input/sites/bordeaux/clusters/borderline.rb
index bee1dc232ed..b3a2f45e02b 100644
--- a/generators/input/sites/bordeaux/clusters/borderline.rb
+++ b/generators/input/sites/bordeaux/clusters/borderline.rb
@@ -50,7 +50,8 @@ site :bordeaux do |site_uid|
:mac => lookup('borderline', node_uid, 'network_interfaces', 'eth0', 'mac'),
:vendor => "Broadcom",
:version => "NetXtreme II BCM5708",
- :enabled => true,
+ :switch => "gw Pro-Curve-HP",
+ :enabled => true,
:mounted => true,
:mountable => true,
:bridged => true,
--
GitLab