Change in vdsm[master]: fix broken TestConfigNetwork.testAddNetworkValidation

ibarkan at redhat.com ibarkan at redhat.com
Thu Nov 6 12:04:15 UTC 2014


Ido Barkan has uploaded a new change for review.

Change subject: fix broken TestConfigNetwork.testAddNetworkValidation
......................................................................

fix broken TestConfigNetwork.testAddNetworkValidation

this was broken after http://gerrit.oveir.org/34538
was merged.

Change-Id: Ic63df1075bfb036a7a0b133111ebb54fd12b6d3e
Signed-off-by: ibarkan <ibarkan at redhat.com>
---
M tests/configNetworkTests.py
M tests/outOfProcessTests.py
2 files changed, 6 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/34867/1

diff --git a/tests/configNetworkTests.py b/tests/configNetworkTests.py
index 83a4b73..10a5f2a 100644
--- a/tests/configNetworkTests.py
+++ b/tests/configNetworkTests.py
@@ -90,7 +90,12 @@
                 'fakebr1': {'ports': ['bond00']},
                 'fakebr2': {'ports': ['eth7.1']}
             },
-            'bondings': {'bond00': {'slaves': ['eth5', 'eth6']}}
+            'bondings': {
+                'bond00': {
+                    'slaves': ['eth5', 'eth6'],
+                    'cfg': {'BONDING_OPTS': 'mode=802.3ad miimon=150'}
+                }
+            }
         }
 
         fakeInfo = netinfo.NetInfo(_netinfo)
@@ -143,23 +148,6 @@
         # Test for nic already in a bond.
         self._addNetworkWithExc('test', dict(nics=['eth6'], _netinfo=fakeInfo),
                                 errors.ERR_USED_NIC)
-
-        # Test for adding a new VLANed bridged network when a non-VLANed
-        # bridged network exists
-        self._addNetworkWithExc('test', dict(vlan='2', bonding='bond00',
-                                nics=nics, _netinfo=fakeInfo),
-                                errors.ERR_BAD_PARAMS)
-
-        # Test for adding a new VLANed bridgeless network when a non-VLANed
-        # bridged network exists
-        self._addNetworkWithExc('test', dict(vlan='2', bonding='bond00',
-                                nics=nics, bridged=False, _netinfo=fakeInfo),
-                                errors.ERR_BAD_PARAMS)
-
-        # Test for adding a new VLANed bridged network when the interface is in
-        # use by any type of networks
-        self._addNetworkWithExc('test', dict(nics=['eth7'], _netinfo=fakeInfo),
-                                errors.ERR_BAD_PARAMS)
 
         # Test for adding a new non-VLANed bridgeless network when a non-VLANed
         # bridgeless network exists
diff --git a/tests/outOfProcessTests.py b/tests/outOfProcessTests.py
index f06c71d..974e2e1 100644
--- a/tests/outOfProcessTests.py
+++ b/tests/outOfProcessTests.py
@@ -28,8 +28,6 @@
 import re
 from weakref import ref
 
-from vdsm.config import config
-
 
 class OopWrapperTests(TestCaseBase):
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic63df1075bfb036a7a0b133111ebb54fd12b6d3e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>


More information about the vdsm-patches mailing list