openstack/manila
Code Issues Proposed changes

Merge "Get ports filtered by subnet id on share-server cleanup"

Browse Source
This commit is contained in:
Zuul 2020-05-27 12:30:15 +00:00 committed by Gerrit Code Review
commit 1f7982e7f3
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/share/drivers/service_instance.py
View File

@ -840,7 +840,8 @@ class NeutronNetworkHelper(BaseNetworkhelper):
if router_id and subnet_id: if router_id and subnet_id:
ports = self.neutron_api.list_ports( ports = self.neutron_api.list_ports(
fields=['fixed_ips', 'device_id', 'device_owner']) fields=['device_id', 'device_owner'],
fixed_ips=['subnet_id=%s' % subnet_id])
# NOTE(vponomaryov): iterate ports to get to know whether current # NOTE(vponomaryov): iterate ports to get to know whether current
# subnet is used or not. We will not remove it from router if it # subnet is used or not. We will not remove it from router if it
# is used. # is used.
@ -850,8 +851,6 @@ class NeutronNetworkHelper(BaseNetworkhelper):
# we know that it is VM. We continue only if both are 'True'. # we know that it is VM. We continue only if both are 'True'.
if (port['device_id'] and if (port['device_id'] and
port['device_owner'].startswith('compute:')): port['device_owner'].startswith('compute:')):
for fixed_ip in port['fixed_ips']:
if fixed_ip['subnet_id'] == subnet_id:
# NOTE(vponomaryov): There are other share servers # NOTE(vponomaryov): There are other share servers
# exist that use this subnet. So, do not remove it # exist that use this subnet. So, do not remove it
# from router. # from router.

26
manila/tests/share/drivers/test_service_instance.py
View File

@ -1679,8 +1679,7 @@ class NeutronNetworkHelperTestCase(test.TestCase):
def test_teardown_network_subnet_is_used(self): def test_teardown_network_subnet_is_used(self):
server_details = dict(subnet_id='foo', router_id='bar') server_details = dict(subnet_id='foo', router_id='bar')
fake_ports = [ fake_ports = [
{'fixed_ips': [{'subnet_id': server_details['subnet_id']}], {'device_id': 'fake_device_id',
'device_id': 'fake_device_id',
'device_owner': 'compute:foo'}, 'device_owner': 'compute:foo'},
] ]
instance = self._init_neutron_network_plugin() instance = self._init_neutron_network_plugin()
@ -1698,19 +1697,16 @@ class NeutronNetworkHelperTestCase(test.TestCase):
service_instance.neutron.API.router_remove_interface.called) service_instance.neutron.API.router_remove_interface.called)
self.assertFalse(service_instance.neutron.API.update_subnet.called) self.assertFalse(service_instance.neutron.API.update_subnet.called)
service_instance.neutron.API.list_ports.assert_called_once_with( service_instance.neutron.API.list_ports.assert_called_once_with(
fields=['fixed_ips', 'device_id', 'device_owner']) fields=['device_id', 'device_owner'], fixed_ips=['subnet_id=foo'])
def test_teardown_network_subnet_not_used(self): def test_teardown_network_subnet_not_used(self):
server_details = dict(subnet_id='foo', router_id='bar') server_details = dict(subnet_id='foo', router_id='bar')
fake_ports = [ fake_ports = [
{'fixed_ips': [{'subnet_id': server_details['subnet_id']}], {'device_id': 'fake_device_id',
'device_id': 'fake_device_id',
'device_owner': 'network:router_interface'}, 'device_owner': 'network:router_interface'},
{'fixed_ips': [{'subnet_id': 'bar' + server_details['subnet_id']}], {'device_id': 'fake_device_id',
'device_id': 'fake_device_id',
'device_owner': 'compute'}, 'device_owner': 'compute'},
{'fixed_ips': [{'subnet_id': server_details['subnet_id']}], {'device_id': '',
'device_id': '',
'device_owner': 'compute'}, 'device_owner': 'compute'},
] ]
instance = self._init_neutron_network_plugin() instance = self._init_neutron_network_plugin()
@ -1729,13 +1725,12 @@ class NeutronNetworkHelperTestCase(test.TestCase):
(service_instance.neutron.API.update_subnet. (service_instance.neutron.API.update_subnet.
assert_called_once_with('foo', '')) assert_called_once_with('foo', ''))
service_instance.neutron.API.list_ports.assert_called_once_with( service_instance.neutron.API.list_ports.assert_called_once_with(
fields=['fixed_ips', 'device_id', 'device_owner']) fields=['device_id', 'device_owner'], fixed_ips=['subnet_id=foo'])
def test_teardown_network_subnet_not_used_and_get_error_404(self): def test_teardown_network_subnet_not_used_and_get_error_404(self):
server_details = dict(subnet_id='foo', router_id='bar') server_details = dict(subnet_id='foo', router_id='bar')
fake_ports = [ fake_ports = [
{'fixed_ips': [{'subnet_id': server_details['subnet_id']}], {'device_id': 'fake_device_id',
'device_id': 'fake_device_id',
'device_owner': 'fake'}, 'device_owner': 'fake'},
] ]
instance = self._init_neutron_network_plugin() instance = self._init_neutron_network_plugin()
@ -1755,13 +1750,12 @@ class NeutronNetworkHelperTestCase(test.TestCase):
(service_instance.neutron.API.update_subnet. (service_instance.neutron.API.update_subnet.
assert_called_once_with('foo', '')) assert_called_once_with('foo', ''))
service_instance.neutron.API.list_ports.assert_called_once_with( service_instance.neutron.API.list_ports.assert_called_once_with(
fields=['fixed_ips', 'device_id', 'device_owner']) fields=['device_id', 'device_owner'], fixed_ips=['subnet_id=foo'])
def test_teardown_network_subnet_not_used_get_unhandled_error(self): def test_teardown_network_subnet_not_used_get_unhandled_error(self):
server_details = dict(subnet_id='foo', router_id='bar') server_details = dict(subnet_id='foo', router_id='bar')
fake_ports = [ fake_ports = [
{'fixed_ips': [{'subnet_id': server_details['subnet_id']}], {'device_id': 'fake_device_id',
'device_id': 'fake_device_id',
'device_owner': 'fake'}, 'device_owner': 'fake'},
] ]
instance = self._init_neutron_network_plugin() instance = self._init_neutron_network_plugin()
@ -1782,7 +1776,7 @@ class NeutronNetworkHelperTestCase(test.TestCase):
assert_called_once_with('bar', 'foo')) assert_called_once_with('bar', 'foo'))
self.assertFalse(service_instance.neutron.API.update_subnet.called) self.assertFalse(service_instance.neutron.API.update_subnet.called)
service_instance.neutron.API.list_ports.assert_called_once_with( service_instance.neutron.API.list_ports.assert_called_once_with(
fields=['fixed_ips', 'device_id', 'device_owner']) fields=['device_id', 'device_owner'], fixed_ips=['subnet_id=foo'])
def test_setup_network_and_connect_share_server_to_tenant_net(self): def test_setup_network_and_connect_share_server_to_tenant_net(self):
def fake_create_port(*aargs, **kwargs): def fake_create_port(*aargs, **kwargs):

5
releasenotes/notes/bug-1879754-teardown-network-d1887cdf6eb83388.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fixed unneeded all ports list request to Neutron
in service instance helper module on tearing down
service subnet, Neutron can filter them by subnet_id itself.