ofctl_rest: Support meter id in get_meter_stats()

This patch enables to specify the meter id to get the meter stats.

Usage)
  $ curl -X GET http://localhost:8080/stats/meter/<dpid>[/<meter_id>]
  Note: Specification of meter id is optional

Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

2 files changed, 20 insertions, 5 deletions

diff --git a/ryu/app/ofctl_rest.py b/ryu/app/ofctl_rest.py
index b776387c..500434fe 100644
--- a/ryu/app/ofctl_rest.py
+++ b/ryu/app/ofctl_rest.py
@@ -94,7 +94,8 @@ supported_ofctl = {
 # GET /stats/meterconfig/<dpid>
 #
 # get meters stats of the switch
-# GET /stats/meter/<dpid>
+# GET /stats/meter/<dpid>[/<meter_id>]
+# Note: Specification of meter id is optional
 #
 # get group features stats of the switch
 # GET /stats/groupfeatures/<dpid>
@@ -472,12 +473,16 @@ class StatsController(ControllerBase):
         body = json.dumps(meters)
         return Response(content_type='application/json', body=body)
 
-    def get_meter_stats(self, req, dpid, **_kwargs):
+    def get_meter_stats(self, req, dpid, meter_id=None, **_kwargs):
 
         if type(dpid) == str and not dpid.isdigit():
             LOG.debug('invalid dpid %s', dpid)
             return Response(status=400)
 
+        if type(meter_id) == str and not meter_id.isdigit():
+            LOG.debug('invalid meter_id %s', memter_id)
+            return Response(status=400)
+
         dp = self.dpset.get(int(dpid))
 
         if dp is None:
@@ -487,7 +492,7 @@ class StatsController(ControllerBase):
         _ofctl = supported_ofctl.get(_ofp_version, None)
 
         if _ofctl is not None and hasattr(_ofctl, 'get_meter_stats'):
-            meters = _ofctl.get_meter_stats(dp, self.waiters)
+            meters = _ofctl.get_meter_stats(dp, self.waiters, meter_id)
 
         else:
             LOG.debug('Unsupported OF protocol or \
@@ -929,6 +934,11 @@ class RestStatsApi(app_manager.RyuApp):
                        controller=StatsController, action='get_meter_stats',
                        conditions=dict(method=['GET']))
 
+        uri = path + '/meter/{dpid}/{meter_id}'
+        mapper.connect('stats', uri,
+                       controller=StatsController, action='get_meter_stats',
+                       conditions=dict(method=['GET']))
+
         uri = path + '/groupfeatures/{dpid}'
         mapper.connect('stats', uri,
                        controller=StatsController, action='get_group_features',
diff --git a/ryu/lib/ofctl_v1_3.py b/ryu/lib/ofctl_v1_3.py
index 01882128..04a732de 100644
--- a/ryu/lib/ofctl_v1_3.py
+++ b/ryu/lib/ofctl_v1_3.py
@@ -756,9 +756,14 @@ def get_port_stats(dp, waiters, port=None):
     return ports
 
 
-def get_meter_stats(dp, waiters):
+def get_meter_stats(dp, waiters, meter_id=None):
+    if meter_id is None:
+        meter_id = dp.ofproto.OFPM_ALL
+    else:
+        meter_id = int(str(meter_id), 0)
+
     stats = dp.ofproto_parser.OFPMeterStatsRequest(
-        dp, 0, dp.ofproto.OFPM_ALL)
+        dp, 0, meter_id)
     msgs = []
     send_stats_request(dp, stats, waiters, msgs)