diff options
| author | Sriram Natarajan <natarajan.sriram@gmail.com> | 2014-09-21 17:15:00 -0700 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-09-27 18:28:20 +0900 |
| commit | 97c9e797435b9ddb626d6cff87286535af99c7f1 (patch) | |
| tree | ed8d1e47e2dffabcdc32b042e80cd6cda5f2a5d4 | |
| parent | 2674a272f257c5f8c1cbf1ec997908b156c69256 (diff) | |
Fix spell check in group feature message Maintain name consistency in meter type in Meter Features message in OF 1.3 Add length field in group statistics reply in OF 1.2
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/app/rest_qos.py | 2 | ||||
| -rw-r--r-- | ryu/lib/ofctl_v1_2.py | 5 | ||||
| -rw-r--r-- | ryu/lib/ofctl_v1_3.py | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/ryu/app/rest_qos.py b/ryu/app/rest_qos.py index f0cea79b..057a3fdd 100644 --- a/ryu/app/rest_qos.py +++ b/ryu/app/rest_qos.py @@ -158,7 +158,7 @@ from ryu.ofproto import inet # # request body format: # {"meter_id": <int>, -# "bands":[{"action": "<DROP or REMARK>", +# "bands":[{"action": "<DROP or DSCP_REMARK>", # "flag": "<KBPS or PKTPS or BURST or STATS" # "burst_size": <int>, # "rate": <int>, diff --git a/ryu/lib/ofctl_v1_2.py b/ryu/lib/ofctl_v1_2.py index 21a3e340..8ca798ad 100644 --- a/ryu/lib/ofctl_v1_2.py +++ b/ryu/lib/ofctl_v1_2.py @@ -664,7 +664,8 @@ def get_group_stats(dp, waiters): c = {'packet_count': bucket_counter.packet_count, 'byte_count': bucket_counter.byte_count} bucket_counters.append(c) - g = {'group_id': stats.group_id, + g = {'length': stats.length, + 'group_id': stats.group_id, 'ref_count': stats.ref_count, 'packet_count': stats.packet_count, 'byte_count': stats.byte_count, @@ -684,7 +685,7 @@ def get_group_features(dp, waiters): cap_convert = {ofp.OFPGFC_SELECT_WEIGHT: 'SELECT_WEIGHT', ofp.OFPGFC_SELECT_LIVENESS: 'SELECT_LIVENESS', ofp.OFPGFC_CHAINING: 'CHAINING', - ofp.OFPGFC_CHAINING_CHECKS: 'CHAINING_CHCEKS'} + ofp.OFPGFC_CHAINING_CHECKS: 'CHAINING_CHECKS'} act_convert = {ofp.OFPAT_OUTPUT: 'OUTPUT', ofp.OFPAT_COPY_TTL_OUT: 'COPY_TTL_OUT', ofp.OFPAT_COPY_TTL_IN: 'COPY_TTL_IN', diff --git a/ryu/lib/ofctl_v1_3.py b/ryu/lib/ofctl_v1_3.py index 11673247..83bfce91 100644 --- a/ryu/lib/ofctl_v1_3.py +++ b/ryu/lib/ofctl_v1_3.py @@ -747,7 +747,7 @@ def get_meter_config(dp, waiters): dp.ofproto.OFPMF_STATS: 'STATS'} band_type = {dp.ofproto.OFPMBT_DROP: 'DROP', - dp.ofproto.OFPMBT_DSCP_REMARK: 'REMARK', + dp.ofproto.OFPMBT_DSCP_REMARK: 'DSCP_REMARK', dp.ofproto.OFPMBT_EXPERIMENTER: 'EXPERIMENTER'} stats = dp.ofproto_parser.OFPMeterConfigStatsRequest( @@ -817,7 +817,7 @@ def get_group_features(dp, waiters): cap_convert = {ofp.OFPGFC_SELECT_WEIGHT: 'SELECT_WEIGHT', ofp.OFPGFC_SELECT_LIVENESS: 'SELECT_LIVENESS', ofp.OFPGFC_CHAINING: 'CHAINING', - ofp.OFPGFC_CHAINING_CHECKS: 'CHAINING_CHCEKS'} + ofp.OFPGFC_CHAINING_CHECKS: 'CHAINING_CHECKS'} act_convert = {ofp.OFPAT_OUTPUT: 'OUTPUT', ofp.OFPAT_COPY_TTL_OUT: 'COPY_TTL_OUT', ofp.OFPAT_COPY_TTL_IN: 'COPY_TTL_IN', @@ -976,7 +976,7 @@ def mod_meter_entry(dp, flow, cmd): if band_type == 'DROP': bands.append( dp.ofproto_parser.OFPMeterBandDrop(rate, burst_size)) - elif band_type == 'REMARK': + elif band_type == 'DSCP_REMARK': prec_level = int(band.get('prec_level', 0)) bands.append( dp.ofproto_parser.OFPMeterBandDscpRemark( |