From 93b73e9b2968fe2a8a488bc68edc38dd5f07354b Mon Sep 17 00:00:00 2001 From: James Black Date: Wed, 21 Feb 2024 19:50:28 -0800 Subject: [PATCH] Bug Fix, Default SG Rule Custom SG Currently the Default setting for CustomSG Rule is set to True, this means all new SGs inherit these rules, with no way for user to override this behavior. Closes Bug: #2054629 Change-Id: Icef7c91654dbced76a5492437e723c4e2a0f3102 --- .../network/v2/default_security_group_rule.py | 2 +- .../v2/test_default_security_group_rule.py | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/openstackclient/network/v2/default_security_group_rule.py b/openstackclient/network/v2/default_security_group_rule.py index 86a2ddc878..9c39b3f9ca 100644 --- a/openstackclient/network/v2/default_security_group_rule.py +++ b/openstackclient/network/v2/default_security_group_rule.py @@ -142,7 +142,7 @@ class CreateDefaultSecurityGroupRule( parser.add_argument( '--for-custom-sg', action='store_true', - default=True, + default=False, help=_( "Set this default security group rule to be used in all " "custom security groups created manually by users" diff --git a/openstackclient/tests/unit/network/v2/test_default_security_group_rule.py b/openstackclient/tests/unit/network/v2/test_default_security_group_rule.py index a7a6ec69b8..aded5abffa 100644 --- a/openstackclient/tests/unit/network/v2/test_default_security_group_rule.py +++ b/openstackclient/tests/unit/network/v2/test_default_security_group_rule.py @@ -72,7 +72,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'remote_ip_prefix': '0.0.0.0/0', 'location': 'MUNCHMUNCHMUNCH', 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } attrs = attrs or {} # Overwrite default attributes. @@ -217,7 +217,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -251,7 +251,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -287,7 +287,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_address_group_id': self._default_sg_rule.remote_address_group_id, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -334,7 +334,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_group_id': 'remote-group-id', 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -366,7 +366,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_group_id': 'remote-group-id', 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -400,7 +400,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -434,7 +434,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -585,7 +585,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -623,7 +623,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -661,7 +661,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -698,7 +698,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -741,7 +741,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -780,7 +780,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -811,7 +811,7 @@ class TestCreateDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'protocol': self._default_sg_rule.protocol, 'remote_ip_prefix': self._default_sg_rule.remote_ip_prefix, 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } ) self.assertEqual(self.expected_columns, columns) @@ -831,7 +831,7 @@ class TestDeleteDefaultSecurityGroupRule(TestDefaultSecurityGroupRule): 'remote_ip_prefix': '0.0.0.0/0', 'location': 'MUNCHMUNCHMUNCH', 'used_in_default_sg': False, - 'used_in_non_default_sg': True, + 'used_in_non_default_sg': False, } _default_sg_rules = list( sdk_fakes.generate_fake_resources(