From c64198994550781c8cbbb68f55501cd47178250f Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Mon, 1 Feb 2016 13:57:33 +0100 Subject: Export private net OS_TEST_NETWORK for Promise tests Change-Id: Ie2e83a049a98f8e63245c3b992ff379fd353a0be Signed-off-by: jose.lausuch (cherry picked from commit cc8dd9e8092cc68484d8ad3422c97762658271e8) --- testcases/features/promise.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testcases/features/promise.py b/testcases/features/promise.py index 0dc755b57..22d28fb99 100644 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -20,6 +20,7 @@ import yaml import keystoneclient.v2_0.client as ksclient import glanceclient.client as glclient import novaclient.client as nvclient +from neutronclient.v2_0 import client as ntclient parser = argparse.ArgumentParser() @@ -172,6 +173,13 @@ def main(): exit(-1) logger.debug("Flavor '%s' with ID '%s' created successfully." % (FLAVOR_NAME, flavor_id)) + neutron = ntclient.Client(**nt_creds) + private_net=functest_utils.get_private_net(neutron) + if private_net == None: + logger.error("There is no private network in the deployment. Aborting...") + exit(-1) + logger.debug("Using private network '%s' (%s)." % (private_net['name'], + private_net['id'])) logger.info("Exporting environment variables...") os.environ["NODE_ENV"] = "functest" @@ -180,6 +188,8 @@ def main(): os.environ["OS_PASSWORD"] = USER_PWD os.environ["OS_TEST_IMAGE"] = image_id os.environ["OS_TEST_FLAVOR"] = flavor_id + os.environ["OS_TEST_NETWORK"] = private_net['id'] + os.chdir(PROMISE_REPO) results_file=open('promise-results.json','w+') -- cgit 1.2.3-korg