From 5c178f0d30f0701dee0d0a629023f05edfde338e Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 28 Sep 2017 12:42:30 +0200
Subject: Switch to OS_PROJECT_NAME
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It simply conforms with OpenStack keystone v3.

JIRA: FUNCTEST-877

Change-Id: I989a6eb4d8564948927c184a899b62ca763ef824
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 functest/opnfv_tests/sdn/odl/odl.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'functest/opnfv_tests/sdn/odl')

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',
-- 
cgit 1.2.3-korg