aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2016-10-17 13:12:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-17 13:12:05 +0000
commitd2f0caf036d3d6bf872ea52839a1a2aef623ea27 (patch)
tree60a0920982d9682c6493ef1f6f66bd657d582f22
parent9b123ca35d1bf8f7a9320d976f1f0e2425549df0 (diff)
parent0bb64c15f2dbc5ce6a4dafe2fd846fa8d58b17cd (diff)
Merge "Unify rally test case exclusion mechanisms"
-rw-r--r--testcases/OpenStack/rally/blacklist.txt26
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py65
-rw-r--r--testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml4
-rw-r--r--testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml4
4 files changed, 65 insertions, 34 deletions
diff --git a/testcases/OpenStack/rally/blacklist.txt b/testcases/OpenStack/rally/blacklist.txt
index 02d85f4d8..3a17fa616 100644
--- a/testcases/OpenStack/rally/blacklist.txt
+++ b/testcases/OpenStack/rally/blacklist.txt
@@ -1,8 +1,18 @@
--
- scenarios:
- - os-nosdn-lxd-ha
- - os-nosdn-lxd-noha
- installers:
- - joid
- tests:
- - NovaServers.boot_server_from_volume_and_delete
+scenario:
+ -
+ scenarios:
+ - os-nosdn-lxd-ha
+ - os-nosdn-lxd-noha
+ installers:
+ - joid
+ tests:
+ - NovaServers.boot_server_from_volume_and_delete
+
+functionality:
+ -
+ functions:
+ - no_live_migration
+ tests:
+ - NovaServers.boot_and_live_migrate_server
+ - NovaServers.boot_server_attach_created_volume_and_live_migrate
+ - NovaServers.boot_server_from_volume_and_live_migrate
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index d35639cc8..90084a127 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -187,7 +187,6 @@ def build_task_args(test_file_name):
net_id = network_dict['net_id']
task_args['netid'] = str(net_id)
- task_args['live_migration'] = live_migration_supported()
auth_url = os.getenv('OS_AUTH_URL')
if auth_url is not None:
@@ -273,30 +272,60 @@ def get_cmd_output(proc):
return result
-def apply_blacklist(case_file_name, result_file_name):
- logger.debug("Applying blacklist...")
- cases_file = open(case_file_name, 'r')
- result_file = open(result_file_name, 'w')
+def excl_scenario():
black_tests = []
try:
+ with open(BLACKLIST_FILE, 'r') as black_list_file:
+ black_list_yaml = yaml.safe_load(black_list_file)
+
installer_type = os.getenv('INSTALLER_TYPE')
deploy_scenario = os.getenv('DEPLOY_SCENARIO')
if (bool(installer_type) * bool(deploy_scenario)):
- # if INSTALLER_TYPE and DEPLOY_SCENARIO are set we read the file
- with open(BLACKLIST_FILE, 'r') as black_list_file:
- black_list_yaml = yaml.safe_load(black_list_file)
-
- for item in black_list_yaml:
- scenarios = item['scenarios']
- installers = item['installers']
- if (deploy_scenario in scenarios and
- installer_type in installers):
- tests = item['tests']
- black_tests.extend(tests)
+ if 'scenario' in black_list_yaml.keys():
+ for item in black_list_yaml['scenario']:
+ scenarios = item['scenarios']
+ installers = item['installers']
+ if (deploy_scenario in scenarios and
+ installer_type in installers):
+ tests = item['tests']
+ black_tests.extend(tests)
+ except:
+ logger.debug("Scenario exclusion not applied.")
+
+ return black_tests
+
+
+def excl_func():
+ black_tests = []
+ func_list = []
+
+ try:
+ with open(BLACKLIST_FILE, 'r') as black_list_file:
+ black_list_yaml = yaml.safe_load(black_list_file)
+
+ if not live_migration_supported():
+ func_list.append("no_live_migration")
+
+ if 'functionality' in black_list_yaml.keys():
+ for item in black_list_yaml['functionality']:
+ functions = item['functions']
+ for func in func_list:
+ if func in functions:
+ tests = item['tests']
+ black_tests.extend(tests)
except:
- black_tests = []
- logger.debug("Blacklisting not applied.")
+ logger.debug("Functionality exclusion not applied.")
+
+ return black_tests
+
+
+def apply_blacklist(case_file_name, result_file_name):
+ logger.debug("Applying blacklist...")
+ cases_file = open(case_file_name, 'r')
+ result_file = open(result_file_name, 'w')
+
+ black_tests = list(set(excl_func() + excl_scenario()))
include = True
for cases_line in cases_file:
diff --git a/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml b/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml
index 077850f53..d7622093d 100644
--- a/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml
+++ b/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml
@@ -227,8 +227,6 @@
sla:
{{ no_failures_sla() }}
-{% if live_migration %}
-
NovaServers.boot_and_live_migrate_server:
- args:
{{ vm_params(image_name, flavor_name) }}
@@ -273,8 +271,6 @@
sla:
{{ no_failures_sla() }}
-{% endif %}
-
NovaKeypair.boot_and_delete_server_with_keypair:
-
args:
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml b/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
index 947819dc7..e2795cf71 100644
--- a/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
+++ b/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
@@ -1,5 +1,3 @@
-{% if live_migration %}
-
NovaServers.boot_and_live_migrate_server:
- args:
{{ vm_params(image_name, flavor_name) }}
@@ -44,8 +42,6 @@
sla:
{{ no_failures_sla() }}
-{% endif %}
-
NovaKeypair.boot_and_delete_server_with_keypair:
-
args: