Change in vdsm[master]: tcTests: test port-mirroring while another device is watchin...

danken at redhat.com danken at redhat.com
Fri Aug 24 21:08:15 UTC 2012


Dan Kenigsberg has uploaded a new change for review.

Change subject: tcTests: test port-mirroring while another device is watching
......................................................................

tcTests: test port-mirroring while another device is watching

Change-Id: I06f654be269ccbbfc90dd29e30239eb010db3df8
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/tcTests.py
1 file changed, 21 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/7459/1

diff --git a/tests/tcTests.py b/tests/tcTests.py
index 9bbfcda..c60efff 100644
--- a/tests/tcTests.py
+++ b/tests/tcTests.py
@@ -43,12 +43,12 @@
 
 
 class _Interface():
-    def __init__(self):
-        self.devName = self._generateRandomBridgeName()
+    def __init__(self, prefix='vdsmtest-'):
+        self.devName = self._generateRandomName(prefix)
 
-    def _generateRandomBridgeName(self):
+    def _generateRandomName(self, prefix):
         char_set = string.ascii_letters + string.digits
-        return 'vdsmtest-' + ''.join(random.sample(char_set, 5))
+        return prefix + ''.join(random.sample(char_set, 5))
 
     def _ifUp(self):
         check_call([EXT_IP, "link", "set", self.devName, "up"])
@@ -231,24 +231,31 @@
 
     _tap0 = _Tap()
     _tap1 = _Tap()
-    _bridge0 = _Bridge()
-    _bridge1 = _Bridge()
+    _tap2 = _Tap()
+    _bridge0 = _Bridge('src-')
+    _bridge1 = _Bridge('target-')
+    _bridge2 = _Bridge('target2-')
 
     @ValidateRunningAsRoot
     def setUp(self):
         _checkDependencies()
         self._tap0.addDevice()
         self._tap1.addDevice()
+        self._tap2.addDevice()
         self._bridge0.addDevice()
         self._bridge1.addDevice()
+        self._bridge2.addDevice()
         self._bridge0.addIf(self._tap0.devName)
         self._bridge1.addIf(self._tap1.devName)
+        self._bridge2.addIf(self._tap2.devName)
 
     def tearDown(self):
         self._tap0.delDevice()
         self._tap1.delDevice()
+        self._tap2.delDevice()
         self._bridge0.delDevice()
         self._bridge1.delDevice()
+        self._bridge2.delDevice()
 
     def _sendPing(self):
         self._tap1.startListener(self._ICMP)
@@ -264,9 +271,15 @@
 
     def testMirroring(self):
         tc.setPortMirroring(self._bridge0.devName, self._bridge1.devName)
-        self.assertTrue(self._sendPing(), " Bridge received no mirrored ping"
+        self.assertTrue(self._sendPing(), " Bridge received no mirrored ping "
                 "requests.")
 
         tc.unsetPortMirroring(self._bridge0.devName, self._bridge1.devName)
-        self.assertFalse(self._sendPing(), " Bridge received mirrored ping"
+        self.assertFalse(self._sendPing(), " Bridge received mirrored ping "
                 "requests, but mirroring is unset.")
+
+    def testMirroringWithDistraction(self):
+        "setting another mirror action should not obstract the first one"
+        tc.setPortMirroring(self._bridge0.devName, self._bridge2.devName)
+        self.testMirroring()
+        tc.unsetPortMirroring(self._bridge0.devName, self._bridge2.devName)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06f654be269ccbbfc90dd29e30239eb010db3df8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list