openstack/nova-powervm
Code Issues Proposed changes

Support just waiting for created vif events

Browse Source 
In a previous change, we introduced the concept of new VIFs versus
updated VIFs.  This change fixes an issue where the create flow would
wait for neutron to send events for ALL of the vifs.  It should only be
waiting for events for the created vifs, otherwise it waits until the 5
minute timeout and fails.

Change-Id: I02fe4d32e1d4e83672758a8d143153ecbb227515
Closes-Bug: 1618208
This commit is contained in:
Drew Thorstensen
2016-08-30 11:50:45 -04:00
parent daabfb35cf
commit fb519cb24a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova_powervm/tests/virt/powervm/tasks/test_network.py
View File

@@ -332,6 +332,7 @@ class TestNetwork(test.TestCase):
# Set up the runner.
p_vifs = tf_net.PlugVifs(mock.MagicMock(), self.apt, inst, net_info,
'host_uuid', 'slot_mgr')
p_vifs.crt_network_infos = net_info
# Mock that neutron is off.
mock_is_neutron.return_value = False

2
nova_powervm/virt/powervm/tasks/network.py
View File

@@ -223,7 +223,7 @@ class PlugVifs(pvm_task.PowerVMTask):
if (utils.is_neutron() and CONF.vif_plugging_is_fatal and
CONF.vif_plugging_timeout):
return [('network-vif-plugged', network_info['id'])
for network_info in self.network_infos
for network_info in self.crt_network_infos
if not network_info.get('active', True)]
else:
return []