From 8a00300b730d7302aff5f23e51669f1c12ef369e Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 24 Jul 2018 11:12:25 +0200
Subject: Protect vs OS_TENANT_NAME or _ID in shaker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It fixes the possible mismatch if both OS_TENANT and OS_PROJECT are
set [1].
[1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/lastFailedBuild/console
Change-Id: I66b6e3cf30a34aff1234da00cdd6b40da92089e5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
functest/opnfv_tests/openstack/shaker/shaker.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 51244e2d5..097d9b2a7 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -84,6 +84,9 @@ class Shaker(singlevm.SingleVm2):
'export OS_AUTH_URL={} && '
'export OS_USERNAME={} && '
'export OS_PROJECT_NAME={} && '
+ 'export OS_PROJECT_ID={} && '
+ 'unset OS_TENANT_NAME && '
+ 'unset OS_TENANT_ID && '
'export OS_PASSWORD={} && '
'{}'
'env && '
@@ -95,7 +98,7 @@ class Shaker(singlevm.SingleVm2):
'openstack/perf_l3_north_south '
'--report report.html --output report.json'.format(
endpoint, self.project.user.name, self.project.project.name,
- self.project.password,
+ self.project.project.id, self.project.password,
'export OS_CACERT=~/os_cacert && ' if os.environ.get(
'OS_CACERT') else '',
self.image.name, self.flavor.name,
--
cgit