diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2016-05-10 14:29:42 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-05-13 22:25:32 +0900 |
| commit | ea8c3b8fb7c8465dafa5e0f36479533722bdc60e (patch) | |
| tree | ed711aaed24a0229c0e861115c3d39d8b47372c4 | |
| parent | a67f436b8d68fb35078e67d06b6d9df08332d376 (diff) | |
ofctl_v1_4: Rename to get_queue_desc for uniformity
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/app/ofctl_rest.py | 2 | ||||
| -rw-r--r-- | ryu/lib/ofctl_v1_4.py | 2 | ||||
| -rw-r--r-- | 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' }, |