diff options
5 files changed, 16 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/rally/blacklist.yaml b/functest/opnfv_tests/openstack/rally/blacklist.yaml index 4c85088a8..77c514245 100644 --- a/functest/opnfv_tests/openstack/rally/blacklist.yaml +++ b/functest/opnfv_tests/openstack/rally/blacklist.yaml @@ -12,6 +12,11 @@ scenario: functionality: - functions: + - block_migration + tests: + - NovaServers.boot_server_from_volume_and_live_migrate + - + functions: - no_migration tests: - NovaServers.boot_and_live_migrate_server diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index f7c1ac400..dd1f039f8 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -117,6 +117,7 @@ class RallyBase(singlevm.VmReady2): task_args['smoke'] = self.smoke task_args['volume_version'] = self.VOLUME_VERSION task_args['volume_service_type'] = self.VOLUME_SERVICE_TYPE + task_args['block_migration'] = env.get("BLOCK_MIGRATION").lower() if self.ext_net: task_args['floating_network'] = str(self.ext_net.name) @@ -327,6 +328,8 @@ class RallyBase(singlevm.VmReady2): with open(RallyBase.BLACKLIST_FILE, 'r') as black_list_file: black_list_yaml = yaml.safe_load(black_list_file) + if env.get('BLOCK_MIGRATION').lower() == 'true': + func_list.append("block_migration") if not self._migration_supported(): func_list.append("no_migration") if not self._network_trunk_supported(): diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml index 0f4e7b26e..8ef5b6cdc 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml +++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml @@ -202,7 +202,7 @@ NovaServers.boot_and_live_migrate_server: - args: {{ vm_params(image_name, flavor_name) }} - block_migration: false + block_migration: {{ block_migration }} nics: - net-id: {{ netid }} context: @@ -217,7 +217,7 @@ args: {{ vm_params(image_name, flavor_name) }} size: 10 - block_migration: false + block_migration: {{ block_migration }} boot_server_kwargs: nics: - net-id: {{ netid }} @@ -233,7 +233,7 @@ NovaServers.boot_server_from_volume_and_live_migrate: - args: {{ vm_params(image_name, flavor_name) }} - block_migration: false + block_migration: {{ block_migration }} volume_size: 1 force_delete: false nics: diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml index b92494a43..935f3841a 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml +++ b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml @@ -1,7 +1,7 @@ NovaServers.boot_and_live_migrate_server: - args: {{ vm_params(image_name, flavor_name) }} - block_migration: false + block_migration: {{ block_migration }} nics: - net-id: {{ netid }} context: @@ -16,7 +16,7 @@ args: {{ vm_params(image_name, flavor_name) }} size: 10 - block_migration: false + block_migration: {{ block_migration }} boot_server_kwargs: nics: - net-id: {{ netid }} @@ -32,7 +32,7 @@ NovaServers.boot_server_from_volume_and_live_migrate: - args: {{ vm_params(image_name, flavor_name) }} - block_migration: false + block_migration: {{ block_migration }} volume_size: 1 force_delete: false nics: diff --git a/functest/utils/env.py b/functest/utils/env.py index c761f309b..58140204d 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -37,7 +37,8 @@ INPUTS = { 'FLAVOR_EXTRA_SPECS': '', 'NAMESERVER': '8.8.8.8', 'NEW_USER_ROLE': 'Member', - 'USE_DYNAMIC_CREDENTIALS': 'True' + 'USE_DYNAMIC_CREDENTIALS': 'True', + 'BLOCK_MIGRATION': 'True' } |