diff options
Diffstat (limited to 'testcases/vPing/CI')
-rw-r--r-- | testcases/vPing/CI/libraries/vPing_ssh.py | 8 | ||||
-rw-r--r-- | testcases/vPing/CI/libraries/vPing_userdata.py | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/vPing/CI/libraries/vPing_ssh.py index dc46c89d4..3d2ff7084 100644 --- a/testcases/vPing/CI/libraries/vPing_ssh.py +++ b/testcases/vPing/CI/libraries/vPing_ssh.py @@ -20,15 +20,18 @@ import os import paramiko import pprint import re -import sys import time import yaml from scp import SCPClient + from novaclient import client as novaclient from neutronclient.v2_0 import client as neutronclient from keystoneclient.v2_0 import client as keystoneclient from glanceclient import client as glanceclient +import functest_utils +import openstack_utils + pp = pprint.PrettyPrinter(indent=4) parser = argparse.ArgumentParser() @@ -64,9 +67,6 @@ REPO_PATH = os.environ['repos_dir'] + '/functest/' if not os.path.exists(REPO_PATH): logger.error("Functest repository directory not found '%s'" % REPO_PATH) exit(-1) -sys.path.append(REPO_PATH + "testcases/") -import functest_utils -import openstack_utils with open("/home/opnfv/functest/conf/config_functest.yaml") as f: functest_yaml = yaml.safe_load(f) diff --git a/testcases/vPing/CI/libraries/vPing_userdata.py b/testcases/vPing/CI/libraries/vPing_userdata.py index 20a47aeaf..0adfc6dbd 100644 --- a/testcases/vPing/CI/libraries/vPing_userdata.py +++ b/testcases/vPing/CI/libraries/vPing_userdata.py @@ -14,19 +14,22 @@ # # -import os -import time import argparse -import pprint -import sys +import datetime import logging +import os +import pprint +import time import yaml -import datetime + from novaclient import client as novaclient from neutronclient.v2_0 import client as neutronclient from keystoneclient.v2_0 import client as keystoneclient from glanceclient import client as glanceclient +import functest_utils +import openstack_utils + pp = pprint.PrettyPrinter(indent=4) parser = argparse.ArgumentParser() @@ -61,9 +64,6 @@ REPO_PATH = os.environ['repos_dir'] + '/functest/' if not os.path.exists(REPO_PATH): logger.error("Functest repository directory not found '%s'" % REPO_PATH) exit(-1) -sys.path.append(REPO_PATH + "testcases/") -import functest_utils -import openstack_utils with open("/home/opnfv/functest/conf/config_functest.yaml") as f: functest_yaml = yaml.safe_load(f) |