commit d91094deacc469a015856562881edeb802520e06
author Masayuki Igawa <masayuki@igawa.me> Wed Apr 12 16:20:09 2017 +0900
committer Masayuki Igawa <masayuki@igawa.me> Wed Apr 12 17:35:18 2017 +0900
tree b8795dbf83689f7bc48ec14275d27b29824f32d7
parent 31815fbab40c8ccf3a6eb211ebaf75fa111a7dca

Remove skip condition when resize is enable

This commit removes the skip condition with flavor_ref and
flavor_ref_alt when the resize feature is enable. Because when
resize feature is enable, the flavor_ref and flavor_ref_alt should be
set properly, otherwise, it is a misconfiguration. So we should fail
but not skip at the situation.

And This commit also add a help message for the resize config to avoid
users confusing.

Change-Id: I8eab2e57eb77e7a1a8dae7ffd63ec95ae6a026c3

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 00c69b0..ee4f844 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -353,7 +353,10 @@
                      "serial console output?"),
     cfg.BoolOpt('resize',
                 default=False,
-                help="Does the test environment support resizing?"),
+                help="Does the test environment support resizing? When you "
+                     "enable this feature, 'flavor_ref_alt' should be set and "
+                     "it should refer to a larger flavor than 'flavor_ref' "
+                     "one."),
     cfg.BoolOpt('pause',
                 default=True,
                 help="Does the test environment support pausing?"),

tempest/scenario/test_network_advanced_server_ops.py

diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
index 6665fa7..10babfa 100644
--- a/tempest/scenario/test_network_advanced_server_ops.py
+++ b/tempest/scenario/test_network_advanced_server_ops.py
@@ -185,9 +185,6 @@
     @test.services('compute', 'network')
     def test_server_connectivity_resize(self):
         resize_flavor = CONF.compute.flavor_ref_alt
-        if resize_flavor == CONF.compute.flavor_ref:
-            msg = "Skipping test - flavor_ref and flavor_ref_alt are identical"
-            raise self.skipException(msg)
         keypair = self.create_keypair()
         server = self._setup_server(keypair)
         floating_ip = self._setup_network(server, keypair)

tempest/scenario/test_server_advanced_ops.py

diff --git a/tempest/scenario/test_server_advanced_ops.py b/tempest/scenario/test_server_advanced_ops.py
index cc3687f..487350e 100644
--- a/tempest/scenario/test_server_advanced_ops.py
+++ b/tempest/scenario/test_server_advanced_ops.py
@@ -45,11 +45,6 @@
     @decorators.idempotent_id('e6c28180-7454-4b59-b188-0257af08a63b')
     @testtools.skipUnless(CONF.compute_feature_enabled.resize,
                           'Resize is not available.')
-    @testtools.skipUnless(CONF.compute.flavor_ref !=
-                          CONF.compute.flavor_ref_alt
-                          and CONF.compute.flavor_ref_alt != "",
-                          'The flavor_ref_alt option should not be empty and '
-                          'should not be identical with flavor_ref')
     @test.services('compute', 'volume')
     def test_resize_volume_backed_server_confirm(self):
         # We create an instance for use in this test