openstack
/
fuel-qa
Code Issues Proposed changes

Improve MAC comparison in system tests 

Change-Id: I78745dfbca1e850121bbfb8733f9cd355bf2c0c1
Closes-bug: #1511003
Related-bug: #1508986
This commit is contained in:
Artem Panchenko 2015-10-28 18:06:24 +02:00
parent 451d7586e5
commit d456cbbbdf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuelweb_test/models/fuel_web_client.py
View File

@ -1030,10 +1030,9 @@ class FuelWebClient(object):
:rtype: Devops Node or None
"""
nailgun_node = self.get_nailgun_node_by_fqdn(fqdn)
macs = {i['mac'] for i in nailgun_node['meta']['interfaces']}
macs = {EUI(i['mac']) for i in nailgun_node['meta']['interfaces']}
for devops_node in devops_nodes:
devops_macs = {i.mac_address.upper()
for i in devops_node.interfaces}
devops_macs = {EUI(i.mac_address) for i in devops_node.interfaces}
if devops_macs == macs:
return devops_node
@ -1046,7 +1045,7 @@ class FuelWebClient(object):
"""
for node in self.environment.d_env.nodes():
for iface in node.interfaces:
if iface.mac_address.lower() == mac_address.lower():
if EUI(iface.mac_address.lower) == EUI(mac_address):
return node
@logwrap