Merge "Support for stateless security groups"

Author: Zuul

openstackclient/network/v2/security_group.py

@@ -120,6 +120,19 @@ def update_parser_network(self, parser):
             metavar='<project>',
             help=self.enhance_help_neutron(_("Owner's project (name or ID)"))
         )
+        stateful_group = parser.add_mutually_exclusive_group()
+        stateful_group.add_argument(
+            "--stateful",
+            action='store_true',
+            default=None,
+            help=_("Security group is stateful (Default)")
+        )
+        stateful_group.add_argument(
+            "--stateless",
+            action='store_true',
+            default=None,
+            help=_("Security group is stateless")
+        )
         identity_common.add_project_domain_option_to_parser(
             parser, enhance_help=self.enhance_help_neutron)
         _tag.add_tag_option_to_parser_for_create(
@@ -138,6 +151,10 @@ def take_action_network(self, client, parsed_args):
         attrs = {}
         attrs['name'] = parsed_args.name
         attrs['description'] = self._get_description(parsed_args)
+        if parsed_args.stateful:
+            attrs['stateful'] = True
+        if parsed_args.stateless:
+            attrs['stateful'] = False
         if parsed_args.project is not None:
             identity_client = self.app.client_manager.identity
             project_id = identity_common.find_project(
@@ -315,6 +332,19 @@ def update_parser_common(self, parser):
             metavar="<description>",
             help=_("New security group description")
         )
+        stateful_group = parser.add_mutually_exclusive_group()
+        stateful_group.add_argument(
+            "--stateful",
+            action='store_true',
+            default=None,
+            help=_("Security group is stateful (Default)")
+        )
+        stateful_group.add_argument(
+            "--stateless",
+            action='store_true',
+            default=None,
+            help=_("Security group is stateless")
+        )
         return parser
 
     def update_parser_network(self, parser):
@@ -331,6 +361,10 @@ def take_action_network(self, client, parsed_args):
             attrs['name'] = parsed_args.name
         if parsed_args.description is not None:
             attrs['description'] = parsed_args.description
+        if parsed_args.stateful:
+            attrs['stateful'] = True
+        if parsed_args.stateless:
+            attrs['stateful'] = False
         # NOTE(rtheis): Previous behavior did not raise a CommandError
         # if there were no updates. Maintain this behavior and issue
         # the update.

openstackclient/tests/functional/network/v2/test_security_group.py

@@ -42,16 +42,18 @@ def test_security_group_list(self):
     def test_security_group_set(self):
         other_name = uuid.uuid4().hex
         raw_output = self.openstack(
-            'security group set --description NSA --name ' +
+            'security group set --description NSA --stateless --name ' +
             other_name + ' ' + self.NAME
         )
         self.assertEqual('', raw_output)
 
         cmd_output = json.loads(self.openstack(
             'security group show -f json ' + other_name))
         self.assertEqual('NSA', cmd_output['description'])
+        self.assertFalse(cmd_output['stateful'])
 
     def test_security_group_show(self):
         cmd_output = json.loads(self.openstack(
             'security group show -f json ' + self.NAME))
         self.assertEqual(self.NAME, cmd_output['name'])
+        self.assertTrue(cmd_output['stateful'])

openstackclient/tests/unit/network/v2/fakes.py

@@ -1227,6 +1227,7 @@ def create_one_security_group(attrs=None):
             'id': 'security-group-id-' + uuid.uuid4().hex,
             'name': 'security-group-name-' + uuid.uuid4().hex,
             'description': 'security-group-description-' + uuid.uuid4().hex,
+            'stateful': True,
             'project_id': 'project-id-' + uuid.uuid4().hex,
             'security_group_rules': [],
             'tags': []

openstackclient/tests/unit/network/v2/test_security_group_network.py

@@ -49,6 +49,7 @@ class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
         'name',
         'project_id',
         'rules',
+        'stateful',
         'tags',
     )
 
@@ -58,6 +59,7 @@ class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
         _security_group.name,
         _security_group.project_id,
         security_group.NetworkSecurityGroupRulesColumn([]),
+        _security_group.stateful,
         _security_group.tags,
     )
 
@@ -101,20 +103,23 @@ def test_create_all_options(self):
             '--description', self._security_group.description,
             '--project', self.project.name,
             '--project-domain', self.domain.name,
+            '--stateful',
             self._security_group.name,
         ]
         verifylist = [
             ('description', self._security_group.description),
             ('name', self._security_group.name),
             ('project', self.project.name),
             ('project_domain', self.domain.name),
+            ('stateful', self._security_group.stateful),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.create_security_group.assert_called_once_with(**{
             'description': self._security_group.description,
+            'stateful': self._security_group.stateful,
             'name': self._security_group.name,
             'tenant_id': self.project.id,
         })
@@ -421,11 +426,13 @@ def test_set_all_options(self):
         arglist = [
             '--name', new_name,
             '--description', new_description,
+            '--stateful',
             self._security_group.name,
         ]
         verifylist = [
             ('description', new_description),
             ('group', self._security_group.name),
+            ('stateful', self._security_group.stateful),
             ('name', new_name),
         ]
 
@@ -435,6 +442,7 @@ def test_set_all_options(self):
         attrs = {
             'description': new_description,
             'name': new_name,
+            'stateful': True,
         }
         self.network.update_security_group.assert_called_once_with(
             self._security_group,
@@ -489,6 +497,7 @@ class TestShowSecurityGroupNetwork(TestSecurityGroupNetwork):
         'name',
         'project_id',
         'rules',
+        'stateful',
         'tags',
     )
 
@@ -499,6 +508,7 @@ class TestShowSecurityGroupNetwork(TestSecurityGroupNetwork):
         _security_group.project_id,
         security_group.NetworkSecurityGroupRulesColumn(
             [_security_group_rule._info]),
+        _security_group.stateful,
         _security_group.tags,
     )
 

releasenotes/notes/stateful-security-group-a21fa8498e866b90.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Add ``--stateful`` and ``--stateless`` option to the
+    ``security group create`` and ``security group set`` commands
+    to support stateful and stateless security groups.