x/vmware-nsx
Code Issues Proposed changes

Merge "Change description of default security group"

Browse Source
This commit is contained in:
Jenkins 2014-12-02 15:23:24 +00:00 committed by Gerrit Code Review
commit e02967656d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/db/securitygroups_db.py
View File

@ -507,9 +507,11 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
default_group = self.get_security_groups(context, filters,
default_sg=True)
if not default_group:
security_group = {'security_group': {'name': 'default',
'tenant_id': tenant_id,
'description': 'default'}}
security_group = {
'security_group': {'name': 'default',
'tenant_id': tenant_id,
'description': _('Default security group')}
}
ret = self.create_security_group(context, security_group, True)
return ret['id']
else:

7
neutron/tests/unit/test_extension_security_group.py
View File

@ -319,6 +319,13 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
self.assertEqual(res['security_group']['description'],
data['security_group']['description'])
def test_check_default_security_group_description(self):
with self.network():
res = self.new_list_request('security-groups')
sg = self.deserialize(self.fmt, res.get_response(self.ext_api))
self.assertEqual('Default security group',
sg['security_groups'][0]['description'])
def test_default_security_group(self):
with self.network():
res = self.new_list_request('security-groups')