openstack/neutron
Code Issues Proposed changes

Merge "Add argument to get ports by SG to allow excluding owners"

Browse Source
This commit is contained in:
Zuul 2018-10-05 06:11:34 +00:00 committed by Gerrit Code Review
commit 688914a247
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/objects/ports.py
View File

@ -510,9 +510,14 @@ class Port(base.NeutronDbObject):
return [cls._load_object(context, db_obj) for db_obj in ports.all()] return [cls._load_object(context, db_obj) for db_obj in ports.all()]
@classmethod @classmethod
def get_ports_ids_by_security_groups(cls, context, security_group_ids): def get_ports_ids_by_security_groups(cls, context, security_group_ids,
excluded_device_owners=None):
query = context.session.query(sg_models.SecurityGroupPortBinding) query = context.session.query(sg_models.SecurityGroupPortBinding)
query = query.filter( query = query.filter(
sg_models.SecurityGroupPortBinding.security_group_id.in_( sg_models.SecurityGroupPortBinding.security_group_id.in_(
security_group_ids)) security_group_ids))
if excluded_device_owners:
query = query.join(models_v2.Port)
query = query.filter(
~models_v2.Port.device_owner.in_(excluded_device_owners))
return [port_binding['port_id'] for port_binding in query.all()] return [port_binding['port_id'] for port_binding in query.all()]

19
neutron/tests/unit/objects/test_ports.py
View File

@ -235,6 +235,7 @@ class PortDbObjectTestCase(obj_test_base.BaseDbObjectTestCase,
{'network_id': network_id, {'network_id': network_id,
'fixed_ips': {'subnet_id': subnet_id, 'fixed_ips': {'subnet_id': subnet_id,
'network_id': network_id}, 'network_id': network_id},
'device_owner': 'not_a_router',
'binding_levels': {'segment_id': segment_id}}) 'binding_levels': {'segment_id': segment_id}})
def test_security_group_ids(self): def test_security_group_ids(self):
@ -459,3 +460,21 @@ class PortDbObjectTestCase(obj_test_base.BaseDbObjectTestCase,
primitive['versioned_object.data'].pop('bindings') primitive['versioned_object.data'].pop('bindings')
port_v1_4_no_binding = port_v1_4.obj_from_primitive(primitive) port_v1_4_no_binding = port_v1_4.obj_from_primitive(primitive)
port_v1_4_no_binding.obj_to_primitive(target_version='1.3') port_v1_4_no_binding.obj_to_primitive(target_version='1.3')
def test_get_ports_ids_by_security_groups_except_router(self):
sg_id = self._create_test_security_group_id()
filter_owner = constants.ROUTER_INTERFACE_OWNERS_SNAT
obj = self._make_object(self.obj_fields[0])
obj.create()
obj.security_group_ids = {sg_id}
obj.update()
self.assertEqual(1, len(
ports.Port.get_ports_ids_by_security_groups(
self.context, security_group_ids=(sg_id, ),
excluded_device_owners=filter_owner)))
obj.device_owner = constants.DEVICE_OWNER_ROUTER_SNAT
obj.update()
self.assertEqual(0, len(
ports.Port.get_ports_ids_by_security_groups(
self.context, security_group_ids=(sg_id, ),
excluded_device_owners=filter_owner)))