Change in vdsm[master]: Add unit tests for iproute2 configurator

Mark Wu has uploaded a new change for review.

Change subject: Add unit tests for iproute2 configurator
......................................................................

Add unit tests for iproute2 configurator

Change-Id: If9f4dc10028a0d766b7dd13aeffa23b0fe533143
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
---
M tests/netconfTests.py
1 file changed, 46 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/15302/1

diff --git a/tests/netconfTests.py b/tests/netconfTests.py
index 3ae5590..ce0cdc7 100644
--- a/tests/netconfTests.py
+++ b/tests/netconfTests.py
@@ -35,6 +35,7 @@
 from netconf import ifcfg
 from netmodels import Nic, Bond, Vlan, Bridge
 from netconf import libvirtCfg
+from netconf import iproute2
 
 from monkeypatch import MonkeyPatch
 from monkeypatch import MonkeyPatchScope
@@ -218,9 +219,7 @@
         ifaceObj.remove()
         self._assertIface(ifaceObj, removalAction=True)
 
-    @testValidation.ValidateRunningAsRoot
-    def testIfcfgConfigureNic(self):
-        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
+    def _testConfigureNic(self, configurator):
         nic = 'dummy0'
         self._testConfigureIface(nics=[nic], configurator=configurator)
         self._testRemoveIface(nics=[nic], configurator=configurator)
@@ -250,12 +249,9 @@
             if bond.ip:
                 self._assertIfaceInfo(bondInfo)
 
-    @testValidation.ValidateRunningAsRoot
-    def testIfcfgConfigureBond(self):
+    def _testConfigureBond(self, configurator):
         if not os.path.exists(netinfo.BONDING_MASTERS):
             raise SkipTest("bonding kernel module could not be found.")
-
-        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
 
         bond = 'bond100'
         nics = ['dummy1', 'dummy2']
@@ -282,9 +278,7 @@
         if vlan.ip and not removalAction:
             self._assertIfaceInfo(vlanInfo)
 
-    @testValidation.ValidateRunningAsRoot
-    def testIfcfgConfigureVlan(self):
-        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
+    def _testConfigureVlan(self, configurator):
         vlanId = '1'
         nic = 'dummy3'
 
@@ -319,9 +313,7 @@
         if bridge.ip and not removalAction:
             self._assertIfaceInfo(bridgeInfo)
 
-    @testValidation.ValidateRunningAsRoot
-    def testIfcfgConfigureBridge(self):
-        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
+    def _testConfigureBridge(self, configurator):
         bridge = 'dummybridge'
         nic = 'dummy3'
 
@@ -344,6 +336,7 @@
         bond = 'bond100'
         nics = ['dummy1', 'dummy2']
         bondOptions = 'mode=1 primary=dummy2'
+
         self._testConfigureIface(bridge=bridge, bonding=bond, nics=nics,
                                  bondingOptions=bondOptions,
                                  configurator=configurator)
@@ -357,3 +350,43 @@
         self._testRemoveIface(bridge=bridge, vlan=vlanId, bonding=bond,
                               nics=nics, bondingOptions=bondOptions,
                               configurator=configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIfcfgConfigureNic(self):
+        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
+        self._testConfigureNic(configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIfcfgConfigureBond(self):
+        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
+        self._testConfigureBond(configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIfcfgConfigureVlan(self):
+        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
+        self._testConfigureVlan(configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIfcfgConfigureBridge(self):
+        configurator = ifcfg.Ifcfg(ifcfg.ConfigWriter())
+        self._testConfigureBridge(configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIproute2ConfigureNic(self):
+        configurator = iproute2.Iproute2(iproute2.ConfigWriter())
+        self._testConfigureNic(configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIproute2ConfigureBond(self):
+        configurator = iproute2.Iproute2(iproute2.ConfigWriter())
+        self._testConfigureBond(configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIproute2ConfigureVlan(self):
+        configurator = iproute2.Iproute2(iproute2.ConfigWriter())
+        self._testConfigureVlan(configurator)
+
+    @testValidation.ValidateRunningAsRoot
+    def testIproute2ConfigureBridge(self):
+        configurator = iproute2.Iproute2(iproute2.ConfigWriter())
+        self._testConfigureBridge(configurator)


--
To view, visit http://gerrit.ovirt.org/15302
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9f4dc10028a0d766b7dd13aeffa23b0fe533143
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;

Mark Wu has abandoned this change.

Change subject: Add unit tests for iproute2 configurator
......................................................................


Patch Set 1: Abandoned

-- 
To view, visit http://gerrit.ovirt.org/15302
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: If9f4dc10028a0d766b7dd13aeffa23b0fe533143
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Add unit tests for iproute2 configurator
......................................................................


Patch Set 1: Fails

Build Failed 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2521/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1694/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2592/ : FAILURE

--
To view, visit http://gerrit.ovirt.org/15302
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If9f4dc10028a0d766b7dd13aeffa23b0fe533143
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server