diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-20 22:24:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-20 22:24:10 +0000 |
| commit | bf9f6117a08a5aaa64bb536d437eaf2a5d7f5e9f (patch) | |
| tree | f79d8303420dc9e711a9888ce78697edeb31ecfd | |
| parent | 7c38c5144cf598abf465f1f312dcb33d1b42fda5 (diff) | |
| parent | beb30d31162d73bcf0530a2072009b9ef736d97c (diff) | |
| download | tempest-bf9f6117a08a5aaa64bb536d437eaf2a5d7f5e9f.tar.gz | |
Merge "Adding port_admin_state_change option to config"
| -rw-r--r-- | etc/tempest.conf.sample | 4 | ||||
| -rw-r--r-- | tempest/config.py | 4 | ||||
| -rw-r--r-- | tempest/scenario/test_network_basic_ops.py | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample index 1010ba531..2a7263590 100644 --- a/etc/tempest.conf.sample +++ b/etc/tempest.conf.sample @@ -802,6 +802,10 @@ # attributes ipv6_ra_mode and ipv6_address_mode (boolean value) #ipv6_subnet_attributes = false +# Does the test environment support changing port admin state (boolean +# value) +#port_admin_state_change = true + [object-storage] diff --git a/tempest/config.py b/tempest/config.py index 6b8113efe..bcbe41f19 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -506,6 +506,10 @@ NetworkFeaturesGroup = [ "the extended IPv6 attributes ipv6_ra_mode " "and ipv6_address_mode" ), + cfg.BoolOpt('port_admin_state_change', + default=True, + help="Does the test environment support changing" + " port admin state"), ] messaging_group = cfg.OptGroup(name='messaging', diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 2c4522dfb..b97ad0b68 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -590,6 +590,9 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): @testtools.skipIf(CONF.baremetal.driver_enabled, 'admin_state of instance ports cannot be altered ' 'for baremetal nodes') + @testtools.skipUnless(CONF.network_feature_enabled.port_admin_state_change, + "Changing a port's admin state is not supported " + "by the test environment") @test.attr(type='smoke') @test.services('compute', 'network') def test_update_instance_port_admin_state(self): |