From f20b725b4a056090567504441d59ed88bfe62cef Mon Sep 17 00:00:00 2001
From: "abhishek.talwar" <abhishek.talwar@tcs.com>
Date: Wed, 19 Nov 2014 15:24:42 +0530
Subject: [PATCH] Change description of default security group
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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
---
 neutron/db/securitygroups_db.py                     | 8 +++++---
 neutron/tests/unit/test_extension_security_group.py | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py
index b64fe3869..73310cfdc 100644
--- 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 17484b965..1743605e6 100644
--- 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')
-- 
2.45.2