aboutsummaryrefslogtreecommitdiffstats
path: root/functest/utils
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2016-12-26 02:39:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-26 02:39:24 +0000
commit264814da718fcab0abf83e36fd1c3b960db16fd7 (patch)
tree1d30c2e4af9201c41e603258390605ff86cfa27c /functest/utils
parent76eae8230d0ad213bdca67dceb7ea212a3ac84f6 (diff)
parente4fea1c639b3f04998595bac43c7a45dea5c4c73 (diff)
Merge "refactor rally using new constants provider"
Diffstat (limited to 'functest/utils')
-rw-r--r--functest/utils/functest_constants.py2
-rw-r--r--functest/utils/functest_utils.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py
index e25d6e02..ac9d77c8 100644
--- a/functest/utils/functest_constants.py
+++ b/functest/utils/functest_constants.py
@@ -103,7 +103,7 @@ ONOS_SFC_RELATIVE_PATH = get_value('general.dir.dir_onos_sfc',
'ONOS_SFC_RELATIVE_PATH')
ONOS_SFC_IMAGE_BASE_URL = get_value('onos_sfc.image_base_url',
'ONOS_SFC_IMAGE_BASE_URL')
-RALLY_RELATIVE_PATH = get_value('general.dir.dir_rally',
+RALLY_RELATIVE_PATH = get_value('general.dir.rally',
'RALLY_RELATIVE_PATH')
RALLY_PRIVATE_NET_NAME = get_value('rally.network_name',
'RALLY_PRIVATE_NET_NAME')
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index 3145f573..1879e694 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -7,12 +7,14 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
#
+import functools
import json
import os
import re
import shutil
import subprocess
import sys
+import time
import urllib2
from datetime import datetime as dt
@@ -21,9 +23,6 @@ import requests
import yaml
from git import Repo
-import time
-import functools
-
import functest.utils.functest_logger as ft_logger
logger = ft_logger.Logger("functest_utils").getLogger()