Introduce smoke tests for FDS

Added:
 - fds repository to docker file
 - fds test to smoke tier in testcases
 - config values for fds tests

A new robot var OS_AUTH_URL is defined as expected by FDS robot files.
Method args switch from Keystone IP to OS_AUTH_URL which is more
precised. The argument parsing is changed too.

Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>

Change-Id: Ife27ab4a83f0110cbdcf7c9d47d9b3fb4c0ec705
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 69818f5a..c8e9c492 100755
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -94,8 +94,11 @@ class ODLTests(testcase_base.TestcaseBase):
         try:
             odlusername = kwargs['odlusername']
             odlpassword = kwargs['odlpassword']
-            variables = ['KEYSTONE:' + kwargs['keystoneip'],
+            osauthurl = kwargs['osauthurl']
+            keystoneip = urlparse.urlparse(osauthurl).hostname
+            variables = ['KEYSTONE:' + keystoneip,
                          'NEUTRON:' + kwargs['neutronip'],
+                         'OS_AUTH_URL:"' + osauthurl + '"',
                          'OSUSERNAME:"' + kwargs['osusername'] + '"',
                          'OSTENANTNAME:"' + kwargs['ostenantname'] + '"',
                          'OSPASSWORD:"' + kwargs['ospassword'] + '"',
@@ -147,10 +150,8 @@ class ODLTests(testcase_base.TestcaseBase):
                 suites = kwargs["suites"]
             except KeyError:
                 pass
-            keystone_url = op_utils.get_endpoint(service_type='identity')
             neutron_url = op_utils.get_endpoint(service_type='network')
-            kwargs = {'keystoneip': urlparse.urlparse(keystone_url).hostname}
-            kwargs['neutronip'] = urlparse.urlparse(neutron_url).hostname
+            kwargs = {'neutronip': urlparse.urlparse(neutron_url).hostname}
             kwargs['odlip'] = kwargs['neutronip']
             kwargs['odlwebport'] = '8080'
             kwargs['odlrestconfport'] = '8181'
@@ -161,6 +162,7 @@ class ODLTests(testcase_base.TestcaseBase):
                 installer_type = os.environ['INSTALLER_TYPE']
             kwargs['osusername'] = os.environ['OS_USERNAME']
             kwargs['ostenantname'] = os.environ['OS_TENANT_NAME']
+            kwargs['osauthurl'] = os.environ['OS_AUTH_URL']
             kwargs['ospassword'] = os.environ['OS_PASSWORD']
             if installer_type == 'fuel':
                 kwargs['odlwebport'] = '8282'
@@ -191,12 +193,12 @@ class ODLParser(object):
     def __init__(self):
         self.parser = argparse.ArgumentParser()
         self.parser.add_argument(
-            '-k', '--keystoneip', help='Keystone IP',
-            default='127.0.0.1')
-        self.parser.add_argument(
             '-n', '--neutronip', help='Neutron IP',
             default='127.0.0.1')
         self.parser.add_argument(
+            '-k', '--osauthurl', help='OS_AUTH_URL as defined by OpenStack',
+            default='http://127.0.0.1:5000/v2.0')
+        self.parser.add_argument(
             '-a', '--osusername', help='Username for OpenStack',
             default='admin')
         self.parser.add_argument(