From ad1b862e8bb32454f357db8129ad17919f0351ef Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Wed, 5 Apr 2017 10:08:53 -0700 Subject: [PATCH] Remove 'allow_port_security_disabled' option The allow_port_security_disabled option had been added as a temporary option for skipping the test on Liberty. Current Tempest doesn't support Liberty, so this patch removes the config option from Tempest. Change-Id: Ia7d7f3f545e7582be3c3f005576adceede5e97cb --- ...w_port_security_disabled-option-d0ffaeb2e7817707.yaml | 5 +++++ tempest/config.py | 9 --------- tempest/scenario/test_security_groups_basic_ops.py | 3 --- 3 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 releasenotes/notes/remove-deprecated-allow_port_security_disabled-option-d0ffaeb2e7817707.yaml diff --git a/releasenotes/notes/remove-deprecated-allow_port_security_disabled-option-d0ffaeb2e7817707.yaml b/releasenotes/notes/remove-deprecated-allow_port_security_disabled-option-d0ffaeb2e7817707.yaml new file mode 100644 index 0000000000..9d7102fe08 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-allow_port_security_disabled-option-d0ffaeb2e7817707.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The deprecated config option 'allow_port_security_disabled' from compute_feature_enabled + group has been removed. diff --git a/tempest/config.py b/tempest/config.py index 35eb1870d8..3c57197a25 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -336,15 +336,6 @@ compute_features_group = cfg.OptGroup(name='compute-feature-enabled', title="Enabled Compute Service Features") ComputeFeaturesGroup = [ - # NOTE(mriedem): This is a feature toggle for bug 1175464 which is fixed in - # mitaka and newton. This option can be removed after liberty-eol. - cfg.BoolOpt('allow_port_security_disabled', - default=True, - help='Does the test environment support creating ports in a ' - 'network where port security is disabled?', - deprecated_for_removal=True, - deprecated_reason='This config switch was added for Liberty ' - 'which is not supported anymore.'), cfg.BoolOpt('disk_config', default=True, help="If false, skip disk config tests"), diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index 72b61c83c4..55a3db8ac6 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.py @@ -625,9 +625,6 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest): @test.attr(type='slow') @test.requires_ext(service='network', extension='port-security') @decorators.idempotent_id('13ccf253-e5ad-424b-9c4a-97b88a026699') - @testtools.skipUnless( - CONF.compute_feature_enabled.allow_port_security_disabled, - 'Port security must be enabled.') # TODO(mriedem): We shouldn't actually need to check this since neutron # disables the port_security extension by default, but the problem is nova # assumes port_security_enabled=True if it's not set on the network