Dan Kenigsberg has uploaded a new change for review.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
tc: add to PEP8_WHITELIST
Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M Makefile.am M tests/tcTests.py M vdsm/tc.py 3 files changed, 28 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/7426/1
diff --git a/Makefile.am b/Makefile.am index 5f17f63..e617c6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,6 +89,7 @@ vdsm/storage/volume.py \ vdsm/supervdsm.py \ vdsm/supervdsmServer.py \ + vdsm/tc.py \ vdsm_cli \ vdsm_hooks/fileinject/before_vm_start.py \ vdsm_hooks/promisc/after_vm_start.py \ @@ -99,7 +100,8 @@ vdsm_hooks/vhostmd/after_vm_destroy.py \ vdsm_hooks/vhostmd/before_vm_start.py \ vdsm_reg/createDaemon.py \ - vdsm_reg/define.py + vdsm_reg/define.py \ + $(NULL)
PEP8_BLACKLIST = \ restData.py diff --git a/tests/tcTests.py b/tests/tcTests.py index 7e09761..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"]) @@ -162,7 +162,7 @@ return popen.stdout.read()
def _addIngress(self): - tc.qdisc_add_ingress(self._bridge.devName) + tc.qdisc_replace_ingress(self._bridge.devName) self.assertTrue("qdisc ingress" in self._showQdisc(), "Could not add an ingress qdisc to the device.")
@@ -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) diff --git a/vdsm/tc.py b/vdsm/tc.py index 9998bd1..db699df 100644 --- a/vdsm/tc.py +++ b/vdsm/tc.py @@ -94,7 +94,6 @@ raise
- def filter_replace(dev, parent, filt): command = [EXT_TC, 'filter', 'replace', 'dev', dev, 'parent', parent] if filt.prio: @@ -118,10 +117,12 @@ 'parent', 'root', 'prio'] _process_request(command)
+ def qdisc_get_devid(dev): command = [EXT_TC, 'qdisc', 'show', 'dev', dev] out = _process_request(command) return out.split(' ')[2] +
def qdisc_del(dev, queue): try: @@ -131,6 +132,7 @@ if e.errCode != ERR_DEV_NOEXIST: raise
+ def set_promisc(dev, on=True): promisc = 'promisc' if not on:
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com
oVirt Jenkins CI Server has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 1:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/616/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Douglas Schilling Landgraf has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 1: I would prefer that you didn't submit this
Dan, not sure if this happened with you as well (with a clean repo):
git fetch git://gerrit.ovirt.org/vdsm refs/changes/26/7426/1 && git cherry-pick FETCH_HEAD
error: could not apply 9c2ac6d... tc: add to PEP8_WHITELIST hint: after resolving the conflicts, mark the corrected paths
-1 = since I have a question and maybe rebase is needed.
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 1: I would prefer that you didn't submit this
yes... I'm afraid that something fishy is going on with this topic branch of mine. A couple of changes do not show up after being pushed: for example, this change includes more stuff than it should have, and it did not update with my most resent push. I hope we are not on the verge of db corruption.
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/660/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Antoni Segura Puimedon has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 2: Looks good to me, but someone else must approve
I'll verify it asap.
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Douglas Schilling Landgraf has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 2:
I am not sure yet, here my output from 'make rpm':
vdsm/tc.py:36:1: E302 expected 2 blank lines, found 1 vdsm/tc.py:44:1: E302 expected 2 blank lines, found 1 vdsm/tc.py:49:1: E302 expected 2 blank lines, found 1 make[3]: *** [check-local] Error 1
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Antoni Segura Puimedon has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 2: Verified
Passes check-local and I can't see any violation of PEP8 at close inspection.
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Douglas Schilling Landgraf has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 2: I would prefer that you didn't submit this
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
oVirt Jenkins CI Server has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 4:
Build Successful
http://jenkins.ovirt.info/job/patch_vdsm_unit_tests/719/ : SUCCESS
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Antoni Segura Puimedon has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 4: Looks good to me, but someone else must approve
This rebase makes it easier to test.
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Igor Lvovsky has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 4: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has posted comments on this change.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
Patch Set 4: Verified
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
Dan Kenigsberg has submitted this change and it was merged.
Change subject: tc: add to PEP8_WHITELIST ......................................................................
tc: add to PEP8_WHITELIST
Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M Makefile.am M vdsm/tc.py 2 files changed, 5 insertions(+), 0 deletions(-)
Approvals: Antoni Segura Puimedon: Looks good to me, but someone else must approve Dan Kenigsberg: Verified Igor Lvovsky: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/7426 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: I1b3b1d8de08ea8fac5cd3debb53f22d7a7a8ad87 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegurap@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server
vdsm-patches@lists.fedorahosted.org