diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json index d9eaadae4c6a3523d9debeaca19741e4b2c4fe65..fcaa89b9995689ed4508055184eb639b3452584c 100644 --- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json +++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json @@ -125,8 +125,14 @@ { }, { + "kind": "server", + "snmp_name": "1/1/39", + "uid": "srv-data2" }, { + "kind": "server", + "snmp_name": "1/1/40", + "uid": "srv-data" }, { }, @@ -152,14 +158,8 @@ "uid": "pve-2" }, { - "kind": "server", - "snmp_name": "1/1/47", - "uid": "srv-data" }, { - "kind": "server", - "snmp_name": "1/1/48", - "uid": "srv-data2" }, { "kind": "switch", diff --git a/data/grid5000/sites/grenoble/servers/srv-data.json b/data/grid5000/sites/grenoble/servers/srv-data.json index 9296350aae6484881db2abcf32c494b8f482cc6d..748ccb9d6ab4648add33175d3d295f84b85cfcd1 100644 --- a/data/grid5000/sites/grenoble/servers/srv-data.json +++ b/data/grid5000/sites/grenoble/servers/srv-data.json @@ -13,7 +13,7 @@ }, "default": { "ip": "172.16.31.15", - "mac": "D4:04:E6:A6:0F:84" + "mac": "D4:04:E6:A6:0F:85" } }, "redfish": true, diff --git a/data/grid5000/sites/grenoble/servers/srv-data2.json b/data/grid5000/sites/grenoble/servers/srv-data2.json index 33dee326e567961caa5a4cd40924bd8cdd224574..1dda0d6d9106a01bca3b608a74f14cb9eeab7941 100644 --- a/data/grid5000/sites/grenoble/servers/srv-data2.json +++ b/data/grid5000/sites/grenoble/servers/srv-data2.json @@ -13,7 +13,7 @@ }, "default": { "ip": "172.16.31.16", - "mac": "D4:04:E6:A5:E7:CA" + "mac": "D4:04:E6:A5:E7:CB" } }, "redfish": true, diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml index 8a61348baec3ce5357c5d0f5a04a8ca0a6a00537..f44a3ed55657dd8fef57927577d57e70fa9a7291 100644 --- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml +++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml @@ -33,6 +33,12 @@ imag-1b-F3-prod-01: uid: chartreuse2-4 22: uid: nessie-1 + 39: + uid: srv-data2 + kind: server + 40: + uid: srv-data + kind: server 44: uid: imag-1b-F3-admin-01 kind: switch @@ -44,12 +50,6 @@ imag-1b-F3-prod-01: 46: uid: pve-2 kind: server - 47: - uid: srv-data - kind: server - 48: - uid: srv-data2 - kind: server 49: uid: imag-1b-F2-prod-01 kind: switch diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml index 8749c9dc840cc999f96d48eae1f4efdb1990bf29..33c4b69cc901f8b639d8d76b1cf91e46872b377b 100644 --- a/input/grid5000/sites/grenoble/servers/physical.yaml +++ b/input/grid5000/sites/grenoble/servers/physical.yaml @@ -111,7 +111,7 @@ srv-data: network_adapters: default: ip: 172.16.31.15 - mac: D4:04:E6:A6:0F:84 + mac: D4:04:E6:A6:0F:85 bmc: ip: 172.17.30.15 mac: 5C:ED:8C:F4:A1:EE @@ -126,7 +126,7 @@ srv-data2: network_adapters: default: ip: 172.16.31.16 - mac: D4:04:E6:A5:E7:CA + mac: D4:04:E6:A5:E7:CB bmc: ip: 172.17.30.16 mac: 5C:ED:8C:F4:64:78