diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-20 10:36:58 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-20 10:36:58 +0200 |
| commit | 5bd8c86c423e59c7a24b15b9855f9e04ba8500c5 (patch) | |
| tree | 8e1755534c6c35b2ce418e0880455f7fb62be122 | |
| parent | fa36553cfb8e6b25f32322d2dca68550f51f713d (diff) | |
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>
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 5 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 2275c2db0..03e759182 100644 --- 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 918bf5d2c..5be956c48 100644 --- 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() |