aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-09-07 14:49:50 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-07 14:49:50 +0000
commit227afb8285b8f178987a7d6eb1d28a74201a5d1b (patch)
tree2501ab95b10e2958f93f6db7eba5fba66c136dd2 /testcases/OpenStack
parent800d0ed2c883a51122b7fa1aa4d9d86405ae5416 (diff)
parentf3381f49cc72fded67c1febe78b27e18ec396878 (diff)
Merge "remove imported FUNCTEST_REPO object"
Diffstat (limited to 'testcases/OpenStack')
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py10
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py6
-rw-r--r--testcases/OpenStack/vPing/vping_util.py13
3 files changed, 15 insertions, 14 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 7bd8b5356..536b4a5c2 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -20,14 +20,14 @@ import os
import re
import subprocess
import time
-import yaml
import argparse
+import iniparse
+import yaml
+
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as functest_utils
import functest.utils.openstack_utils as os_utils
-import iniparse
-from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH
tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
'neutron', 'nova', 'quotas', 'requests', 'vm', 'all']
@@ -75,8 +75,8 @@ logger = ft_logger.Logger("run_rally").getLogger()
functest_yaml = functest_utils.get_functest_yaml()
HOME = os.environ['HOME'] + "/"
-RALLY_DIR = REPO_PATH + '/' + functest_yaml.get("general").get(
- "directories").get("dir_rally")
+RALLY_DIR = functest_utils.FUNCTEST_REPO + '/' + \
+ functest_yaml.get("general").get("directories").get("dir_rally")
TEMPLATE_DIR = RALLY_DIR + "scenario/templates"
SUPPORT_DIR = RALLY_DIR + "scenario/support"
TEMP_DIR = RALLY_DIR + "var"
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index e93972182..c426eb63e 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -22,11 +22,11 @@ import sys
import time
import argparse
+import yaml
+
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
-import yaml
-from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO
modes = ['full', 'smoke', 'baremetal', 'compute', 'data_processing',
'identity', 'image', 'network', 'object_storage', 'orchestration',
@@ -90,7 +90,7 @@ RESULTS_DIR = functest_yaml.get("general").get("directories").get(
TEMPEST_RESULTS_DIR = RESULTS_DIR + '/tempest'
TEST_LIST_DIR = functest_yaml.get("general").get("directories").get(
"dir_tempest_cases")
-REPO_PATH = FUNCTEST_REPO + '/'
+REPO_PATH = ft_utils.FUNCTEST_REPO + '/'
TEMPEST_CUSTOM = REPO_PATH + TEST_LIST_DIR + 'test_list.txt'
TEMPEST_BLACKLIST = REPO_PATH + TEST_LIST_DIR + 'blacklist.txt'
TEMPEST_DEFCORE = REPO_PATH + TEST_LIST_DIR + 'defcore_req.txt'
diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py
index 7e7173aee..e85476e66 100644
--- a/testcases/OpenStack/vPing/vping_util.py
+++ b/testcases/OpenStack/vPing/vping_util.py
@@ -4,12 +4,13 @@ import re
import sys
import time
-import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_utils as os_utils
import paramiko
-from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH
from scp import SCPClient
+import functest.utils.functest_utils as ft_utils
+import functest.utils.openstack_utils as os_utils
+
+FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
functest_yaml = ft_utils.get_functest_yaml()
NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1")
@@ -57,8 +58,8 @@ def pMsg(value):
def check_repo_exist():
- if not os.path.exists(REPO_PATH):
- logger.error("Functest repository not found '%s'" % REPO_PATH)
+ if not os.path.exists(FUNCTEST_REPO):
+ logger.error("Functest repository not found '%s'" % FUNCTEST_REPO)
exit(-1)
@@ -339,7 +340,7 @@ def transfer_ping_script(ssh, floatip):
logger.info("Trying to transfer ping.sh to %s..." % floatip)
scp = SCPClient(ssh.get_transport())
- ping_script = REPO_PATH + '/' + "testcases/OpenStack/vPing/ping.sh"
+ ping_script = FUNCTEST_REPO + "/testcases/OpenStack/vPing/ping.sh"
try:
scp.put(ping_script, "~/")
except: