diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-13 20:45:30 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-15 17:16:22 +0100 |
| commit | 117a1db3e15f348ef7c41e2b697849755fdf2b35 (patch) | |
| tree | 13a335a761e9f276bc0f2865cfcab2df22a58215 /functest | |
| parent | 9476136e4f67cbb9853683c871bb699918a45ee6 (diff) | |
Stop reading SDN_CONTROLLER env var.
Joid doesn't support ODL and this exception is no longer needed.
It will be a simple switch from SDN_CONTROLLER to SDN_CONTROLLER_IP
if Joid supports ODL again.
Change-Id: I925965f9c1adf24914e4110ff3206443f4063ac8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest')
| -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, |