Merge "Functest fail to parse refstack results"

[functest.git] / functest / tests / unit / odl / test_odl.py

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 937e371..6304d37 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -171,6 +171,7 @@ class ODLMainTesting(ODLTesting):
                 'RESTCONFPORT:{}'.format(self._odl_restconfport)]
             args[1].assert_called_once_with(
                 odl.ODLTests.basic_suite_dir, odl.ODLTests.neutron_suite_dir,
+                include=[],
                 log='NONE',
                 output=os.path.join(self.test.res_dir, 'output.xml'),
                 report='NONE', stdout=mock.ANY, variable=variable,
@@ -386,11 +387,16 @@ class ODLRunTesting(ODLTesting):
             odlip=self._sdn_controller_ip,
             odlwebport=self._odl_webport)
 
+    def test_fuel_no_controller_ip(self):
+        os.environ["INSTALLER_TYPE"] = "fuel"
+        self._test_missing_value()
+
     def test_fuel(self):
+        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
         os.environ["INSTALLER_TYPE"] = "fuel"
         self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=urllib.parse.urlparse(self._neutron_url).hostname,
-                       odlwebport='8181',
+                       odlip=self._sdn_controller_ip,
+                       odlwebport='8282',
                        odlrestconfport='8282')
 
     def test_apex_no_controller_ip(self):
@@ -416,9 +422,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):