Merge "Refactor TempestCommon to simplify subclasses"

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 0940fad..1fe2c6b 100644 (file)
--- 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 937e371..88adb3e 100644 (file)
--- 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):