From 59ec7f487ecac6c2f50fe447c4636132aba0fc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Gaidamour?= <jeremie.gaidamour@inria.fr> Date: Sat, 9 Apr 2016 06:59:16 +0200 Subject: [PATCH] [all] fixed pdu input files --- dev/input/grid5000/sites/grenoble/pdus.yaml | 2 +- dev/input/grid5000/sites/nancy/pdus.yaml | 2 +- dev/input/grid5000/sites/reims/pdus.yaml | 2 +- dev/input/grid5000/sites/rennes/pdus.yaml | 2 +- dev/reference-api/reference-api.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/input/grid5000/sites/grenoble/pdus.yaml b/dev/input/grid5000/sites/grenoble/pdus.yaml index 8520357cfeb..93293e2aea5 100644 --- a/dev/input/grid5000/sites/grenoble/pdus.yaml +++ b/dev/input/grid5000/sites/grenoble/pdus.yaml @@ -1,4 +1,4 @@ -pdu: +pdus: adonis-pdu-[1-2]: vendor: Eaton Corporation diff --git a/dev/input/grid5000/sites/nancy/pdus.yaml b/dev/input/grid5000/sites/nancy/pdus.yaml index d1ab3c123fd..caf15a1c46f 100644 --- a/dev/input/grid5000/sites/nancy/pdus.yaml +++ b/dev/input/grid5000/sites/nancy/pdus.yaml @@ -1,4 +1,4 @@ -pdu: +pdus: graphene-pdu[7-9]: vendor: Eaton Corporation model: '' diff --git a/dev/input/grid5000/sites/reims/pdus.yaml b/dev/input/grid5000/sites/reims/pdus.yaml index ec437e6081c..25a93d4d77e 100644 --- a/dev/input/grid5000/sites/reims/pdus.yaml +++ b/dev/input/grid5000/sites/reims/pdus.yaml @@ -1,4 +1,4 @@ -pdu: +pdus: stremi-pdu[1-3]: vendor: Raritan diff --git a/dev/input/grid5000/sites/rennes/pdus.yaml b/dev/input/grid5000/sites/rennes/pdus.yaml index 0a4b2b0bd2a..2c57803338c 100644 --- a/dev/input/grid5000/sites/rennes/pdus.yaml +++ b/dev/input/grid5000/sites/rennes/pdus.yaml @@ -1,4 +1,4 @@ -pdu: +pdus: parapide-pdu-[1-4]: vendor: APC diff --git a/dev/reference-api/reference-api.rb b/dev/reference-api/reference-api.rb index 883bedb6c40..0c7520a0d3f 100644 --- a/dev/reference-api/reference-api.rb +++ b/dev/reference-api/reference-api.rb @@ -71,7 +71,7 @@ global_hash["sites"].each do |site_uid, site| site_path.mkpath() write_json(site_path.join("#{site_uid}.json"), - site.reject {|k, v| k == "clusters" || k == "networks" || k == "pdu" || k == "dom0" || k == "laptops" || k == "servers" }) + site.reject {|k, v| k == "clusters" || k == "networks" || k == "pdus" || k == "dom0" || k == "laptops" || k == "servers" }) # # Write pdu info -- GitLab