diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json index 9374d248972444941cb7927d23d596370054235f..d80e5e01ec36ab708a6c6e6263e7a334f0b416e5 100644 --- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json +++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json @@ -1175,24 +1175,28 @@ "resolution": 10 }, "power": { - "pdu": [ - { - "port": 8, - "uid": "graoully-pdu1" - }, - { - "port": 8, - "uid": "graoully-pdu2" - }, - { - "port": 8, - "uid": "grimoire-pdu1" - }, - { - "port": 8, - "uid": "grimoire-pdu2" - } - ] + "available": true, + "resolution": 1, + "via": { + "pdu": [ + { + "port": 8, + "uid": "graoully-pdu1" + }, + { + "port": 8, + "uid": "graoully-pdu2" + }, + { + "port": 8, + "uid": "grimoire-pdu1" + }, + { + "port": 8, + "uid": "grimoire-pdu2" + } + ] + } } }, "site": "nancy", diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json index 73cd453ef42685b5ed1066f102789bdbbb754864..4aa1ef931c34299b0711faad4ec90b1cd9151235 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json +++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json @@ -77,12 +77,16 @@ "available": false }, "power": { - "pdu": [ - { - "port": 7, - "uid": "graoully-pdu1" - } - ] + "available": true, + "resolution": 1, + "via": { + "pdu": [ + { + "port": 7, + "uid": "graoully-pdu1" + } + ] + } } }, "site": "nancy", diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json index 941f085db1bf5db41d50f4f2352f6513b4f5ede2..a1e429189452ff47719a22ba0c8159e9821b09a0 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json +++ b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json @@ -165,16 +165,20 @@ "resolution": 1 }, "power": { - "pdu": [ - { - "port": 6, - "uid": "graphene-pdu1" - }, - { - "port": 7, - "uid": "graphene-pdu2" - } - ] + "available": true, + "resolution": 1, + "via": { + "pdu": [ + { + "port": 6, + "uid": "graphene-pdu1" + }, + { + "port": 7, + "uid": "graphene-pdu2" + } + ] + } } }, "site": "nancy", diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json index dfa399503c7aa902818152b455c083797cf8135f..c50d0392e9d8b3cba1e21ad74afd0fae4f3a2c78 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json +++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json @@ -176,16 +176,20 @@ "resolution": 1 }, "power": { - "pdu": [ - { - "port": 22, - "uid": "griffon-pdu2" - }, - { - "port": 23, - "uid": "griffon-pdu2" - } - ] + "available": true, + "resolution": 1, + "via": { + "pdu": [ + { + "port": 22, + "uid": "griffon-pdu2" + }, + { + "port": 23, + "uid": "griffon-pdu2" + } + ] + } } }, "site": "nancy", diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml index c550fadfa45136f50f79b1147ae377c8f4133e61..cb9358721901687c5d7c91cf535e9fd6e7c1aa66 100644 --- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml +++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml @@ -9,15 +9,18 @@ gw-nancy: available: true resolution: 10 power: - pdu: - - uid: graoully-pdu1 - port: 8 - - uid: graoully-pdu2 - port: 8 - - uid: grimoire-pdu1 - port: 8 - - uid: grimoire-pdu2 - port: 8 + available: true + resolution: 1 + via: + pdu: + - uid: graoully-pdu1 + port: 8 + - uid: graoully-pdu2 + port: 8 + - uid: grimoire-pdu1 + port: 8 + - uid: grimoire-pdu2 + port: 8 monitoring: wattmeter: multiple metric: power diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml index 3f5701e7a48430c05d5ed25463db8f5216ff7af6..f2c3ef70598f971fbdba5bfcc3f287787575bad6 100644 --- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml +++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml @@ -8,9 +8,12 @@ sgraoullyib: network: available: false power: - pdu: - - uid: graoully-pdu1 - port: 7 + available: true + resolution: 1 + via: + pdu: + - uid: graoully-pdu1 + port: 7 monitoring: wattmeter: true metric: power diff --git a/input/grid5000/sites/nancy/networks/sgraphene1.yaml b/input/grid5000/sites/nancy/networks/sgraphene1.yaml index 86b34d23a8b8c9e758dced40c64d8c873a4cf350..bc2fff60e34b5350228646d983022f02692e50f2 100644 --- a/input/grid5000/sites/nancy/networks/sgraphene1.yaml +++ b/input/grid5000/sites/nancy/networks/sgraphene1.yaml @@ -9,11 +9,14 @@ sgraphene1: available: true resolution: 1 power: - pdu: - - uid: graphene-pdu1 - port: 6 - - uid: graphene-pdu2 - port: 7 + available: true + resolution: 1 + via: + pdu: + - uid: graphene-pdu1 + port: 6 + - uid: graphene-pdu2 + port: 7 monitoring: wattmeter: multiple metric: power diff --git a/input/grid5000/sites/nancy/networks/sgriffon1.yaml b/input/grid5000/sites/nancy/networks/sgriffon1.yaml index 8d2322c528386df796c8b188387bfd3e50c45169..6f0154fbf58c41ce358315c25fbefe64a225fb7f 100644 --- a/input/grid5000/sites/nancy/networks/sgriffon1.yaml +++ b/input/grid5000/sites/nancy/networks/sgriffon1.yaml @@ -9,11 +9,14 @@ sgriffon1: available: true resolution: 1 power: - pdu: - - uid: griffon-pdu2 - port: 22 - - uid: griffon-pdu2 - port: 23 + available: true + resolution: 1 + via: + pdu: + - uid: griffon-pdu2 + port: 22 + - uid: griffon-pdu2 + port: 23 monitoring: wattmeter: multiple metric: power