diff options
| -rw-r--r-- | docker/requirements.pip | 8 | ||||
| -rw-r--r-- | testcases/features/promise.py | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/docker/requirements.pip b/docker/requirements.pip index e2b67d3bd..0ecb447ca 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -9,12 +9,8 @@ # pyyaml==3.10 gitpython==1.0.1 -python-neutronclient==2.6.0 -python-novaclient==2.28.1 -python-glanceclient==1.1.0 -python-cinderclient==1.4.0 +python-openstackclient==2.0.0 python-ceilometerclient==1.5.1 -python-keystoneclient==1.6.0 virtualenv==1.11.4 pexpect==4.0 requests==2.8.0 @@ -25,4 +21,4 @@ configObj==5.0.6 Flask==0.10.1 xmltodict==0.9.2 scp==0.10.2 -paramiko==1.16.0
\ No newline at end of file +paramiko==1.16.0 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+') |