Dan Kenigsberg has uploaded a new change for review. Change subject: tc: Give a clearer name to qdisc_get_devid ......................................................................
tc: Give a clearer name to qdisc_get_devid While at it, extend the function to return all associated qdiscs per device. Change-Id: If835917172ff8a6d68a9c9bbc1d6454b7137bf2a Signed-off-by: Dan Kenigsberg <[email protected]> --- M tests/tcTests.py M vdsm/tc.py 2 files changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/7538/1 diff --git a/tests/tcTests.py b/tests/tcTests.py index cba0d75..db6304f 100644 --- a/tests/tcTests.py +++ b/tests/tcTests.py @@ -172,9 +172,10 @@ self.assertFalse("qdisc ingress" in self._showQdisc(), "Could not remove an ingress qdisc from the device.") - def testGetDevID(self): + def testQdiscsOfDevice(self): self._addIngress() - self.assertTrue("ffff:" in tc.qdisc_get_devid(self._bridge.devName)) + self.assertEquals(("ffff:", ), + tuple(tc._qdiscs_of_device(self._bridge.devName))) def testReplacePrio(self): self._addIngress() diff --git a/vdsm/tc.py b/vdsm/tc.py index 69f8625..570c410 100644 --- a/vdsm/tc.py +++ b/vdsm/tc.py @@ -61,7 +61,7 @@ _addTarget(network, QDISC_INGRESS, target) qdisc_replace_prio(network) - qdisc_id = qdisc_get_devid(network) + qdisc_id = _qdiscs_of_device(network).next() _addTarget(network, qdisc_id, target) set_promisc(network, True) @@ -71,7 +71,7 @@ # TODO handle the case where we have partial definitions on device due to # vdsm crash acts = _delTarget(network, QDISC_INGRESS, target) - qdisc_id = qdisc_get_devid(network) + qdisc_id = _qdiscs_of_device(network).next() acts += _delTarget(network, qdisc_id, target) if not acts: @@ -122,12 +122,14 @@ _process_request(command) -def qdisc_get_devid(dev): - "Return qdisc_id of the first qdisc associated with dev" +def _qdiscs_of_device(dev): + "Return an iterator of qdisc_ids associated with dev" command = [EXT_TC, 'qdisc', 'show', 'dev', dev] out = _process_request(command) - return out.split(' ')[2] + + for line in out.splitlines(): + yield line.split(' ')[2] def qdisc_del(dev, queue): -- To view, visit http://gerrit.ovirt.org/7538 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If835917172ff8a6d68a9c9bbc1d6454b7137bf2a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
