From fe3343768144080c42c88f9bd23edd065f84c427 Mon Sep 17 00:00:00 2001 From: Jordan Pittier Date: Tue, 9 Feb 2016 14:38:45 +0100 Subject: [PATCH] Remove old code for Juno compatibility Juno is EOL for long enough to remove this dead code. Change-Id: I4202e54b9fb9283a51440888c47a776401eb0324 --- tempest/api/compute/admin/test_live_migration.py | 4 ---- tempest/config.py | 13 ------------- tempest/scenario/test_network_basic_ops.py | 3 --- 3 files changed, 20 deletions(-) diff --git a/tempest/api/compute/admin/test_live_migration.py b/tempest/api/compute/admin/test_live_migration.py index 653a3cdf17..95310af98b 100644 --- a/tempest/api/compute/admin/test_live_migration.py +++ b/tempest/api/compute/admin/test_live_migration.py @@ -129,10 +129,6 @@ class LiveBlockMigrationTestJSON(base.BaseV2ComputeAdminTest): @test.idempotent_id('1e107f21-61b2-4988-8f22-b196e938ab88') @testtools.skipUnless(CONF.compute_feature_enabled.pause, '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): self._test_live_migration(state='PAUSED') diff --git a/tempest/config.py b/tempest/config.py index 14a6ad283c..5523fe2fe7 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -352,13 +352,6 @@ ComputeFeaturesGroup = [ help="Does the test environment block migration support " "cinder iSCSI volumes. Note, libvirt doesn't support this, " "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', default=False, help='Enable VNC console. This configuration value should ' @@ -394,12 +387,6 @@ ComputeFeaturesGroup = [ cfg.BoolOpt('personality', default=True, 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', default=True, help='Does the test environment support attaching an ' diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 79a5099c02..23264d53a6 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -626,9 +626,6 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): "admin_state_up of instance port to True") @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') def test_preserve_preexisting_port(self): """Test preserve pre-existing port