Remove logics about Daisy in odl

Daisy is now setting the right env vars [1].

[1] https://gerrit.opnfv.org/gerrit/#/c/59839/1

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

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 43476d8..2275c2d 100644 (file)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -186,9 +186,6 @@ class ODLTests(robotframework.RobotFramework):
                 kwargs['odlrestconfport'] = '8081'
             elif installer_type == 'compass':
                 kwargs['odlrestconfport'] = '8080'
-            elif installer_type == 'daisy':
-                kwargs['odlwebport'] = '8181'
-                kwargs['odlrestconfport'] = '8087'
             assert kwargs['odlip']
         except KeyError as ex:
             self.__logger.error(

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 58a699f..918bf5d 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -546,17 +546,10 @@ class ODLRunTesting(ODLTesting):
                        odlip=self._sdn_controller_ip,
                        odlrestconfport='8080')
 
-    def test_daisy_no_controller_ip(self):
-        os.environ["INSTALLER_TYPE"] = "daisy"
+    def test_compass_no_controller_ip(self):
+        os.environ["INSTALLER_TYPE"] = "compass"
         self._test_missing_value()
 
-    def test_daisy(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        os.environ["INSTALLER_TYPE"] = "daisy"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=self._sdn_controller_ip, odlwebport='8181',
-                       odlrestconfport='8087')
-
 
 class ODLArgParserTesting(ODLTesting):