From 54f660a4459e399623d514d4ffa8932b8594c6f3 Mon Sep 17 00:00:00 2001 From: Sriram Natarajan Date: Tue, 16 Sep 2014 11:59:20 -0700 Subject: [PATCH] Fix Enum Name for Bad Instruction Code Corrected Reset Count enum name in OpenFlow 1.2, 1.3, 1.4 --- ryu/ofproto/ofproto_v1_2.py | 2 +- ryu/ofproto/ofproto_v1_3.py | 2 +- ryu/ofproto/ofproto_v1_4.py | 2 +- ryu/tests/unit/ofproto/test_ofproto_v12.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_2.py b/ryu/ofproto/ofproto_v1_2.py index 345d088..0976d26 100644 --- a/ryu/ofproto/ofproto_v1_2.py +++ b/ryu/ofproto/ofproto_v1_2.py @@ -349,7 +349,7 @@ OFPFC_DELETE_STRICT = 4 # Strictly match wildcards and priority. OFPFF_SEND_FLOW_REM = 1 << 0 # Send flow removed message when flow # expires or is deleted. OFPFF_CHECK_OVERLAP = 1 << 1 # Check for overlapping entries first. -OFPFF_RESET_COUNT = 1 << 2 # Reset flow packet and byte counts. +OFPFF_RESET_COUNTS = 1 << 2 # Reset flow packet and byte counts. # struct ofp_group_mod OFP_GROUP_MOD_PACK_STR = '!HBxI' diff --git a/ryu/ofproto/ofproto_v1_3.py b/ryu/ofproto/ofproto_v1_3.py index 418bab1..3bb5c6b 100644 --- a/ryu/ofproto/ofproto_v1_3.py +++ b/ryu/ofproto/ofproto_v1_3.py @@ -368,7 +368,7 @@ OFP_DEFAULT_PRIORITY = 0x8000 OFPFF_SEND_FLOW_REM = 1 << 0 # Send flow removed message when flow # expires or is deleted. OFPFF_CHECK_OVERLAP = 1 << 1 # Check for overlapping entries first. -OFPFF_RESET_COUNT = 1 << 2 # Reset flow packet and byte counts. +OFPFF_RESET_COUNTS = 1 << 2 # Reset flow packet and byte counts. OFPFF_NO_PKT_COUNTS = 1 << 3 # Don't keep track of packet count. OFPFF_NO_BYT_COUNTS = 1 << 4 # Don't keep track of byte count. diff --git a/ryu/ofproto/ofproto_v1_4.py b/ryu/ofproto/ofproto_v1_4.py index 610a34e..983132f 100644 --- a/ryu/ofproto/ofproto_v1_4.py +++ b/ryu/ofproto/ofproto_v1_4.py @@ -536,7 +536,7 @@ OFP_DEFAULT_PRIORITY = 0x8000 OFPFF_SEND_FLOW_REM = 1 << 0 # Send flow removed message when flow # expires or is deleted. OFPFF_CHECK_OVERLAP = 1 << 1 # Check for overlapping entries first. -OFPFF_RESET_COUNT = 1 << 2 # Reset flow packet and byte counts. +OFPFF_RESET_COUNTS = 1 << 2 # Reset flow packet and byte counts. OFPFF_NO_PKT_COUNTS = 1 << 3 # Don't keep track of packet count. OFPFF_NO_BYT_COUNTS = 1 << 4 # Don't keep track of byte count. diff --git a/ryu/tests/unit/ofproto/test_ofproto_v12.py b/ryu/tests/unit/ofproto/test_ofproto_v12.py index 556961b..d6280a6 100644 --- a/ryu/tests/unit/ofproto/test_ofproto_v12.py +++ b/ryu/tests/unit/ofproto/test_ofproto_v12.py @@ -323,7 +323,7 @@ class TestOfprot12(unittest.TestCase): def test_enum_ofp_flow_mod_flags(self): eq_(OFPFF_SEND_FLOW_REM, 1 << 0) eq_(OFPFF_CHECK_OVERLAP, 1 << 1) - eq_(OFPFF_RESET_COUNT, 1 << 2) + eq_(OFPFF_RESET_COUNTS, 1 << 2) def test_struct_ofp_group_mod(self): eq_(OFP_GROUP_MOD_PACK_STR, '!HBxI') -- 1.8.5.2 (Apple Git-48)