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
This commit is contained in:
Ken'ichi Ohmichi
2017-04-05 10:08:53 -07:00
committed by Ken'ichi Ohmichi
parent d01fde620b
commit ad1b862e8b
3 changed files with 5 additions and 12 deletions

View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated config option 'allow_port_security_disabled' from compute_feature_enabled
group has been removed.

View File

@@ -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"),

View File

@@ -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