Stop Fuel logics in odl

Fuel is setting the right env vars [1].

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

Change-Id: Ieb0ae1887859e0b7d3f77dfb5100a633b6479a37
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 2275c2d..03e7591 100644 (file)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -178,10 +178,7 @@ class ODLTests(robotframework.RobotFramework):
                 'OS_PROJECT_DOMAIN_NAME', 'Default')
             kwargs['osauthurl'] = os.environ['OS_AUTH_URL']
             kwargs['ospassword'] = os.environ['OS_PASSWORD']
-            if installer_type == 'fuel':
-                kwargs['odlwebport'] = '8282'
-                kwargs['odlrestconfport'] = '8282'
-            elif installer_type == 'apex' or installer_type == 'netvirt':
+            if installer_type == 'apex' or installer_type == 'netvirt':
                 kwargs['odlwebport'] = '8081'
                 kwargs['odlrestconfport'] = '8081'
             elif installer_type == 'compass':

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 918bf5d..5be956c 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -505,18 +505,6 @@ 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=self._sdn_controller_ip,
-                       odlwebport='8282',
-                       odlrestconfport='8282')
-
     def test_apex_no_controller_ip(self):
         os.environ["INSTALLER_TYPE"] = "apex"
         self._test_missing_value()