Change description of default security group

The description for default security group in neutron
is “default”.
This confuses the end users, so updated the description
from “default” to “Default security group”.
Closes-Bug: #1291570

Change-Id: I9e024de935e8d17afd3d459cfa17e9feb0cd79fa

diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py
index b64fe3869cd86661beea01fab9d0c72f6a611b20..73310cfdcbe2b030ecdc4a5382ce5a2a6807b80e 100644 (file)
--- a/neutron/db/securitygroups_db.py
+++ b/neutron/db/securitygroups_db.py
@@ -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:

diff --git a/neutron/tests/unit/test_extension_security_group.py b/neutron/tests/unit/test_extension_security_group.py
index 17484b965b87c5bec2d6a05b81604ed783aca262..1743605e6589f3c2475f6552dfb6713865c1bc06 100644 (file)
--- a/neutron/tests/unit/test_extension_security_group.py
+++ b/neutron/tests/unit/test_extension_security_group.py
@@ -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')