diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-09-28 12:42:30 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-09-28 12:42:30 +0200 |
| commit | 5c178f0d30f0701dee0d0a629023f05edfde338e (patch) | |
| tree | 1e09ec594e60f1c05c893d3b43c1c9c9c7a0a461 /functest/opnfv_tests/sdn/odl/odl.py | |
| parent | 405a0872282f5b29bb9e60ba19b11b17c8047647 (diff) | |
Switch to OS_PROJECT_NAME
It simply conforms with OpenStack keystone v3.
JIRA: FUNCTEST-877
Change-Id: I989a6eb4d8564948927c184a899b62ca763ef824
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/sdn/odl/odl.py')
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index dd313ffe..a8312ab3 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -127,7 +127,7 @@ class ODLTests(testcase.TestCase): * osauthurl, * neutronurl, * osusername, - * ostenantname, + * osprojectname, * ospassword, * odlip, * odlwebport, @@ -161,7 +161,7 @@ class ODLTests(testcase.TestCase): 'OSUSERNAME:"' + kwargs['osusername'] + '"', ('OSUSERDOMAINNAME:"' + kwargs['osuserdomainname'] + '"'), - 'OSTENANTNAME:"' + kwargs['ostenantname'] + '"', + 'OSTENANTNAME:"' + kwargs['osprojectname'] + '"', ('OSPROJECTDOMAINNAME:"' + kwargs['osprojectdomainname'] + '"'), 'OSPASSWORD:"' + kwargs['ospassword'] + '"', @@ -229,7 +229,7 @@ class ODLTests(testcase.TestCase): kwargs['osusername'] = os.environ['OS_USERNAME'] kwargs['osuserdomainname'] = os.environ.get( 'OS_USER_DOMAIN_NAME', 'Default') - kwargs['ostenantname'] = os.environ['OS_TENANT_NAME'] + kwargs['osprojectname'] = os.environ['OS_PROJECT_NAME'] kwargs['osprojectdomainname'] = os.environ.get( 'OS_PROJECT_DOMAIN_NAME', 'Default') kwargs['osauthurl'] = os.environ['OS_AUTH_URL'] @@ -281,7 +281,7 @@ class ODLParser(object): # pylint: disable=too-few-public-methods '-f', '--osuserdomainname', help='User domain name for OpenStack', default='Default') self.parser.add_argument( - '-b', '--ostenantname', help='Tenantname for OpenStack', + '-b', '--osprojectname', help='Projet name for OpenStack', default='admin') self.parser.add_argument( '-g', '--osprojectdomainname', |