diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json index 234926bd0e8b1de69736fc4c1fc780ac6833e66f..edc8f62c5189aa415df5e36e4fc63e8b627e096b 100644 --- a/data/grid5000/accesses/refrepo.json +++ b/data/grid5000/accesses/refrepo.json @@ -23270,11 +23270,10 @@ "mac": "98:03:9b:03:00:92:66:da", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "gemini-1-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -23289,10 +23288,9 @@ "mac": "98:03:9b:03:00:9a:3a:c6", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib1", - "network_address": "gemini-1-ib1.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -23307,10 +23305,9 @@ "mac": "98:03:9b:03:00:93:1f:6e", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib2", - "network_address": "gemini-1-ib2.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -23709,11 +23706,10 @@ "mac": "98:03:9b:03:00:9a:4a:4e", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "gemini-2-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -23728,10 +23724,9 @@ "mac": "98:03:9b:03:00:9a:4a:46", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib1", - "network_address": "gemini-2-ib1.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -23746,10 +23741,9 @@ "mac": "98:03:9b:03:00:9a:27:46", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib2", - "network_address": "gemini-2-ib2.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -32689,11 +32683,10 @@ "mac": "b8:59:9f:03:00:d1:f6:f6", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-1-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -32900,11 +32893,10 @@ "mac": "b8:59:9f:03:00:d1:f7:06", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-2-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -33111,11 +33103,10 @@ "mac": "b8:59:9f:03:00:d1:f6:f2", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-3-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -33322,11 +33313,10 @@ "mac": "b8:59:9f:03:00:d1:fa:66", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-4-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json index 6e9f91add236f70e638f88d98b2f69bccec8ec5a..0da4b58445af0199ffa17d860f926e54f235d8e5 100644 --- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json +++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json @@ -346,11 +346,10 @@ "mac": "98:03:9b:03:00:92:66:da", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "gemini-1-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -365,10 +364,9 @@ "mac": "98:03:9b:03:00:9a:3a:c6", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib1", - "network_address": "gemini-1-ib1.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -383,10 +381,9 @@ "mac": "98:03:9b:03:00:93:1f:6e", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib2", - "network_address": "gemini-1-ib2.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json index d5d9282a72ab983102c6e7b65d2884369b63ecd1..688d8e2adc695393383d650bbc88f517ef21e8df 100644 --- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json +++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json @@ -346,11 +346,10 @@ "mac": "98:03:9b:03:00:9a:4a:4e", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "gemini-2-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -365,10 +364,9 @@ "mac": "98:03:9b:03:00:9a:4a:46", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib1", - "network_address": "gemini-2-ib1.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, @@ -383,10 +381,9 @@ "mac": "98:03:9b:03:00:9a:27:46", "management": false, "model": "MT27800 Family [ConnectX-5]", - "mountable": true, + "mountable": false, "mounted": false, "name": "ib2", - "network_address": "gemini-2-ib2.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json index b423f0668861aec8771b4180405b0ddbd68fa991..e08e4f14dd592afa6ec0bc1e2e2034e35604c5dd 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json @@ -208,11 +208,10 @@ "mac": "b8:59:9f:03:00:d1:f6:f6", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-1-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json index 8d612d39690046ac08e06b0235550c2f6323777a..1102b6dedd62a564462a4263e116700c691ee74e 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json @@ -208,11 +208,10 @@ "mac": "b8:59:9f:03:00:d1:f7:06", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-2-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json index e1aefcebb3a32c44fe6ffb93e3a0bf69114378e5..e76effc0480de2e665800e0ee758b3d36cd7b063 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json @@ -208,11 +208,10 @@ "mac": "b8:59:9f:03:00:d1:f6:f2", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-3-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json index 5ead1a13763a79a6fa60421c253bb46422d46e18..1012f5bfbaec029a55023ed860d9f8da4b14a297 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json @@ -208,11 +208,10 @@ "mac": "b8:59:9f:03:00:d1:fa:66", "management": false, "model": "MT28908 Family [ConnectX-6]", - "mountable": true, - "mounted": true, + "mountable": false, + "mounted": false, "name": "ib0", "netmask": "255.255.240.0", - "network_address": "pyxis-4-ib0.lyon.grid5000.fr", "rate": 100000000000, "vendor": "Mellanox Technologies" }, diff --git a/data/grid5000/sites/lyon/network_equipments/swib.json b/data/grid5000/sites/lyon/network_equipments/swib.json deleted file mode 100644 index 574227cc6a883cd7e366ecbdedbee4bf015ebf79..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/lyon/network_equipments/swib.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "ip": "172.17.63.230", - "kind": "hpcswitch", - "linecards": [ - { - }, - { - "kavlan_pattern": "%LINECARD%/%PORT%", - "kind": "node", - "ports": [ - { - }, - { - "kind": "node", - "port": "ib0", - "snmp_name": "1/1", - "uid": "gemini-1" - }, - { - "kind": "node", - "port": "ib1", - "snmp_name": "1/2", - "uid": "gemini-1" - }, - { - "kind": "node", - "port": "ib2", - "snmp_name": "1/3", - "uid": "gemini-1" - }, - { - }, - { - "kind": "node", - "port": "ib0", - "snmp_name": "1/5", - "uid": "gemini-2" - }, - { - "kind": "node", - "port": "ib1", - "snmp_name": "1/6", - "uid": "gemini-2" - }, - { - "kind": "node", - "port": "ib2", - "snmp_name": "1/7", - "uid": "gemini-2" - }, - { - }, - { - "kind": "node", - "port": "ib0", - "snmp_name": "1/9", - "uid": "pyxis-1" - }, - { - "kind": "node", - "port": "ib0", - "snmp_name": "1/10", - "uid": "pyxis-2" - }, - { - "kind": "node", - "port": "ib0", - "snmp_name": "1/11", - "uid": "pyxis-3" - }, - { - "kind": "node", - "port": "ib0", - "snmp_name": "1/12", - "uid": "pyxis-4" - } - ], - "rate": 100000000000, - "snmp_pattern": "%LINECARD%/%PORT%" - } - ], - "managed_by_us": true, - "metrics": [ - - ], - "model": "Mellanox SB7800", - "site": "lyon", - "snmp_community": "public", - "type": "network_equipment", - "uid": "swib", - "warranty": "2024-07-31" -} \ No newline at end of file diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml index a802e3007bb7e8a817596ee7e1a2541977db187a..f497ae768049232dd83a80ed9ff9d3bcdb435c5b 100644 --- a/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml +++ b/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml @@ -4,16 +4,16 @@ nodes: network_adapters: ib0: enabled: false - mountable: true - mounted: true + mountable: false + mounted: false netmask: 255.255.240.0 ib1: enabled: false - mountable: true + mountable: false mounted: false ib2: enabled: false - mountable: true + mountable: false mounted: false ib3: enabled: false diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml index 5b447c7430e826ddd01e35b7d0964b6c67f544dd..bfe7dbc0f235f576d03e8ee5fa699c4f910458ba 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml @@ -35,8 +35,6 @@ nodes: enabled: false mountable: false mounted: false - ib0: - enabled: false storage_devices: pci-0000:0f:00.0-sas-phy2-lun-0: interface: SATA diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml index 6b081850e4b8c79905be19fd8da6796b56deec11..eb8a790856817e19d10bc5cab3f8cfefc826b340 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml @@ -3,7 +3,7 @@ nodes: pyxis-[1-4]: network_adapters: ib0: - enabled: true - mountable: true - mounted: true + enabled: false + mountable: false + mounted: false netmask: 255.255.240.0 diff --git a/input/grid5000/sites/lyon/networks/swib.yaml b/input/grid5000/sites/lyon/networks/swib.yaml deleted file mode 100644 index 968ea665ba0a15da5ce147460c6be4d93b47fdea..0000000000000000000000000000000000000000 --- a/input/grid5000/sites/lyon/networks/swib.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -swib: - model: Mellanox SB7800 - warranty: 2024-07-31 - kind: hpcswitch - managed_by_us: true - site: lyon - snmp_community: public - metrics: [] - ip: 172.17.63.230 - linecards: - 1: - snmp_pattern: "%LINECARD%/%PORT%" - kavlan_pattern: "%LINECARD%/%PORT%" - kind: node - rate: 100000000000 - # /!\ Unverified mapping - ports: - 1: gemini-1-ib0 - 2: gemini-1-ib1 - 3: gemini-1-ib2 - 5: gemini-2-ib0 - 6: gemini-2-ib1 - 7: gemini-2-ib2 - 9: pyxis-1-ib0 - 10: pyxis-2-ib0 - 11: pyxis-3-ib0 - 12: pyxis-4-ib0