From 6626f68e785e61de05bdafee68bafe14f66a78a7 Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Tue, 24 Jan 2017 14:43:51 +0100 Subject: [PATCH] Add netvirt to odl tests For the odl test the default odl port is 8080. In netvirt this is the same as apex. Change-Id: I949510e4f7fb57bcf8ec01f69f7941c5d55c98e7 Signed-off-by: Nikolas Hermanns --- functest/ci/exec_test.sh | 4 ++++ functest/opnfv_tests/sdn/odl/odl.py | 2 +- functest/tests/unit/odl/test_odl.py | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index b288fe36..6a2b55a2 100755 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -54,6 +54,10 @@ function odl_tests(){ odl_ip=$SDN_CONTROLLER_IP odl_port=8081 odl_restport=8081 + elif [ "$INSTALLER_TYPE" == "netvirt" ]; then + odl_ip=$SDN_CONTROLLER_IP + odl_port=8081 + odl_restport=8081 elif [ "$INSTALLER_TYPE" == "joid" ]; then odl_ip=$SDN_CONTROLLER elif [ "$INSTALLER_TYPE" == "compass" ]; then diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 9502be93..25075957 100755 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -164,7 +164,7 @@ class ODLTests(testcase_base.TestcaseBase): kwargs['ospassword'] = os.environ['OS_PASSWORD'] if installer_type == 'fuel': kwargs['odlwebport'] = '8282' - elif installer_type == 'apex': + elif installer_type == 'apex' or installer_type == 'netvirt': kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP'] kwargs['odlwebport'] = '8081' kwargs['odlrestconfport'] = '8081' diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 810b3592..8f2a5d7e 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -443,6 +443,20 @@ class ODLTesting(unittest.TestCase): odlip=self._sdn_controller_ip, odlwebport='8081', odlrestconfport='8081') + def test_run_netvirt_missing_sdn_controller_ip(self): + with mock.patch('functest.utils.openstack_utils.get_endpoint', + side_effect=self._fake_url_for): + os.environ["INSTALLER_TYPE"] = "netvirt" + self.assertEqual(self.test.run(), + testcase_base.TestcaseBase.EX_RUN_ERROR) + + def test_run_netvirt(self): + os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip + os.environ["INSTALLER_TYPE"] = "netvirt" + self._test_run(testcase_base.TestcaseBase.EX_OK, + odlip=self._sdn_controller_ip, odlwebport='8081', + odlrestconfport='8081') + def test_run_joid_missing_sdn_controller(self): with mock.patch('functest.utils.openstack_utils.get_endpoint', side_effect=self._fake_url_for): -- 2.16.6