openstack
/
nova-powervm
Code Issues Proposed changes

Rebase on set_vnic_backdevs(redundancy) 

pypowervm changed set_vnic_backdevs to take a single 'redundancy' param
in place of min_redundancy and max_redundancy.  This change set rebases
accordingly.

Closes-Bug: #1631131

Change-Id: Ide8bfe7d3d5ddef5cc49754f2b6d75b26b58f840
This commit is contained in:
Eric Fried 2016-10-06 14:52:52 -05:00
parent 4fcf6cfb1e
commit 772ccf9d61
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova_powervm/tests/virt/powervm/test_vif.py
View File

@ -280,8 +280,8 @@ class TestVifSriovDriver(test.TestCase):
mac_addr=mock_san_mac.return_value, allowed_vlans='NONE',
allowed_macs='NONE')
mock_back_devs.assert_called_once_with(
mock_vnic_bld.return_value, ['port1', 'port2'], min_redundancy=3,
max_redundancy=3, capacity=None, check_port_status=True)
mock_vnic_bld.return_value, ['port1', 'port2'], redundancy=3,
capacity=None, check_port_status=True)
mock_pvm_uuid.assert_called_once_with(self.drv.instance)
mock_vnic_bld.return_value.create.assert_called_once_with(
parent_type=pvm_lpar.LPAR, parent_uuid=mock_pvm_uuid.return_value)
@ -299,8 +299,8 @@ class TestVifSriovDriver(test.TestCase):
mac_addr=mock_san_mac.return_value, allowed_vlans='NONE',
allowed_macs='NONE')
mock_back_devs.assert_called_once_with(
mock_vnic_bld.return_value, ['port1', 'port2'], min_redundancy=3,
max_redundancy=3, capacity=0.08, check_port_status=True)
mock_vnic_bld.return_value, ['port1', 'port2'],
redundancy=3, capacity=0.08, check_port_status=True)
mock_pvm_uuid.assert_called_once_with(self.drv.instance)
mock_vnic_bld.return_value.create.assert_called_once_with(
parent_type=pvm_lpar.LPAR, parent_uuid=mock_pvm_uuid.return_value)

5
nova_powervm/virt/powervm/vif.py
View File

@ -560,9 +560,8 @@ class PvmVnicSriovVifDriver(PvmVifDriver):
allowed_vlans=pvm_util.VLANList.NONE,
allowed_macs=pvm_util.MACList.NONE)
sriovtask.set_vnic_back_devs(
vnic, pports, min_redundancy=redundancy, max_redundancy=redundancy,
capacity=capacity, check_port_status=True)
sriovtask.set_vnic_back_devs(vnic, pports, redundancy=redundancy,
capacity=capacity, check_port_status=True)
return vnic.create(parent_type=pvm_lpar.LPAR,
parent_uuid=vm.get_pvm_uuid(self.instance))