aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/sdn/odl
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-09-08 07:33:23 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-08 10:14:33 +0200
commit65e832cc579b86fd82864612bd35b387e3ada5e1 (patch)
treee0487b1acedde8824d1a2acdf86b0e3cf40b7fbd /functest/opnfv_tests/sdn/odl
parent1df61603c6de7880bdd366b979c0a202d3cb8692 (diff)
Update ODL testcase to Keystone v3
As basic neutron tests have been updated [1], ODL testcase must manage user domain and project domain names. [1] https://git.opendaylight.org/gerrit/#/c/62846/ JIRA: FUNCTEST-862 Change-Id: I61ef622f840b8d825cf45a3557bd6da14a4d3cb7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/sdn/odl')
-rw-r--r--functest/opnfv_tests/sdn/odl/odl.py17
1 files changed, 16 insertions, 1 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index ab70ba10..d09532cb 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -157,7 +157,11 @@ class ODLTests(testcase.TestCase):
'NEUTRON:' + kwargs['neutronip'],
'OS_AUTH_URL:"' + osauthurl + '"',
'OSUSERNAME:"' + kwargs['osusername'] + '"',
+ ('OSUSERDOMAINNAME:"' +
+ kwargs['osuserdomainname'] + '"'),
'OSTENANTNAME:"' + kwargs['ostenantname'] + '"',
+ ('OSPROJECTDOMAINNAME:"' +
+ kwargs['osprojectdomainname'] + '"'),
'OSPASSWORD:"' + kwargs['ospassword'] + '"',
'ODL_SYSTEM_IP:' + kwargs['odlip'],
'PORT:' + kwargs['odlwebport'],
@@ -221,7 +225,11 @@ class ODLTests(testcase.TestCase):
if 'INSTALLER_TYPE' in os.environ:
installer_type = os.environ['INSTALLER_TYPE']
kwargs['osusername'] = os.environ['OS_USERNAME']
+ kwargs['osuserdomainname'] = os.environ.get(
+ 'OS_USER_DOMAIN_NAME', 'Default')
kwargs['ostenantname'] = os.environ['OS_TENANT_NAME']
+ kwargs['osprojectdomainname'] = os.environ.get(
+ 'OS_PROJECT_DOMAIN_NAME', 'Default')
kwargs['osauthurl'] = os.environ['OS_AUTH_URL']
kwargs['ospassword'] = os.environ['OS_PASSWORD']
if installer_type == 'fuel':
@@ -263,14 +271,21 @@ class ODLParser(object): # pylint: disable=too-few-public-methods
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')
+ default='http://127.0.0.1:5000/v3')
self.parser.add_argument(
'-a', '--osusername', help='Username for OpenStack',
default='admin')
self.parser.add_argument(
+ '-f', '--osuserdomainname', help='User domain name for OpenStack',
+ default='Default')
+ self.parser.add_argument(
'-b', '--ostenantname', help='Tenantname for OpenStack',
default='admin')
self.parser.add_argument(
+ '-g', '--osprojectdomainname',
+ help='Project domain name for OpenStack',
+ default='Default')
+ self.parser.add_argument(
'-c', '--ospassword', help='Password for OpenStack',
default='admin')
self.parser.add_argument(