From 58f33fd3ef7b66bb570ef757b9f70a023e0c8c59 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 2 Apr 2014 21:02:35 +0900 Subject: [PATCH] Remove duplicated tests for check_ovs_vxlan_version test_ovs_lib, test_ovs_neutron_agent and test_ofa_neutron_agent have duplicated same unit tests for check_ovs_vxlan_version. This commits removes tests from ovs/ofa_neutron_agent. Change-Id: Ia028a4afc1c8154f895187c979d23b626ab4ae3a Closes-Bug: #1301337 --- .../unit/ofagent/test_ofa_neutron_agent.py | 55 ------------------- .../openvswitch/test_ovs_neutron_agent.py | 55 ------------------- 2 files changed, 110 deletions(-) diff --git a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py index 71afcd213..6d5a12b68 100644 --- a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py +++ b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py @@ -509,61 +509,6 @@ class TestOFANeutronAgent(OFAAgentTestCase): self.agent.port_unbound("vif3", "netuid12345") self.assertEqual(reclvl_fn.call_count, 2) - def _check_ovs_vxlan_version(self, installed_usr_version, - installed_klm_version, - installed_kernel_version, - expecting_ok): - with mock.patch( - 'neutron.agent.linux.ovs_lib.get_installed_ovs_klm_version' - ) as klm_cmd: - with mock.patch( - 'neutron.agent.linux.ovs_lib.get_installed_ovs_usr_version' - ) as usr_cmd: - with mock.patch( - 'neutron.agent.linux.ovs_lib.get_installed_kernel_version' - ) as krn_cmd: - try: - klm_cmd.return_value = installed_klm_version - usr_cmd.return_value = installed_usr_version - krn_cmd.return_value = installed_kernel_version - self.agent.tunnel_types = 'vxlan' - self.agent._check_ovs_version() - version_ok = True - except SystemExit as e: - self.assertEqual(e.code, 1) - version_ok = False - self.assertEqual(version_ok, expecting_ok) - - def test_check_minimum_version(self): - min_vxlan_ver = constants.MINIMUM_OVS_VXLAN_VERSION - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(min_vxlan_ver, min_vxlan_ver, - min_kernel_ver, expecting_ok=True) - - def test_check_future_version(self): - install_ver = str(float(constants.MINIMUM_OVS_VXLAN_VERSION) + 0.01) - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(install_ver, install_ver, - min_kernel_ver, expecting_ok=True) - - def test_check_fail_version(self): - install_ver = str(float(constants.MINIMUM_OVS_VXLAN_VERSION) - 0.01) - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(install_ver, install_ver, - min_kernel_ver, expecting_ok=False) - - def test_check_fail_no_version(self): - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(None, None, - min_kernel_ver, expecting_ok=False) - - def test_check_fail_klm_version(self): - min_vxlan_ver = constants.MINIMUM_OVS_VXLAN_VERSION - min_kernel_ver = OVS_LINUX_KERN_VERS_WITHOUT_VXLAN - install_ver = str(float(min_vxlan_ver) - 0.01) - self._check_ovs_vxlan_version(min_vxlan_ver, install_ver, - min_kernel_ver, expecting_ok=False) - def test_daemon_loop_uses_polling_manager(self): with mock.patch( 'neutron.agent.linux.polling.get_polling_manager' diff --git a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py index 13464ca54..d1eb473fb 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py @@ -489,61 +489,6 @@ class TestOvsNeutronAgent(base.BaseTestCase): self.agent.port_unbound("vif3", "netuid12345") self.assertEqual(reclvl_fn.call_count, 2) - def _check_ovs_vxlan_version(self, installed_usr_version, - installed_klm_version, - installed_kernel_version, - expecting_ok): - with mock.patch( - 'neutron.agent.linux.ovs_lib.get_installed_ovs_klm_version' - ) as klm_cmd: - with mock.patch( - 'neutron.agent.linux.ovs_lib.get_installed_ovs_usr_version' - ) as usr_cmd: - with mock.patch( - 'neutron.agent.linux.ovs_lib.get_installed_kernel_version' - ) as kernel_cmd: - try: - klm_cmd.return_value = installed_klm_version - usr_cmd.return_value = installed_usr_version - kernel_cmd.return_value = installed_kernel_version - self.agent.tunnel_types = 'vxlan' - self.agent._check_ovs_version() - version_ok = True - except SystemExit as e: - self.assertEqual(e.code, 1) - version_ok = False - self.assertEqual(version_ok, expecting_ok) - - def test_check_minimum_version(self): - min_vxlan_ver = constants.MINIMUM_OVS_VXLAN_VERSION - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(min_vxlan_ver, min_vxlan_ver, - min_kernel_ver, expecting_ok=True) - - def test_check_future_version(self): - install_ver = str(float(constants.MINIMUM_OVS_VXLAN_VERSION) + 0.01) - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(install_ver, install_ver, - min_kernel_ver, expecting_ok=True) - - def test_check_fail_version(self): - install_ver = str(float(constants.MINIMUM_OVS_VXLAN_VERSION) - 0.01) - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(install_ver, install_ver, - min_kernel_ver, expecting_ok=False) - - def test_check_fail_no_version(self): - min_kernel_ver = constants.MINIMUM_LINUX_KERNEL_OVS_VXLAN - self._check_ovs_vxlan_version(None, None, - min_kernel_ver, expecting_ok=False) - - def test_check_fail_klm_version(self): - min_vxlan_ver = constants.MINIMUM_OVS_VXLAN_VERSION - min_kernel_ver = OVS_LINUX_KERN_VERS_WITHOUT_VXLAN - install_ver = str(float(min_vxlan_ver) - 0.01) - self._check_ovs_vxlan_version(min_vxlan_ver, install_ver, - min_kernel_ver, expecting_ok=False) - def _prepare_l2_pop_ofports(self): lvm1 = mock.Mock() lvm1.network_type = 'gre' -- 2.45.2