Petr Horáček has uploaded a new change for review. Change subject: net tests: common tests for 'ovs' and 'legacy' ......................................................................
net tests: common tests for 'ovs' and 'legacy' Change-Id: If866e446f508813a5fbf28e4ef38f8aa333e6f62 Signed-off-by: Petr Horáček <[email protected]> --- M tests/network/Makefile.am C tests/network/func_net_creation_basic_legacy_test.py C tests/network/func_net_creation_basic_ovs_test.py R tests/network/func_net_creation_basic_template.py M tests/network/netfunctestlib.py 5 files changed, 26 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/59538/2 diff --git a/tests/network/Makefile.am b/tests/network/Makefile.am index 13d368d..c2f9a7e 100644 --- a/tests/network/Makefile.am +++ b/tests/network/Makefile.am @@ -22,6 +22,7 @@ dist_vdsmnetworktests_PYTHON = \ __init__.py \ + *_template.py \ *_test.py \ dhcp.py \ firewall.py \ diff --git a/tests/network/func_net_creation_basic_test.py b/tests/network/func_net_creation_basic_legacy_test.py similarity index 68% copy from tests/network/func_net_creation_basic_test.py copy to tests/network/func_net_creation_basic_legacy_test.py index 0b37865..b971e5c 100644 --- a/tests/network/func_net_creation_basic_test.py +++ b/tests/network/func_net_creation_basic_legacy_test.py @@ -19,19 +19,13 @@ # from __future__ import absolute_import + from nose.plugins.attrib import attr -from .netfunctestlib import NetFuncTestCase, NOCHK -from .nettestlib import dummy_device - -NETWORK_NAME = 'test-network' +from .func_net_creation_basic_template import NetworkCreateBasicTemplate @attr(type='functional') -class NetworkCreateBasicTest(NetFuncTestCase): - - def test_add_net_based_on_nic(self): - with dummy_device() as nic: - NETSETUP = {NETWORK_NAME: {'nic': nic}} - with self.setupNetworks(NETSETUP, {}, NOCHK): - self.assertNetwork(NETWORK_NAME, NETSETUP[NETWORK_NAME]) +class NetworkCreateBasicTest(NetworkCreateBasicTemplate): + __test__ = True + switch_type = 'legacy' diff --git a/tests/network/func_net_creation_basic_test.py b/tests/network/func_net_creation_basic_ovs_test.py similarity index 68% copy from tests/network/func_net_creation_basic_test.py copy to tests/network/func_net_creation_basic_ovs_test.py index 0b37865..5fc090a 100644 --- a/tests/network/func_net_creation_basic_test.py +++ b/tests/network/func_net_creation_basic_ovs_test.py @@ -19,19 +19,13 @@ # from __future__ import absolute_import + from nose.plugins.attrib import attr -from .netfunctestlib import NetFuncTestCase, NOCHK -from .nettestlib import dummy_device - -NETWORK_NAME = 'test-network' +from .func_net_creation_basic_template import NetworkCreateBasicTemplate @attr(type='functional') -class NetworkCreateBasicTest(NetFuncTestCase): - - def test_add_net_based_on_nic(self): - with dummy_device() as nic: - NETSETUP = {NETWORK_NAME: {'nic': nic}} - with self.setupNetworks(NETSETUP, {}, NOCHK): - self.assertNetwork(NETWORK_NAME, NETSETUP[NETWORK_NAME]) +class NetworkCreateBasicTest(NetworkCreateBasicTemplate): + __test__ = True + switch_type = 'ovs' diff --git a/tests/network/func_net_creation_basic_test.py b/tests/network/func_net_creation_basic_template.py similarity index 91% rename from tests/network/func_net_creation_basic_test.py rename to tests/network/func_net_creation_basic_template.py index 0b37865..49c76ef 100644 --- a/tests/network/func_net_creation_basic_test.py +++ b/tests/network/func_net_creation_basic_template.py @@ -19,7 +19,6 @@ # from __future__ import absolute_import -from nose.plugins.attrib import attr from .netfunctestlib import NetFuncTestCase, NOCHK from .nettestlib import dummy_device @@ -27,8 +26,8 @@ NETWORK_NAME = 'test-network' -@attr(type='functional') -class NetworkCreateBasicTest(NetFuncTestCase): +class NetworkCreateBasicTemplate(NetFuncTestCase): + __test__ = False def test_add_net_based_on_nic(self): with dummy_device() as nic: diff --git a/tests/network/netfunctestlib.py b/tests/network/netfunctestlib.py index 2341eae..c56d45c 100644 --- a/tests/network/netfunctestlib.py +++ b/tests/network/netfunctestlib.py @@ -44,6 +44,7 @@ class NetFuncTestCase(VdsmTestCase): + switch_type = None def __init__(self, *args, **kwargs): VdsmTestCase.__init__(self, *args, **kwargs) @@ -57,7 +58,8 @@ @property def setupNetworks(self): - return SetupNetworks(self.vdsm_proxy, self._setup_networks_post_hook()) + return SetupNetworks(self.vdsm_proxy, self.switch_type, + self._setup_networks_post_hook()) def _setup_networks_post_hook(self): def assert_kernel_vs_running(): @@ -188,12 +190,16 @@ class SetupNetworks(object): - def __init__(self, vdsm_proxy, post_setup_hook): + def __init__(self, vdsm_proxy, switch_type, post_setup_hook): self.vdsm_proxy = vdsm_proxy + self._switch_type = switch_type self.post_setup_hook = post_setup_hook def __call__(self, networks, bonds, options): self.setup_networks = networks + + self._set_switch_type(networks, self._switch_type) + self._set_switch_type(bonds, self._switch_type) status, msg = self.vdsm_proxy.setupNetworks(networks, bonds, options) if status != SUCCESS: @@ -211,6 +217,11 @@ if type is None and status != SUCCESS: raise SetupNetworksError(msg) + @staticmethod + def _set_switch_type(entries, switch_type): + for attrs in six.itervalues(entries): + attrs['switch'] = switch_type + def _normalize_caps(netinfo_from_caps): """ -- To view, visit https://gerrit.ovirt.org/59538 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If866e446f508813a5fbf28e4ef38f8aa333e6f62 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <[email protected]> Gerrit-Reviewer: Dan Kenigsberg <[email protected]> Gerrit-Reviewer: Edward Haas <[email protected]> Gerrit-Reviewer: gerrit-hooks <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/admin/lists/[email protected]
