summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2018-03-14 04:17:05 +0000
committerLinda Wang <wangwulin@huawei.com>2018-03-14 06:33:37 +0000
commit3b5c3061ea9d03d124fa42d2e4f00cf26b06c535 (patch)
treed04ba55cb4d5128837bff361fac9aabc6a092633
parent7e2fa1942daf7b276064ca6bd7a4fcc87de16578 (diff)
Get odl ip from env on Compass
Change-Id: I9ed2cdeef461c27381ecdfd56e5347ded61b5cb8 Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--functest/opnfv_tests/sdn/odl/odl.py1
-rw-r--r--functest/tests/unit/odl/test_odl.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 0940fadca..1fe2c6bc3 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -183,6 +183,7 @@ class ODLTests(robotframework.RobotFramework):
kwargs['odlwebport'] = '8081'
kwargs['odlrestconfport'] = '8081'
elif installer_type == 'compass':
+ kwargs['odlip'] = env.get('SDN_CONTROLLER_IP')
kwargs['odlrestconfport'] = '8080'
elif installer_type == 'daisy':
kwargs['odlip'] = env.get('SDN_CONTROLLER_IP')
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 937e37120..88adb3e77 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -416,9 +416,10 @@ class ODLRunTesting(ODLTesting):
odlrestconfport='8081')
def test_compass(self):
+ os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
os.environ["INSTALLER_TYPE"] = "compass"
self._test_run(testcase.TestCase.EX_OK, None,
- odlip=urllib.parse.urlparse(self._neutron_url).hostname,
+ odlip=self._sdn_controller_ip,
odlrestconfport='8080')
def test_daisy_no_controller_ip(self):