diff --git a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json index a700f09e9df0fd902368beb5c091bcc866e03834..058946939ac7641a4bb3daa76a4c381a7c6320fb 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json @@ -51,8 +51,8 @@ "name": "enp1s0f0np0", "network_address": "vercors3-1.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null + "switch": "imag-1b-F2-prod-01", + "switch_port": "1/1/7" }, { "device": "bmc", diff --git a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json index 3bbb686a47db4af86d5e2c481ab81246aafc0602..a06c7468bac18ca585708767ff27ec23d40248c4 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json @@ -51,8 +51,8 @@ "name": "enp1s0f0np0", "network_address": "vercors3-2.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null + "switch": "imag-1b-F2-prod-01", + "switch_port": "1/1/8" }, { "device": "bmc", diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json index 24f334f25e96ca9517faabc0c09a7f92eefcf078..232582a0b7124d6e4f943728ea0bd760b7dce059 100644 --- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json +++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json @@ -21,8 +21,14 @@ { }, { + "kind": "other", + "snmp_name": "1/1/5", + "uid": "vercors3-1-bmc" }, { + "kind": "other", + "snmp_name": "1/1/6", + "uid": "vercors3-2-bmc" }, { }, diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json index 2b7cd93e7a17c0ee79f7e324460133d85a64bbf9..2ab54309353195aaf246114ad47c3528eb001141 100644 --- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json +++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json @@ -36,8 +36,18 @@ "uid": "vercors2-2" }, { + "kind": "node", + "port": "eth0", + "rate": 10000000000, + "snmp_name": "1/1/7", + "uid": "vercors3-1" }, { + "kind": "node", + "port": "eth0", + "rate": 10000000000, + "snmp_name": "1/1/8", + "uid": "vercors3-2" }, { }, diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml index da4a4bdaf4e175b7b5ff005c867e3001ed458ba4..e3ead1efc7cc1eed31d3c3b75bbb6ce44ba29eaa 100644 --- a/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml +++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml @@ -16,6 +16,12 @@ imag-1b-F2-admin-01: rate: 10_000_000_000 backplane_bps: 1_760_000_000_000 ports: + 5: + uid: vercors3-1-bmc + kind: other + 6: + uid: vercors3-2-bmc + kind: other #40: # uid: imag-1b-F1-prod-01-mgmt # kind: switch diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml index 2828a4dec1874031cc86c31afb618d37f8bd11c2..6bd2c7848b3f2de67bf4b58f6fdb4afc93a9f877 100644 --- a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml +++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml @@ -23,6 +23,12 @@ imag-1b-F2-prod-01: 6: uid: vercors2-2 rate: 1_000_000_000 + 7: + uid: vercors3-1 + rate: 10_000_000_000 + 8: + uid: vercors3-2 + rate: 10_000_000_000 44: uid: imag-1b-F2-admin-01 kind: switch