openstack/tempest
Code Issues Proposed changes

Merge "Remove old code for Juno compatibility"

Browse Source
This commit is contained in:
Jenkins 2016-02-18 01:35:35 +00:00 committed by Gerrit Code Review
commit 58c3afb6fc
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/api/compute/admin/test_live_migration.py
View File

@ -129,10 +129,6 @@ class LiveBlockMigrationTestJSON(base.BaseV2ComputeAdminTest):
@test.idempotent_id('1e107f21-61b2-4988-8f22-b196e938ab88') @test.idempotent_id('1e107f21-61b2-4988-8f22-b196e938ab88')
@testtools.skipUnless(CONF.compute_feature_enabled.pause, @testtools.skipUnless(CONF.compute_feature_enabled.pause,
'Pause is not available.') 'Pause is not available.')
@testtools.skipUnless(CONF.compute_feature_enabled
.live_migrate_paused_instances,
'Live migration of paused instances is not '
'available.')
def test_live_block_migration_paused(self): def test_live_block_migration_paused(self):
self._test_live_migration(state='PAUSED') self._test_live_migration(state='PAUSED')

13
tempest/config.py
View File

@ -352,13 +352,6 @@ ComputeFeaturesGroup = [
help="Does the test environment block migration support " help="Does the test environment block migration support "
"cinder iSCSI volumes. Note, libvirt doesn't support this, " "cinder iSCSI volumes. Note, libvirt doesn't support this, "
"see https://bugs.launchpad.net/nova/+bug/1398999"), "see https://bugs.launchpad.net/nova/+bug/1398999"),
# TODO(gilliard): Remove live_migrate_paused_instances at juno-eol.
cfg.BoolOpt('live_migrate_paused_instances',
default=False,
help="Does the test system allow live-migration of paused "
"instances? Note, this is more than just the ANDing of "
"paused and live_migrate, but all 3 should be set to True "
"to run those tests"),
cfg.BoolOpt('vnc_console', cfg.BoolOpt('vnc_console',
default=False, default=False,
help='Enable VNC console. This configuration value should ' help='Enable VNC console. This configuration value should '
@ -394,12 +387,6 @@ ComputeFeaturesGroup = [
cfg.BoolOpt('personality', cfg.BoolOpt('personality',
default=True, default=True,
help='Does the test environment support server personality'), help='Does the test environment support server personality'),
# TODO(mriedem): Remove preserve_ports once juno-eol happens.
cfg.BoolOpt('preserve_ports',
default=False,
help='Does Nova preserve preexisting ports from Neutron '
'when deleting an instance? This should be set to True '
'if testing Kilo+ Nova.'),
cfg.BoolOpt('attach_encrypted_volume', cfg.BoolOpt('attach_encrypted_volume',
default=True, default=True,
help='Does the test environment support attaching an ' help='Does the test environment support attaching an '

3
tempest/scenario/test_network_basic_ops.py
View File

@ -626,9 +626,6 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
"admin_state_up of instance port to True") "admin_state_up of instance port to True")
@test.idempotent_id('759462e1-8535-46b0-ab3a-33aa45c55aaa') @test.idempotent_id('759462e1-8535-46b0-ab3a-33aa45c55aaa')
@testtools.skipUnless(CONF.compute_feature_enabled.preserve_ports,
'Preserving ports on instance delete may not be '
'supported in the version of Nova being tested.')
@test.services('compute', 'network') @test.services('compute', 'network')
def test_preserve_preexisting_port(self): def test_preserve_preexisting_port(self):
"""Test preserve pre-existing port """Test preserve pre-existing port