Export private net OS_TEST_NETWORK for Promise tests 77/8877/1
authorjose.lausuch <jose.lausuch@ericsson.com>
Mon, 1 Feb 2016 12:57:33 +0000 (13:57 +0100)
committerMorgan Richomme <morgan.richomme@orange.com>
Mon, 1 Feb 2016 13:37:36 +0000 (13:37 +0000)
Change-Id: Ie2e83a049a98f8e63245c3b992ff379fd353a0be
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
(cherry picked from commit cc8dd9e8092cc68484d8ad3422c97762658271e8)

testcases/features/promise.py

index 0dc755b..22d28fb 100644 (file)
@@ -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+')