From ea8c3b8fb7c8465dafa5e0f36479533722bdc60e Mon Sep 17 00:00:00 2001 From: IWASE Yusuke Date: Tue, 10 May 2016 14:29:42 +0900 Subject: [PATCH] ofctl_v1_4: Rename to get_queue_desc for uniformity Signed-off-by: IWASE Yusuke Signed-off-by: FUJITA Tomonori --- ryu/app/ofctl_rest.py | 2 +- ryu/lib/ofctl_v1_4.py | 2 +- ryu/tests/unit/lib/test_ofctl.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ryu/app/ofctl_rest.py b/ryu/app/ofctl_rest.py index 663db303..91258b78 100644 --- a/ryu/app/ofctl_rest.py +++ b/ryu/app/ofctl_rest.py @@ -342,7 +342,7 @@ class StatsController(ControllerBase): if queue == "ALL": queue = None - return ofctl.get_queue_desc_stats(dp, self.waiters, port, queue) + return ofctl.get_queue_desc(dp, self.waiters, port, queue) @stats_method def get_meter_features(self, req, dp, ofctl, **kwargs): diff --git a/ryu/lib/ofctl_v1_4.py b/ryu/lib/ofctl_v1_4.py index 060562b0..8c8d8a4f 100644 --- a/ryu/lib/ofctl_v1_4.py +++ b/ryu/lib/ofctl_v1_4.py @@ -274,7 +274,7 @@ def get_queue_stats(dp, waiters, port_no=None, queue_id=None): return desc -def get_queue_desc_stats(dp, waiters, port_no=None, queue_id=None): +def get_queue_desc(dp, waiters, port_no=None, queue_id=None): if port_no is None: port_no = dp.ofproto.OFPP_ANY else: diff --git a/ryu/tests/unit/lib/test_ofctl.py b/ryu/tests/unit/lib/test_ofctl.py index 9162015e..fa818393 100644 --- a/ryu/tests/unit/lib/test_ofctl.py +++ b/ryu/tests/unit/lib/test_ofctl.py @@ -390,7 +390,7 @@ def _add_tests(): 'reply': '5-36-ofp_queue_stats_reply.packet.json' }, { - 'method': ofctl_v1_4.get_queue_desc_stats, + 'method': ofctl_v1_4.get_queue_desc, 'request': '5-63-ofp_queue_desc_request.packet.json', 'reply': '5-64-ofp_queue_desc_reply.packet.json' },