diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-07-11 17:03:52 +0800 |
|---|---|---|
| committer | Alex Yang <yangyang1@zte.com.cn> | 2017-07-12 15:25:11 +0800 |
| commit | 8958f985e4fba10db7ad67a96a536f1d7660985a (patch) | |
| tree | 9c87c9f1e9b7e75446c0aa9c12d2487e215a878a /functest | |
| parent | cf40eb1f837d73077168588097fd066287ff22e6 (diff) | |
Add odl configurations for odl testcase in daisy environment
To support odl testcase in the environment deployed by daisy installer.
Change-Id: I70bc668520cf28385fcff8489c773b880e7b4080
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Diffstat (limited to 'functest')
| -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): |