From ea99a72603c441f1892ca4c4d27a6070cecc27e4 Mon Sep 17 00:00:00 2001 From: David Margery Date: Fri, 15 Jan 2016 17:44:02 +0100 Subject: [PATCH] [grenoble] Rename measure to port for pdu description, cleanup spurious pdus in site description, referenced properly the block measure available for clarity --- .../clusters/adonis/nodes/adonis-1.json | 8 +++---- .../clusters/adonis/nodes/adonis-10.json | 8 +++---- .../clusters/adonis/nodes/adonis-2.json | 8 +++---- .../clusters/adonis/nodes/adonis-3.json | 8 +++---- .../clusters/adonis/nodes/adonis-4.json | 8 +++---- .../clusters/adonis/nodes/adonis-5.json | 8 +++---- .../clusters/adonis/nodes/adonis-6.json | 8 +++---- .../clusters/adonis/nodes/adonis-7.json | 8 +++---- .../clusters/adonis/nodes/adonis-8.json | 8 +++---- .../clusters/adonis/nodes/adonis-9.json | 8 +++---- data/grid5000/sites/grenoble/pdus/pdu-1.json | 22 ------------------- data/grid5000/sites/grenoble/pdus/pdu-2.json | 22 ------------------- .../sites/grenoble/clusters/adonis/adonis.rb | 8 +++---- 13 files changed, 44 insertions(+), 88 deletions(-) delete mode 100644 data/grid5000/sites/grenoble/pdus/pdu-1.json delete mode 100644 data/grid5000/sites/grenoble/pdus/pdu-2.json 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 12087b944..40f5c3e31 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-11", + "port": "outlet-11", "uid": "adonis-pdu-1.grenoble.grid5000.fr" }, { - "measure": "outlet-12", + "port": "outlet-12", "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-1" + "measure": "block-1", + "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ] ] 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 ffd2ba1a6..323b79771 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-13", + "port": "outlet-13", "uid": "adonis-pdu-2.grenoble.grid5000.fr" }, { - "measure": "outlet-14", + "port": "outlet-14", "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-2" + "measure": "block-2", + "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ] ] 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 46ca96e48..e593f1110 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-11", + "port": "outlet-11", "uid": "adonis-pdu-1.grenoble.grid5000.fr" }, { - "measure": "outlet-12", + "port": "outlet-12", "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-1" + "measure": "block-1", + "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ] ] 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 904f119a9..b553950bd 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-13", + "port": "outlet-13", "uid": "adonis-pdu-1.grenoble.grid5000.fr" }, { - "measure": "outlet-14", + "port": "outlet-14", "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-2" + "measure": "block-2", + "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ] ] 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 4fd8140f4..fc91e8a1d 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-13", + "port": "outlet-13", "uid": "adonis-pdu-1.grenoble.grid5000.fr" }, { - "measure": "outlet-14", + "port": "outlet-14", "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-2" + "measure": "block-2", + "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ] ] 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 368c1b7a0..b298f40b1 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-5", + "port": "outlet-5", "uid": "adonis-pdu-1.grenoble.grid5000.fr" }, { - "measure": "outlet-6", + "port": "outlet-6", "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-1" + "measure": "block-1", + "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ] ] 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 e0999fd17..7de300806 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-5", + "port": "outlet-5", "uid": "adonis-pdu-1.grenoble.grid5000.fr" }, { - "measure": "outlet-6", + "port": "outlet-6", "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-1" + "measure": "block-1", + "uid": "adonis-pdu-1.grenoble.grid5000.fr" } ] ] 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 2baecfb93..0fbc778a4 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-1", + "port": "outlet-1", "uid": "adonis-pdu-2.grenoble.grid5000.fr" }, { - "measure": "outlet-2", + "port": "outlet-2", "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-1" + "measure": "block-1", + "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ] ] 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 6e646faae..151b984d6 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-1", + "port": "outlet-1", "uid": "adonis-pdu-2.grenoble.grid5000.fr" }, { - "measure": "outlet-2", + "port": "outlet-2", "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-1" + "measure": "block-1", + "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ] ] 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 0e14160d2..f67f6904c 100644 --- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json +++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json @@ -119,18 +119,18 @@ "pdu": [ [ { - "measure": "outlet-13", + "port": "outlet-13", "uid": "adonis-pdu-2.grenoble.grid5000.fr" }, { - "measure": "outlet-14", + "port": "outlet-14", "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ], [ { - "measure": "global", - "uid": "block-2" + "measure": "block-2", + "uid": "adonis-pdu-2.grenoble.grid5000.fr" } ] ] diff --git a/data/grid5000/sites/grenoble/pdus/pdu-1.json b/data/grid5000/sites/grenoble/pdus/pdu-1.json deleted file mode 100644 index c9571ee01..000000000 --- a/data/grid5000/sites/grenoble/pdus/pdu-1.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": "eMAA12", - "sensors": [ - { - "power": { - "per_outlets": true, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0", - "total_oids": [ - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2" - ], - "unit": "W" - } - } - } - ], - "type": "pdu", - "uid": "pdu-1", - "vendor": "Eaton Corporation" -} \ No newline at end of file diff --git a/data/grid5000/sites/grenoble/pdus/pdu-2.json b/data/grid5000/sites/grenoble/pdus/pdu-2.json deleted file mode 100644 index c8ade1b87..000000000 --- a/data/grid5000/sites/grenoble/pdus/pdu-2.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "model": "eMAA12", - "sensors": [ - { - "power": { - "per_outlets": true, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0", - "total_oids": [ - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2" - ], - "unit": "W" - } - } - } - ], - "type": "pdu", - "uid": "pdu-2", - "vendor": "Eaton Corporation" -} \ No newline at end of file diff --git a/generators/input/sites/grenoble/clusters/adonis/adonis.rb b/generators/input/sites/grenoble/clusters/adonis/adonis.rb index 2e8767e29..91f60299c 100644 --- a/generators/input/sites/grenoble/clusters/adonis/adonis.rb +++ b/generators/input/sites/grenoble/clusters/adonis/adonis.rb @@ -151,13 +151,13 @@ site :grenoble do |site_uid| :available => true, :via => { :pdu => [ - [ { :measure => lookup('adonis_manual', node_uid, 'sensors', 'measure1'), + [ { :port => lookup('adonis_manual', node_uid, 'sensors', 'measure1'), :uid => lookup('adonis_manual', node_uid, 'sensors', 'pdu')}, - { :measure => lookup('adonis_manual', node_uid, 'sensors', 'measure2'), + { :port => lookup('adonis_manual', node_uid, 'sensors', 'measure2'), :uid => lookup('adonis_manual', node_uid, 'sensors', 'pdu')} ], - [ { :measure => "global", - :uid => lookup('adonis_manual', node_uid, 'sensors', 'block')} + [ { :measure => lookup('adonis_manual', node_uid, 'sensors', 'block'), + :uid => lookup('adonis_manual', node_uid, 'sensors', 'pdu')} ] ] } -- GitLab