From 743094f9801c0e6a76bc7ddd05279014c9c7b383 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 23 Feb 2021 11:52:01 +0100
Subject: [PATCH] [lib] Do not add retired node to pdus section of ref. API
---
data/grid5000/sites/lyon/pdus/wattmetre1.json | 2 --
data/grid5000/sites/lyon/pdus/wattmetre4.json | 3 ---
data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json | 1 -
lib/refrepo/gen/reference-api.rb | 1 +
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre1.json b/data/grid5000/sites/lyon/pdus/wattmetre1.json
index 0354db89b60..55600e42a5e 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json
@@ -19,14 +19,12 @@
"12": "sagittaire-16",
"13": "sagittaire-17",
"14": "sagittaire-18",
- "15": "sagittaire-19",
"16": "sagittaire-20",
"17": "sagittaire-24",
"18": "sagittaire-27",
"19": "sagittaire-29",
"2": "sagittaire-3",
"20": "sagittaire-30",
- "21": "sagittaire-31",
"24": "pyxis-2",
"25": "pyxis-3",
"26": "gemini-2",
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre4.json b/data/grid5000/sites/lyon/pdus/wattmetre4.json
index 43ac4a68d4f..0d63b291698 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetre4.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre4.json
@@ -14,13 +14,10 @@
"model": "",
"ports": {
"0": "taurus-1",
- "1": "taurus-2",
"10": "taurus-11",
"11": "taurus-12",
"12": "taurus-13",
- "13": "taurus-14",
"14": "taurus-15",
- "15": "taurus-16",
"16": "orion-1",
"17": "orion-2",
"18": "orion-3",
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
index 6b3774dd5f7..ee7c26e0d55 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
@@ -7,7 +7,6 @@
"20": "parapide-16",
"21": "parapide-18",
"22": "parapide-13",
- "23": "parapide-15",
"24": "parapide-12",
"3": "parapide-19",
"4": "parapide-25"
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index c481ff413d7..f102c8c0d99 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -170,6 +170,7 @@ def generate_reference_api
pdu_attached_nodes = {}
site.fetch("clusters", []).sort.each do |cluster_uid, cluster|
cluster["nodes"].each do |node_uid, node|# _sort_by_node_uid
+ next if node['status'] == "retired"
node.fetch('pdu', []).each do |node_pdu|
if node_pdu["uid"] == pdu_uid
pdu_attached_nodes[node_pdu["port"]] = node_uid
--
GitLab