aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/vPing/CI
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-05-11 01:36:59 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2015-05-11 01:41:44 +0200
commit976ee973affafe57bb7d498c77feacdcc6749433 (patch)
tree292bf0eb7d3ad4cc46be9774c9f7fc02d43efb38 /testcases/vPing/CI
parent470bd82376f3f8ac3e213ca80d1a30d6fe499b50 (diff)
config_functest.py: added create neutron network.
vPing.py: some adaptations and bug fixes JIRA: FUNCTEST-1 JIRA: FUNCTEST-3 Change-Id: Ie8ee80c2ab61904bf4b5025d23034ef0265b509e Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'testcases/vPing/CI')
-rw-r--r--testcases/vPing/CI/libraries/vPing.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py
index d140eee18..b81ebb881 100644
--- a/testcases/vPing/CI/libraries/vPing.py
+++ b/testcases/vPing/CI/libraries/vPing.py
@@ -22,8 +22,8 @@ import cinderclient.v1.client as cinderclient
pp = pprint.PrettyPrinter(indent=4)
EXIT_CODE = -1
-
-with open('../functest.yaml') as f:
+HOME = os.environ['HOME']+"/"
+with open(HOME+'.functest/functest.yaml') as f:
functest_yaml = yaml.safe_load(f)
f.close()
@@ -145,7 +145,7 @@ def main():
logger.info("Network found '%s'" %net.human_id)
network_found = True
if not network_found:
- logger.error("ERROR: Neutron network %s not found." % NEUTRON_NET_NAME)
+ logger.error("Neutron network %s not found." % NEUTRON_NET_NAME)
logger.info("Available networks are: ")
pMsg(nova.networks.list())
exit(-1)