Remove INSTALLER_TYPE logics in odl

JIRA: APEX-621
JIRA: COMPASS-606

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

1 files changed, 1 insertions, 34 deletions

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 6a2c5ad55..f65170453 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -49,7 +49,7 @@ class ODLTesting(unittest.TestCase):
     _os_interface = "public"
 
     def setUp(self):
-        for var in ("INSTALLER_TYPE", "SDN_CONTROLLER", "SDN_CONTROLLER_IP"):
+        for var in ("SDN_CONTROLLER", "SDN_CONTROLLER_IP"):
             if var in os.environ:
                 del os.environ[var]
         os.environ["OS_AUTH_URL"] = self._os_auth_url
@@ -533,39 +533,6 @@ class ODLRunTesting(ODLTesting):
             odlip=self._sdn_controller_ip,
             odlwebport=self._odl_webport)
 
-    def test_apex_no_controller_ip(self):
-        os.environ["INSTALLER_TYPE"] = "apex"
-        self._test_missing_value()
-
-    def test_apex(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        os.environ["INSTALLER_TYPE"] = "apex"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=self._sdn_controller_ip, odlwebport='8081',
-                       odlrestconfport='8081')
-
-    def test_netvirt_no_controller_ip(self):
-        os.environ["INSTALLER_TYPE"] = "netvirt"
-        self._test_missing_value()
-
-    def test_netvirt(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        os.environ["INSTALLER_TYPE"] = "netvirt"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=self._sdn_controller_ip, odlwebport='8081',
-                       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=self._sdn_controller_ip,
-                       odlrestconfport='8080')
-
-    def test_compass_no_controller_ip(self):
-        os.environ["INSTALLER_TYPE"] = "compass"
-        self._test_missing_value()
-
 
 class ODLArgParserTesting(ODLTesting):