x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|v+v3: Allow multiple provider security groups on port"

Browse Source
This commit is contained in:
Jenkins 2016-12-01 07:21:32 +00:00 committed by Gerrit Code Review
commit b4bef49454
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/db/extended_security_group.py
View File

@ -168,8 +168,8 @@ class ExtendedSecurityGroupPropertiesMixin(object):
NsxExtendedSecurityGroupProperties.security_group_id
).join(securitygroups_db.SecurityGroup).filter(
securitygroups_db.SecurityGroup.tenant_id == tenant_id,
NsxExtendedSecurityGroupProperties.provider == sa.true()).scalar()
return [res] if res else []
NsxExtendedSecurityGroupProperties.provider == sa.true()).all()
return [r[0] for r in res]
def _validate_security_group_properties_create(self, context,
security_group, default_sg):

16
vmware_nsx/tests/unit/extensions/test_provider_security_groups.py
View File

@ -168,12 +168,28 @@ class ProviderSecurityGroupExtTestCase(
provider_secgroup = self._create_provider_security_group()
with self.port(tenant_id=self._tenant_id) as p:
# check that the provider security group is on port resource.
self.assertEqual(1, len(p['port']['provider_security_groups']))
self.assertEqual(provider_secgroup['security_group']['id'],
p['port']['provider_security_groups'][0])
# confirm there is still a default security group.
self.assertEqual(len(p['port']['security_groups']), 1)
def test_create_port_gets_multi_provider_sg(self):
# need to create provider security groups first.
provider_secgroup1 = self._create_provider_security_group()
provider_secgroup2 = self._create_provider_security_group()
with self.port(tenant_id=self._tenant_id) as p:
# check that the provider security group is on port resource.
self.assertEqual(2, len(p['port']['provider_security_groups']))
self.assertIn(provider_secgroup1['security_group']['id'],
p['port']['provider_security_groups'])
self.assertIn(provider_secgroup2['security_group']['id'],
p['port']['provider_security_groups'])
# confirm there is still a default security group.
self.assertEqual(len(p['port']['security_groups']), 1)
def test_create_port_with_no_provider_sg(self):
self._create_provider_security_group()
with self.port(tenant_id=self._tenant_id,