diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-07-12 08:04:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-12 08:04:29 +0000 |
| commit | f81e3d2cf3cf9b54f940a6e0ae0ea68db0e1f589 (patch) | |
| tree | 3865789b88e930b0a6d6e87727d2cf7403c31bce | |
| parent | 6ac8b1f359a2d47eb66f1111c205ebccac314818 (diff) | |
| parent | 8958f985e4fba10db7ad67a96a536f1d7660985a (diff) | |
Merge "Add odl configurations for odl testcase in daisy environment"
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 4 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 15 |
2 files changed, 19 insertions, 0 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 67bf66e34..ede0fc500 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -235,6 +235,10 @@ class ODLTests(testcase.TestCase): kwargs['odlip'] = os.environ['SDN_CONTROLLER'] elif installer_type == 'compass': kwargs['odlwebport'] = '8181' + elif installer_type == 'daisy': + kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP'] + kwargs['odlwebport'] = '8181' + kwargs['odlrestconfport'] = '8087' else: kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP'] except KeyError as ex: diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 070a8d2ec..8c8a6cec3 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -513,6 +513,21 @@ class ODLRunTesting(ODLTesting): self._test_run(testcase.TestCase.EX_OK, odlip=self._neutron_ip, odlwebport='8181') + def test_daisy_no_controller_ip(self): + with mock.patch('functest.utils.openstack_utils.get_endpoint', + return_value="http://{}:9696".format( + ODLTesting._neutron_ip)): + os.environ["INSTALLER_TYPE"] = "daisy" + self.assertEqual(self.test.run(), + testcase.TestCase.EX_RUN_ERROR) + + 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, + odlip=self._sdn_controller_ip, odlwebport='8181', + odlrestconfport='8087') + class ODLArgParserTesting(ODLTesting): |