diff options
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 2 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 6af49ffa..4c33c495 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -183,8 +183,6 @@ class ODLTests(robotframework.RobotFramework): kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP'] kwargs['odlwebport'] = '8081' kwargs['odlrestconfport'] = '8081' - elif installer_type == 'joid': - kwargs['odlip'] = os.environ['SDN_CONTROLLER'] elif installer_type == 'compass': kwargs['odlrestconfport'] = '8080' elif installer_type == 'daisy': diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index d803d413..c11948bb 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -407,16 +407,6 @@ class ODLRunTesting(ODLTesting): odlip=self._sdn_controller_ip, odlwebport='8081', odlrestconfport='8081') - def test_joid_no_controller_ip(self): - os.environ["INSTALLER_TYPE"] = "joid" - self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) - - def test_joid(self): - os.environ["SDN_CONTROLLER"] = self._sdn_controller_ip - os.environ["INSTALLER_TYPE"] = "joid" - self._test_run(testcase.TestCase.EX_OK, None, - odlip=self._sdn_controller_ip, odlwebport='8080') - def test_compass(self): os.environ["INSTALLER_TYPE"] = "compass" self._test_run(testcase.TestCase.EX_OK, None, |