diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json index 4ad2d98e1799adae871b2908ea1ae673b0e15ccd..16f83527e2ae6a81af9eeec8271d0eca8e92f1a7 100644 --- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json +++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json @@ -18,12 +18,6 @@ "port": "Port-channel 6", "rate": 40000000000, "uid": "mxl2" - }, - "port-channel7": { - "kind": "server", - "port": "NA", - "rate": 20000000000, - "uid": "srv-data" } }, "ip": "172.17.191.253", @@ -90,14 +84,8 @@ { }, { - "kind": "channel", - "snmp_name": "Ethernet1/27", - "uid": "port-channel7" }, { - "kind": "channel", - "snmp_name": "Ethernet1/28", - "uid": "port-channel7" }, { }, diff --git a/data/grid5000/sites/luxembourg/servers/srv-data.json b/data/grid5000/sites/luxembourg/servers/srv-data.json deleted file mode 100644 index d3e43a354f3c714557149395938c5b761d58a4ab..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/luxembourg/servers/srv-data.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "alias": [ - "storage1" - ], - "group_storage": { - "name": "storage1", - "rate": 20000000000, - "size": 40000000000000 - }, - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.190.70", - "mac": "D0:94:66:92:94:C1" - }, - "default": { - "ip": "172.16.191.70" - } - }, - "redfish": true, - "serial": "4HDKFV2", - "type": "server", - "uid": "srv-data", - "warranty": "2024-02" -} \ No newline at end of file diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml index 8f95262ef9d7c2f679cc4e57db93ed68845dcc82..38129e34364766ba490a25cfe1a39a6092d9cf4c 100644 --- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml +++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml @@ -86,12 +86,6 @@ ul-grid5000-sw02: 24: 25: 26: - 27: - uid: port-channel7 - kind: channel - 28: - uid: port-channel7 - kind: channel 29: 30: uid: port-channel4 @@ -140,8 +134,3 @@ ul-grid5000-sw02: port: Port-channel 6 kind: switch rate: 40000000000 - port-channel7: - uid: srv-data - port: NA - kind: server - rate: 20000000000 diff --git a/input/grid5000/sites/luxembourg/servers/physical.yaml b/input/grid5000/sites/luxembourg/servers/physical.yaml index 9573593c3ae9cad6603bf6be8680c3c738781216..2f03edf731cdbed21af839549e6dca5930af9e10 100644 --- a/input/grid5000/sites/luxembourg/servers/physical.yaml +++ b/input/grid5000/sites/luxembourg/servers/physical.yaml @@ -1,20 +1,4 @@ --- -srv-data: - kind: physical - alias: [storage1] - warranty: 2024-02 - serial: 4HDKFV2 - network_adapters: - default: - ip: 172.16.191.70 - bmc: - ip: 172.17.190.70 - mac: D0:94:66:92:94:C1 - group_storage: - name: storage1 - size: 40000000000000 - rate: 20000000000 - srv-data2: kind: physical alias: [srv-data-belval, storage2, nfs, home-g5k, public, modules]