summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuraj.linkes <jlinkes@cisco.com>2017-10-13 10:23:51 +0200
committerJuraj LinkeŇ° <jlinkes@cisco.com>2017-10-14 07:54:55 +0000
commit79abfac1134b046fb357b5fdcfcfede13993e44b (patch)
treed70b28e7115b53d49441cc5231da193c8458a85b
parent3b3b7fa88c7095fac301b040be2967c5c484f34d (diff)
Fds testcase fixes for v3 creds
V3 creds changed and no longer feature project id, which needed to be changed to project name along with project domain name. Also updated the path to images which changed with the introduction of Alpine containers. Change-Id: I75916a6632514de9206b824a0957eb0491f7b96a Signed-off-by: juraj.linkes <jlinkes@cisco.com> (cherry picked from commit a11ef12edc19d755e0e03f2615a8a2019e805875)
-rw-r--r--testing/robot/data/test_data.py2
-rw-r--r--testing/robot/lib/FDSLibrary.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/testing/robot/data/test_data.py b/testing/robot/data/test_data.py
index 86ca8fc..fe7a2cc 100644
--- a/testing/robot/data/test_data.py
+++ b/testing/robot/data/test_data.py
@@ -23,7 +23,7 @@ port2_name = 'fds_smoke_port2_' + run_uuid
subnet_cidr = '192.168.10.0/24'
vm_flavor = 'nfv-fds'
vm_image = 'cirros-0.3.5'
-image_path = '/home/opnfv/functest/data/cirros-0.3.5-x86_64-disk.img'
+image_path = '/home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img'
userdata1 = "#!/bin/sh\n\nsudo ip a add {}/24 dev eth0\n while true; do echo curl_passed | nc -l -p 80; done\n".format(vm1_address)
userdata2 = "#!/bin/sh\n\nsudo ip a add {}/24 dev eth0\nwhile true; do\n ping -c 1 {} 2>&1 >/dev/null\n " \
"RES=$?\n if [ \"Z$RES\" = \"Z0\" ] ; then\n echo 'ping PASSED'\n break\n else\n echo " \
diff --git a/testing/robot/lib/FDSLibrary.py b/testing/robot/lib/FDSLibrary.py
index 829bbcb..8e64399 100644
--- a/testing/robot/lib/FDSLibrary.py
+++ b/testing/robot/lib/FDSLibrary.py
@@ -25,9 +25,10 @@ class FDSLibrary():
if os.getenv('OS_IDENTITY_API_VERSION') == '3':
auth = v3.Password(auth_url=os.getenv('OS_AUTH_URL'),
username=os.getenv('OS_USERNAME'),
+ user_domain_name=os.getenv('OS_USER_DOMAIN_NAME'),
password=os.getenv('OS_PASSWORD'),
- project_id=os.getenv('OS_PROJECT_ID'),
- user_domain_name=os.getenv('OS_USER_DOMAIN_NAME'))
+ project_name=os.getenv('OS_PROJECT_NAME'),
+ project_domain_name=os.getenv('OS_PROJECT_DOMAIN_NAME'))
else:
auth = v2.Password(username=os.getenv('OS_USERNAME'),
password=os.getenv('OS_PASSWORD'),