From 976ee973affafe57bb7d498c77feacdcc6749433 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Mon, 11 May 2015 01:36:59 +0200 Subject: 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 --- testcases/vPing/CI/libraries/vPing.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testcases/vPing') 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) -- cgit 1.2.3-korg