Merge "Renamed secgroup description"

This commit is contained in:
Jenkins
2013-08-01 21:01:14 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 6 deletions

View File

@@ -77,8 +77,7 @@ class SecurityGroup(DatabaseModelBase):
def create_for_instance(cls, instance_id, context):
# Create a new security group
name = _("SecGroup_%s") % instance_id
description = \
_("Default Security Group For DBaaS Instance <%s>") % instance_id
description = _("Security Group for %s") % instance_id
sec_group = cls.create_sec_group(name, description, context)
# Currently this locked down by default, since we don't create any

View File

@@ -510,8 +510,7 @@ class SecurityGroupsTest(object):
self.testSecurityGroup = dbaas.security_groups.get(
instance_info.id)
self.secGroupName = "SecGroup_%s" % instance_info.id
self.secGroupDescription = \
"Default Security Group For DBaaS Instance <%s>" % instance_info.id
self.secGroupDescription = "Security Group for %s" % instance_info.id
@test
def test_created_security_group(self):
@@ -553,8 +552,7 @@ class SecurityGroupsRulesTest(object):
self.testSecurityGroup = dbaas.security_groups.get(
instance_info.id)
self.secGroupName = "SecGroup_%s" % instance_info.id
self.secGroupDescription = \
"Default Security Group For DBaaS Instance <%s>" % instance_info.id
self.secGroupDescription = "Security Group for %s" % instance_info.id
@test
def test_create_security_group_rule(self):