From 992f7db9db9048228702132a0349bff3829b4077 Mon Sep 17 00:00:00 2001
From: Arthur Garnier <arthur.garnier@inria.fr>
Date: Tue, 28 Mar 2017 15:32:08 +0200
Subject: [PATCH] [nancy] rename grimani PDUs (Bug #7950)
---
.../clusters/grimani/nodes/grimani-1.json | 4 +-
.../clusters/grimani/nodes/grimani-2.json | 4 +-
.../clusters/grimani/nodes/grimani-3.json | 4 +-
.../clusters/grimani/nodes/grimani-4.json | 4 +-
.../clusters/grimani/nodes/grimani-5.json | 4 +-
.../clusters/grimani/nodes/grimani-6.json | 4 +-
.../{grimani-pdu-1.json => grimani-pdu1.json} | 2 +-
.../{grimani-pdu-2.json => grimani-pdu2.json} | 2 +-
grid5000-all.json | 42 +++++++------------
.../nancy/clusters/grimani/grimani_pdu.yaml | 24 +++++------
input/grid5000/sites/nancy/pdus.yaml | 6 +--
11 files changed, 45 insertions(+), 55 deletions(-)
rename data/grid5000/sites/nancy/pdus/{grimani-pdu-1.json => grimani-pdu1.json} (94%)
rename data/grid5000/sites/nancy/pdus/{grimani-pdu-2.json => grimani-pdu2.json} (94%)
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
index 585eb753851..533cc19def7 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
@@ -167,11 +167,11 @@
"pdu": [
{
"port": 1,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 1,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
index d9a3ac548b0..bde0ca1ebf6 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
@@ -167,11 +167,11 @@
"pdu": [
{
"port": 2,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 2,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
index 7311c4e6005..94b71e20769 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
@@ -167,11 +167,11 @@
"pdu": [
{
"port": 3,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 3,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
index b429d2c17af..d241c03169f 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
@@ -167,11 +167,11 @@
"pdu": [
{
"port": 4,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 4,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
index db5011a270e..13b532af0c9 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
@@ -167,11 +167,11 @@
"pdu": [
{
"port": 5,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 5,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
index 579d3230de8..b915af107f7 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
@@ -167,11 +167,11 @@
"pdu": [
{
"port": 6,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 6,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
diff --git a/data/grid5000/sites/nancy/pdus/grimani-pdu-1.json b/data/grid5000/sites/nancy/pdus/grimani-pdu1.json
similarity index 94%
rename from data/grid5000/sites/nancy/pdus/grimani-pdu-1.json
rename to data/grid5000/sites/nancy/pdus/grimani-pdu1.json
index fa4b6e5148c..63d84794c4b 100644
--- a/data/grid5000/sites/nancy/pdus/grimani-pdu-1.json
+++ b/data/grid5000/sites/nancy/pdus/grimani-pdu1.json
@@ -19,6 +19,6 @@
}
],
"type": "pdu",
- "uid": "grimani-pdu-1",
+ "uid": "grimani-pdu1",
"vendor": "APC"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/grimani-pdu-2.json b/data/grid5000/sites/nancy/pdus/grimani-pdu2.json
similarity index 94%
rename from data/grid5000/sites/nancy/pdus/grimani-pdu-2.json
rename to data/grid5000/sites/nancy/pdus/grimani-pdu2.json
index a7aa3534dff..662b1fbf212 100644
--- a/data/grid5000/sites/nancy/pdus/grimani-pdu-2.json
+++ b/data/grid5000/sites/nancy/pdus/grimani-pdu2.json
@@ -19,6 +19,6 @@
}
],
"type": "pdu",
- "uid": "grimani-pdu-2",
+ "uid": "grimani-pdu2",
"vendor": "APC"
}
\ No newline at end of file
diff --git a/grid5000-all.json b/grid5000-all.json
index 65712cb2e7c..9887038ed43 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -109693,11 +109693,11 @@
"pdu": [
{
"port": 1,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 1,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
@@ -109899,11 +109899,11 @@
"pdu": [
{
"port": 2,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 2,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
@@ -110105,11 +110105,11 @@
"pdu": [
{
"port": 3,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 3,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
@@ -110311,11 +110311,11 @@
"pdu": [
{
"port": 4,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 4,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
@@ -110517,11 +110517,11 @@
"pdu": [
{
"port": 5,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 5,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
@@ -110723,11 +110723,11 @@
"pdu": [
{
"port": 6,
- "uid": "grimani-pdu-1"
+ "uid": "grimani-pdu1"
},
{
"port": 6,
- "uid": "grimani-pdu-2"
+ "uid": "grimani-pdu2"
}
]
}
@@ -152464,7 +152464,7 @@
"uid": "griffon-pdu2",
"vendor": "APC"
},
- "grimani-pdu-1": {
+ "grimani-pdu1": {
"ip": "172.17.79.218",
"mac": "00:C0:B7:F2:27:D9",
"model": "AP8653",
@@ -152485,10 +152485,10 @@
}
],
"type": "pdu",
- "uid": "grimani-pdu-1",
+ "uid": "grimani-pdu1",
"vendor": "APC"
},
- "grimani-pdu-2": {
+ "grimani-pdu2": {
"ip": "172.17.79.219",
"mac": "00:C0:B7:F2:27:DE",
"model": "AP8653",
@@ -152509,7 +152509,7 @@
}
],
"type": "pdu",
- "uid": "grimani-pdu-2",
+ "uid": "grimani-pdu2",
"vendor": "APC"
},
"grimoire-pdu1": {
@@ -152613,16 +152613,6 @@
"renater_ip": "192.168.4.14",
"security_contact": "support-staff@lists.grid5000.fr",
"servers": {
- "am": {
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.79.161"
- }
- },
- "type": "server",
- "uid": "am"
- },
"api-proxy": {
"kind": "virtual",
"network_adapters": {
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
index c9ab704e795..e10e78fda21 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
@@ -7,37 +7,37 @@ nodes:
grimani-1:
pdu:
- - uid: grimani-pdu-1
+ - uid: grimani-pdu1
port: 1
- - uid: grimani-pdu-2
+ - uid: grimani-pdu2
port: 1
grimani-2:
pdu:
- - uid: grimani-pdu-1
+ - uid: grimani-pdu1
port: 2
- - uid: grimani-pdu-2
+ - uid: grimani-pdu2
port: 2
grimani-3:
pdu:
- - uid: grimani-pdu-1
+ - uid: grimani-pdu1
port: 3
- - uid: grimani-pdu-2
+ - uid: grimani-pdu2
port: 3
grimani-4:
pdu:
- - uid: grimani-pdu-1
+ - uid: grimani-pdu1
port: 4
- - uid: grimani-pdu-2
+ - uid: grimani-pdu2
port: 4
grimani-5:
pdu:
- - uid: grimani-pdu-1
+ - uid: grimani-pdu1
port: 5
- - uid: grimani-pdu-2
+ - uid: grimani-pdu2
port: 5
grimani-6:
pdu:
- - uid: grimani-pdu-1
+ - uid: grimani-pdu1
port: 6
- - uid: grimani-pdu-2
+ - uid: grimani-pdu2
port: 6
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index a3cb5752b10..fee65997fcb 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -83,7 +83,7 @@ pdus:
outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
resolution: 1
- grimani-pdu-[1-2]:
+ grimani-pdu[1-2]:
vendor: APC
model: AP8653
sensors:
@@ -161,11 +161,11 @@ pdus:
ip: 172.17.79.217
mac: 00:C0:B7:4D:A4:A3
- grimani-pdu-1:
+ grimani-pdu1:
ip: 172.17.79.218
mac: 00:C0:B7:F2:27:D9
- grimani-pdu-2:
+ grimani-pdu2:
ip: 172.17.79.219
mac: 00:C0:B7:F2:27:DE
--
GitLab