diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json index ab1ffe54a412d7a257ce539ad8be8608278db128..f0e49c93548d58228cd87b254675fdabfc1b575c 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json index 24e86392e626bcab82c51375608db87d8196556e..d1a93e6d354ce6eaffe83ff02c043b8c3f33c839 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json index b356ff4369d553d22fb3c860762e17691b83a573..f200205018e338877f832203e2e976e5a18b2c77 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json index bc5bc8e95870ef9ccb1ecc633b2e8ec250742d76..44d47978de1fb5e1d40378bd8d6d2de894193888 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json index 1491a9a55bd4a24b48760c6cf67aa85ffe91e1dd..92bc874329888659beafa3489448b8c3d366d147 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json index 15607b9520292b89b110548feced60daf44a6fc0..4fe243a76ed2cd4f3dab039a6cea0288d351c39f 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json index f6269b44e9e1ce52b6adf9812feb8bfbe36037b7..65caafc4272db72766ee5ccbc6bace842053470f 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json index f1edb16709ce0f542a58606b7a53adc8eddcca93..060997a6c8e722f5f4b3b5b4e4742edd110a40ac 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json index f97075875f1f763810654e29746757d571e3bb5e..e3306bed9d1dedd26aa6c7866e76e6c0b34710ab 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json index c46a6486da98a614e8b4fcca1603c55c2a7eaece..e176f7524e511f6f203f5357eb79b3f3c7c295a4 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json index 46da77368c362ecab5550d2e0253ce6066cceef1..2a01894332fb4feb64df52cc7fd5347e09d31c94 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json index 6d0507a05ee6b24c1fa22f655c0e81d1ba627e8a..6d8173c8a76e103b28517b82de2f2108de9f932e 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json index 15bda14e2263a0cab53699dfbb4f4da744aa4db2..28d95346a3004aa09e75d1a0216dffb80662bd6e 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json index 2d665e4d29471a14c36682430ee416155ce8299f..da98820f64d69391c1008c078cf5583d952526a6 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json index e40e0cbce25d63b3af0e0122bd2871498b22ea1e..d29f8e4d19852e809814a8fd593cd06eb59236d7 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json index bd015887d62ee12a2c317d9c9450b46071f0709e..3a04e63090dd788e42c1c092c707ce8edc5df42e 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json @@ -55,8 +55,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -71,8 +69,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -87,8 +83,6 @@ "mountable": false, "mounted": false, "rate": 10000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -103,8 +97,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { @@ -119,8 +111,6 @@ "mountable": false, "mounted": false, "rate": 1000000000, - "switch": null, - "switch_port": null, "vendor": "Intel Corporation" }, { diff --git a/generators/input/sites/nancy/clusters/graoully/graoully.rb b/generators/input/sites/nancy/clusters/graoully/graoully.rb index 35f25f7ae4fe1bebd082763503d9b4e7e7f9b5f8..4aa3d39c4b65c6944c6046b391cfbe22e75503da 100644 --- a/generators/input/sites/nancy/clusters/graoully/graoully.rb +++ b/generators/input/sites/nancy/clusters/graoully/graoully.rb @@ -105,8 +105,6 @@ site :nancy do |site_uid| :model => '82599ES 10-Gigabit SFI/SFP+ Network Connection', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth1'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth1'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'), @@ -121,8 +119,6 @@ site :nancy do |site_uid| :model => 'Ethernet 10G 2P X520 Adapter', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth2'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth2'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'), @@ -137,8 +133,6 @@ site :nancy do |site_uid| :model => 'Ethernet 10G 2P X520 Adapter', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth3'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth3'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'), @@ -153,8 +147,6 @@ site :nancy do |site_uid| :model => 'I350 Gigabit Network Connection', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth4'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth4'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'), @@ -169,8 +161,6 @@ site :nancy do |site_uid| :model => 'I350 Gigabit Network Connection', :driver => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'), :mac => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'), - :switch => net_switch_lookup('nancy', 'graoully', node_uid, 'eth5'), - :switch_port => net_port_lookup('nancy', 'graoully', node_uid, 'eth5'), }, { :interface => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),