openstack/astara
Code Issues Proposed changes

Merge "Delete detached vrrp ports when a newtork is removed"

Browse Source
This commit is contained in:
Jenkins
2016-03-18 21:02:28 +00:00
committed by Gerrit Code Review
parent 23e3607089 1bd785da97
commit fd8fe9c431
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
astara/instance_manager.py
View File

@@ -470,6 +470,7 @@ class InstanceManager(object):
return return
self.instance_info.ports.append(port) self.instance_info.ports.append(port)
ports_to_delete = []
for network_id in instance_networks - logical_networks: for network_id in instance_networks - logical_networks:
port = instance_ports[network_id] port = instance_ports[network_id]
self.log.debug( self.log.debug(
@@ -479,6 +480,7 @@ class InstanceManager(object):
try: try:
instance.interface_detach(port.id) instance.interface_detach(port.id)
ports_to_delete.append(port)
except: except:
self.log.exception('Interface detach failed') self.log.exception('Interface detach failed')
self.state = states.RESTART self.state = states.RESTART
@@ -501,6 +503,8 @@ class InstanceManager(object):
if self._verify_interfaces(self.resource.ports, interfaces): if self._verify_interfaces(self.resource.ports, interfaces):
# replugging was successful # replugging was successful
# TODO(mark) update port states # TODO(mark) update port states
for p in ports_to_delete:
worker_context.neutron.api_client.delete_port(port.id)
return return
time.sleep(1) time.sleep(1)

1
astara/test/unit/test_instance_manager.py
View File

@@ -72,6 +72,7 @@ class TestInstanceManager(base.RugTestBase):
self.ctx = fakes.fake_worker_context() self.ctx = fakes.fake_worker_context()
self.neutron = self.ctx.neutron self.neutron = self.ctx.neutron
self.neutron.api_client = mock.Mock()
self.config(boot_timeout=30) self.config(boot_timeout=30)
self.config(astara_mgt_service_port=5000) self.config(astara_mgt_service_port=5000)
self.config(max_retries=3) self.config(max_retries=3)