openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Fix sriov-related methods" into stable/mitaka

This commit is contained in:
Jenkins 2017-01-11 12:48:41 +00:00 committed by Gerrit Code Review
parent 809578a19a 8d2ccd2d26
commit 6f8fb376e8
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fuelweb_test/models/fuel_web_client.py
View File

@ -1282,6 +1282,17 @@ class FuelWebClient29(object):
if nailgun_node:
return self.get_devops_node_by_mac(nailgun_node['mac'])
@logwrap
def get_devops_node_by_nailgun_node_id(self, nailgun_node_id):
"""Return devops node by nailgun node id
:type nailgun_node_id: int
:rtype: Node or None
"""
nailgun_node = [node for node in self.client.list_nodes() if
node['id'] == nailgun_node_id].pop()
return self.get_devops_node_by_mac(nailgun_node['mac'])
@logwrap
def get_devops_node_by_nailgun_fqdn(self, fqdn):
"""Return devops node with nailgun fqdn
@ -3197,8 +3208,7 @@ class FuelWebClient29(object):
def check_sriov(self, nailgun_node_id):
nailgun_node_ifaces = self.client.get_node_interfaces(
nailgun_node_id)
devops_node = self.get_devops_node_by_nailgun_node(
nailgun_node_id)
devops_node = self.get_devops_node_by_nailgun_node_id(nailgun_node_id)
devops_sriov_macs = [i.mac_address for i in devops_node.interfaces
if 'sriov' in i.features]
nailgun_sriov_nics = []
@ -3232,7 +3242,7 @@ class FuelWebClient29(object):
'sriov']['sriov_totalvfs']
else:
interface['attributes']['sriov']['enabled']['value'] = True
interface['attributes']['sriov']['numvfs'] = \
interface['attributes']['sriov']['numvfs']['value'] = \
interface['meta']['sriov']['totalvfs']
self.client.put_node_interfaces(