From e2462c1d46b110c8e5bc1441e785eac7a6091051 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 14 Mar 2017 17:04:06 +0100
Subject: [PATCH] [lyon] Update nova pdus port
---
.../lyon/clusters/nova/nodes/nova-1.json | 2 +-
.../lyon/clusters/nova/nodes/nova-10.json | 2 +-
.../lyon/clusters/nova/nodes/nova-11.json | 2 +-
.../lyon/clusters/nova/nodes/nova-12.json | 2 +-
.../lyon/clusters/nova/nodes/nova-13.json | 2 +-
.../lyon/clusters/nova/nodes/nova-14.json | 2 +-
.../lyon/clusters/nova/nodes/nova-15.json | 2 +-
.../lyon/clusters/nova/nodes/nova-16.json | 2 +-
.../lyon/clusters/nova/nodes/nova-17.json | 2 +-
.../lyon/clusters/nova/nodes/nova-18.json | 2 +-
.../lyon/clusters/nova/nodes/nova-19.json | 2 +-
.../lyon/clusters/nova/nodes/nova-2.json | 2 +-
.../lyon/clusters/nova/nodes/nova-20.json | 2 +-
.../lyon/clusters/nova/nodes/nova-21.json | 2 +-
.../lyon/clusters/nova/nodes/nova-22.json | 2 +-
.../lyon/clusters/nova/nodes/nova-23.json | 2 +-
.../lyon/clusters/nova/nodes/nova-3.json | 2 +-
.../lyon/clusters/nova/nodes/nova-4.json | 2 +-
.../lyon/clusters/nova/nodes/nova-5.json | 2 +-
.../lyon/clusters/nova/nodes/nova-6.json | 2 +-
.../lyon/clusters/nova/nodes/nova-7.json | 2 +-
.../lyon/clusters/nova/nodes/nova-8.json | 2 +-
.../lyon/clusters/nova/nodes/nova-9.json | 2 +-
grid5000-all.json | 46 +++++++++----------
.../sites/lyon/clusters/nova/nova.yml | 3 --
.../lyon/clusters/nova/nova_pdus.yml.erb | 8 ++++
26 files changed, 54 insertions(+), 49 deletions(-)
create mode 100644 input/grid5000/sites/lyon/clusters/nova/nova_pdus.yml.erb
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
index 08ec1be128e..bdb43eacc4b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 99,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
index 7b6722f4b17..1dd8a5d8cd9 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 108,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
index 81afc4ca469..16faceb9523 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 109,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
index 763e9f49bcc..02cab680c3f 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 110,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
index eafed94515c..08b043e3900 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 111,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
index 6574c6a97e0..55a8aa02967 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 112,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
index 4277c73550a..515b611ada9 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 113,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
index 09724225401..d51b3a7a829 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 114,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
index 73d801d45c8..221079bee1b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 115,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
index e2ed3df1932..0d926182787 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 116,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
index 2c48fd5d038..514e6cf7294 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 117,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
index ebdb2430fc6..e0a6b0600aa 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 100,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
index ac1dc01dad1..28fb2abc23b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 118,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
index b645cc2482e..ac2b654852f 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 119,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
index efad6254994..09b371aa359 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 120,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
index 35c752b91e7..52e0cf9c5d3 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 121,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
index f24a155d988..ce8c1ac95fe 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 101,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
index 0e9b4586c29..a8c37cf61ee 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 102,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
index 7b6b48bc76e..1c6a3580cd8 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 103,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
index 91002809933..fef5ddbd2fd 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 104,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
index 0043aee88d1..f8a82a46c4d 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 105,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
index 51eec89218c..e433196aa39 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 106,
"uid": "wattmetre"
}
],
diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
index 5c822be5c02..f8a62e75ebc 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
@@ -174,7 +174,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 107,
"uid": "wattmetre"
}
],
diff --git a/grid5000-all.json b/grid5000-all.json
index 3c11bbdcd79..238c3d5006f 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -33400,7 +33400,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 99,
"uid": "wattmetre"
}
],
@@ -33613,7 +33613,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 108,
"uid": "wattmetre"
}
],
@@ -33826,7 +33826,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 109,
"uid": "wattmetre"
}
],
@@ -34039,7 +34039,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 110,
"uid": "wattmetre"
}
],
@@ -34252,7 +34252,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 111,
"uid": "wattmetre"
}
],
@@ -34465,7 +34465,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 112,
"uid": "wattmetre"
}
],
@@ -34678,7 +34678,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 113,
"uid": "wattmetre"
}
],
@@ -34891,7 +34891,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 114,
"uid": "wattmetre"
}
],
@@ -35104,7 +35104,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 115,
"uid": "wattmetre"
}
],
@@ -35317,7 +35317,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 116,
"uid": "wattmetre"
}
],
@@ -35530,7 +35530,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 117,
"uid": "wattmetre"
}
],
@@ -35743,7 +35743,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 100,
"uid": "wattmetre"
}
],
@@ -35956,7 +35956,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 118,
"uid": "wattmetre"
}
],
@@ -36169,7 +36169,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 119,
"uid": "wattmetre"
}
],
@@ -36382,7 +36382,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 120,
"uid": "wattmetre"
}
],
@@ -36595,7 +36595,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 121,
"uid": "wattmetre"
}
],
@@ -36808,7 +36808,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 101,
"uid": "wattmetre"
}
],
@@ -37021,7 +37021,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 102,
"uid": "wattmetre"
}
],
@@ -37234,7 +37234,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 103,
"uid": "wattmetre"
}
],
@@ -37447,7 +37447,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 104,
"uid": "wattmetre"
}
],
@@ -37660,7 +37660,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 105,
"uid": "wattmetre"
}
],
@@ -37873,7 +37873,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 106,
"uid": "wattmetre"
}
],
@@ -38086,7 +38086,7 @@
},
"pdu": [
{
- "port": 0,
+ "port": 107,
"uid": "wattmetre"
}
],
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yml b/input/grid5000/sites/lyon/clusters/nova/nova.yml
index b8ab05831a3..deb84f0c494 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova.yml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova.yml
@@ -93,8 +93,5 @@ nodes:
metric: power
www:
url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
- pdu:
- - uid: wattmetre
- port: 0
gpu:
gpu: false
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_pdus.yml.erb b/input/grid5000/sites/lyon/clusters/nova/nova_pdus.yml.erb
new file mode 100644
index 00000000000..3c6d68a2288
--- /dev/null
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_pdus.yml.erb
@@ -0,0 +1,8 @@
+nodes:
+<% (1..23).each { |i| %>
+ nova-<%= i %>:
+ pdu:
+ - uid: wattmetre
+ port: <%= i+98 %>
+<% } %>
+
--
GitLab