diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-12-22 17:51:15 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-12-26 08:56:05 +0800 |
| commit | e4fea1c639b3f04998595bac43c7a45dea5c4c73 (patch) | |
| tree | f0b1b58a440ec3477f3694b0a16639b6fd14038c /functest/utils | |
| parent | 016c5aee944227e07f244839d3d518a3b33a82c8 (diff) | |
refactor rally using new constants provider
JIRA: FUNCTEST-673
Change-Id: I4b542a7693aaf7dd037e0e55dee3f22dda8df27a
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'functest/utils')
| -rw-r--r-- | functest/utils/functest_constants.py | 2 | ||||
| -rw-r--r-- | functest/utils/functest_utils.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py index dd2caf05..3cdcad67 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() |