summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-18 22:14:28 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-18 22:14:28 +0200
commit3d66534a239552f568dfa3c151e528c8e550ebdc (patch)
tree9a706c6ea364a03063f36d3940eecd90b3c87202
parent0933e7255b7a441523a110b34adf99dc063b5e06 (diff)
Remove logics about Daisy in odl
Daisy is now setting the right env vars [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/59839/1 Change-Id: If23c0ac0b5ab2f4f4b9515e27d845cb9c4d07ded Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/sdn/odl/odl.py3
-rw-r--r--functest/tests/unit/odl/test_odl.py11
2 files changed, 2 insertions, 12 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 43476d8bf..2275c2db0 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -186,9 +186,6 @@ class ODLTests(robotframework.RobotFramework):
kwargs['odlrestconfport'] = '8081'
elif installer_type == 'compass':
kwargs['odlrestconfport'] = '8080'
- elif installer_type == 'daisy':
- kwargs['odlwebport'] = '8181'
- kwargs['odlrestconfport'] = '8087'
assert kwargs['odlip']
except KeyError as ex:
self.__logger.error(
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 58a699f0b..918bf5d2c 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -546,17 +546,10 @@ class ODLRunTesting(ODLTesting):
odlip=self._sdn_controller_ip,
odlrestconfport='8080')
- def test_daisy_no_controller_ip(self):
- os.environ["INSTALLER_TYPE"] = "daisy"
+ def test_compass_no_controller_ip(self):
+ os.environ["INSTALLER_TYPE"] = "compass"
self._test_missing_value()
- def test_daisy(self):
- os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
- os.environ["INSTALLER_TYPE"] = "daisy"
- self._test_run(testcase.TestCase.EX_OK, None,
- odlip=self._sdn_controller_ip, odlwebport='8181',
- odlrestconfport='8087')
-
class ODLArgParserTesting(ODLTesting):