Commit f70a37f3 authored by Elodie Bertoncello's avatar Elodie Bertoncello
Browse files

[Grenoble] fix bug #4362 - Reference API: 'switch' property undocumented for...

[Grenoble] fix bug #4362 - Reference API: 'switch' property undocumented for some nodes' for adonis cluster
parent 18186e35
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-1-eth0.grenoble.grid5000.fr", "network_address": "adonis-1-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/11",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-10-eth0.grenoble.grid5000.fr", "network_address": "adonis-10-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/20",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-2-eth0.grenoble.grid5000.fr", "network_address": "adonis-2-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/12",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-3-eth0.grenoble.grid5000.fr", "network_address": "adonis-3-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/13",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-4-eth0.grenoble.grid5000.fr", "network_address": "adonis-4-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/14",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-5-eth0.grenoble.grid5000.fr", "network_address": "adonis-5-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/15",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-6-eth0.grenoble.grid5000.fr", "network_address": "adonis-6-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/16",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-7-eth0.grenoble.grid5000.fr", "network_address": "adonis-7-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/17",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-8-eth0.grenoble.grid5000.fr", "network_address": "adonis-8-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/18",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
"mounted": true, "mounted": true,
"network_address": "adonis-9-eth0.grenoble.grid5000.fr", "network_address": "adonis-9-eth0.grenoble.grid5000.fr",
"rate": 1000000000, "rate": 1000000000,
"switch": "gw",
"switch_port": "Gi3/19",
"vendor": "Intel", "vendor": "Intel",
"version": "Device 10c9 (rev 01)" "version": "Device 10c9 (rev 01)"
}, },
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WD2502ABYS-0", "model": "WD2502ABYS-0",
"size": 232830643653.87 "size": 232830643653.86963
} }
], ],
"supported_job_types": { "supported_job_types": {
......
...@@ -68,7 +68,10 @@ site :grenoble do |site_uid| ...@@ -68,7 +68,10 @@ site :grenoble do |site_uid|
:network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr", :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
:ip => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip'), :ip => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'ip'),
:mac => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mac'), :mac => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'mac'),
:driver => "igb" :driver => "igb",
:switch => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
:switch_port => lookup('adonis', node_uid, 'network_interfaces', 'eth0', 'switch_port')
}, },
{ {
:interface => 'Ethernet', :interface => 'Ethernet',
......
...@@ -22,6 +22,8 @@ adonis-1: ...@@ -22,6 +22,8 @@ adonis-1:
eth0: eth0:
mac: 00:30:48:cc:7f:d8 mac: 00:30:48:cc:7f:d8
ip: 172.16.16.131 ip: 172.16.16.131
switch_name: gw
switch_port: Gi3/11
eth1: eth1:
mac: 00:30:48:cc:7f:d9 mac: 00:30:48:cc:7f:d9
adonis-2: adonis-2:
...@@ -48,6 +50,8 @@ adonis-2: ...@@ -48,6 +50,8 @@ adonis-2:
eth0: eth0:
mac: 00:30:48:cc:7f:da mac: 00:30:48:cc:7f:da
ip: 172.16.16.132 ip: 172.16.16.132
switch_name: gw
switch_port: Gi3/12
eth1: eth1:
mac: 00:30:48:cc:7f:db mac: 00:30:48:cc:7f:db
adonis-3: adonis-3:
...@@ -74,6 +78,8 @@ adonis-3: ...@@ -74,6 +78,8 @@ adonis-3:
eth0: eth0:
mac: 00:30:48:cd:c6:a4 mac: 00:30:48:cd:c6:a4
ip: 172.16.16.133 ip: 172.16.16.133
switch_name: gw
switch_port: Gi3/13
eth1: eth1:
mac: 00:30:48:cd:c6:a5 mac: 00:30:48:cd:c6:a5
adonis-4: adonis-4:
...@@ -100,6 +106,8 @@ adonis-4: ...@@ -100,6 +106,8 @@ adonis-4:
eth0: eth0:
mac: 00:30:48:cd:c0:ac mac: 00:30:48:cd:c0:ac
ip: 172.16.16.134 ip: 172.16.16.134
switch_name: gw
switch_port: Gi3/14
eth1: eth1:
mac: 00:30:48:cd:c0:ad mac: 00:30:48:cd:c0:ad
adonis-5: adonis-5:
...@@ -126,6 +134,8 @@ adonis-5: ...@@ -126,6 +134,8 @@ adonis-5:
eth0: eth0:
mac: 00:30:48:cc:7e:0a mac: 00:30:48:cc:7e:0a
ip: 172.16.16.135 ip: 172.16.16.135
switch_name: gw
switch_port: Gi3/15
eth1: eth1:
mac: 00:30:48:cc:7e:0b mac: 00:30:48:cc:7e:0b
adonis-6: adonis-6:
...@@ -152,6 +162,8 @@ adonis-6: ...@@ -152,6 +162,8 @@ adonis-6:
eth0: eth0:
mac: 00:30:48:cc:7a:bc mac: 00:30:48:cc:7a:bc
ip: 172.16.16.136 ip: 172.16.16.136
switch_name: gw
switch_port: Gi3/16
eth1: eth1:
mac: 00:30:48:cc:7a:bd mac: 00:30:48:cc:7a:bd
adonis-7: adonis-7:
...@@ -178,6 +190,8 @@ adonis-7: ...@@ -178,6 +190,8 @@ adonis-7:
eth0: eth0:
mac: 00:30:48:cd:c6:80 mac: 00:30:48:cd:c6:80
ip: 172.16.16.137 ip: 172.16.16.137
switch_name: gw
switch_port: Gi3/17
eth1: eth1:
mac: 00:30:48:cd:c6:81 mac: 00:30:48:cd:c6:81
adonis-8: adonis-8:
...@@ -204,6 +218,8 @@ adonis-8: ...@@ -204,6 +218,8 @@ adonis-8:
eth0: eth0:
mac: 00:30:48:cd:c0:ae mac: 00:30:48:cd:c0:ae
ip: 172.16.16.138 ip: 172.16.16.138
switch_name: gw
switch_port: Gi3/18
eth1: eth1:
mac: 00:30:48:cd:c0:af mac: 00:30:48:cd:c0:af
adonis-9: adonis-9:
...@@ -230,6 +246,8 @@ adonis-9: ...@@ -230,6 +246,8 @@ adonis-9:
eth0: eth0:
mac: 00:30:48:cb:cf:7e mac: 00:30:48:cb:cf:7e
ip: 172.16.16.139 ip: 172.16.16.139
switch_name: gw
switch_port: Gi3/19
eth1: eth1:
mac: 00:30:48:cb:cf:7f mac: 00:30:48:cb:cf:7f
adonis-10: adonis-10:
...@@ -256,5 +274,7 @@ adonis-10: ...@@ -256,5 +274,7 @@ adonis-10:
eth0: eth0:
mac: 00:30:48:cc:83:10 mac: 00:30:48:cc:83:10
ip: 172.16.16.140 ip: 172.16.16.140
switch_name: gw
switch_port: Gi3/20
eth1: eth1:
mac: 00:30:48:cc:83:11 mac: 00:30:48:cc:83:11
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment