aboutsummaryrefslogtreecommitdiffstats
path: root/functest/ci
diff options
context:
space:
mode:
authorhelenyao <yaohelan@huawei.com>2017-01-22 20:51:25 -0500
committerhelenyao <yaohelan@huawei.com>2017-01-25 04:02:06 -0500
commitbeb890ea4d09e06922328e70d49b1b57e1989c47 (patch)
treeddb14c676eef1c71947e8462fc37c6cc4ad4fccb /functest/ci
parent34aab533f4a6c20676eb2a2b6843d5980ea3ac17 (diff)
Refactor Rally to adopt OO
JIRA: FUNCTEST-541 Change-Id: Ife04f58dc31ca9ba6316cc31577f81a6bf0e0405 Signed-off-by: helenyao <yaohelan@huawei.com>
Diffstat (limited to 'functest/ci')
-rwxr-xr-xfunctest/ci/exec_test.sh7
-rwxr-xr-xfunctest/ci/prepare_env.py5
-rwxr-xr-xfunctest/ci/run_tests.py4
-rwxr-xr-xfunctest/ci/testcases.yaml6
4 files changed, 6 insertions, 16 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 7c96d69c..54a7c624 100755
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -93,13 +93,6 @@ function run_test(){
"vims")
python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report
;;
- "rally_full")
- python ${FUNCTEST_TEST_DIR}/openstack/rally/run_rally-cert.py $clean_flag all $report
- ;;
- "rally_sanity")
- python ${FUNCTEST_TEST_DIR}/openstack/rally/run_rally-cert.py \
- $clean_flag --sanity all $report
- ;;
"onos")
python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py
;;
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index 74c751af..8bbdf18b 100755
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -184,11 +184,6 @@ def source_rc_file():
CONST.OS_TENANT_NAME = value
elif key == 'OS_PASSWORD':
CONST.OS_PASSWORD = value
- logger.debug("Used credentials: %s" % str)
- logger.debug("OS_AUTH_URL:%s" % CONST.OS_AUTH_URL)
- logger.debug("OS_USERNAME:%s" % CONST.OS_USERNAME)
- logger.debug("OS_TENANT_NAME:%s" % CONST.OS_TENANT_NAME)
- logger.debug("OS_PASSWORD:%s" % CONST.OS_PASSWORD)
def patch_config_file():
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index a5f1ab9e..ef080016 100755
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -93,10 +93,6 @@ def source_rc_file():
elif key == 'OS_PASSWORD':
ft_constants.OS_PASSWORD = value
CONST.OS_PASSWORD = value
- logger.debug("OS_AUTH_URL:%s" % CONST.OS_AUTH_URL)
- logger.debug("OS_USERNAME:%s" % CONST.OS_USERNAME)
- logger.debug("OS_TENANT_NAME:%s" % CONST.OS_TENANT_NAME)
- logger.debug("OS_PASSWORD:%s" % CONST.OS_PASSWORD)
def generate_os_snapshot():
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index ede08285..78596926 100755
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -81,6 +81,9 @@ tiers:
dependencies:
installer: ''
scenario: '^((?!bgpvpn).)*$'
+ run:
+ module: 'functest.opnfv_tests.openstack.rally.rally'
+ class: 'RallySanity'
-
name: odl
@@ -325,6 +328,9 @@ tiers:
dependencies:
installer: '^((?!netvirt).)*$'
scenario: ''
+ run:
+ module: 'functest.opnfv_tests.openstack.rally.rally'
+ class: 'RallyFull'
-
name: vnf