From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 4 Sep 2018 09:18:08 +0000 (+0200)
Subject: Protect vs OS_ENDPOINT_TYPE in shaker
X-Git-Tag: opnfv-7.0.0~68^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d3341296961b04cb7a2ba54a5dcb30f7364a6ae1;p=functest.git

Protect vs OS_ENDPOINT_TYPE in shaker

Else a conflict can occur between OS_INTERFACE and OS_ENDPOINT_TYPE.

Change-Id: I3e0237857f95e506706fb852889308ea82e41e84
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index c005df055..1170fede3 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -88,6 +88,7 @@ class Shaker(singlevm.SingleVm2):
             'export OS_PROJECT_ID={} && '
             'unset OS_TENANT_NAME && '
             'unset OS_TENANT_ID && '
+            'unset OS_ENDPOINT_TYPE && '
             'export OS_PASSWORD={} && '
             '{}'
             'env && '