Merge branch 'master' of github.com:floodlight/oftest
diff --git a/tests/oft b/tests/oft
index 062622e..dbc9588 100755
--- a/tests/oft
+++ b/tests/oft
@@ -228,6 +228,7 @@
         remote:  Remote embedded Broadcom based switch
         Create a new_plat.py file and use --platform=new_plat on the command line
         """
+    parser.add_option("--platform-args", help="Custom arguments per platform.")
     parser.add_option("-P", "--platform", help=plat_help)
     parser.add_option("-H", "--host", dest="controller_host",
                       help="The IP/name of the test controller host")
diff --git a/tests/pktact.py b/tests/pktact.py
index 3fa0257..7360b54 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -1640,6 +1640,13 @@
 class FlowToggle(BaseMatchCase):
     """
     Add flows to the table and modify them repeatedly
+
+    This is done by using only "add" flow messages.  Since the check overlap
+    flag is not set, the switch is supposed to modify the existing flow if
+    the match already exists.
+
+    Would probably be better to exercise more of the flow modify commands
+    (add, modify, delete +/- strict).
     """
     def runTest(self):
         flow_count = test_param_get(self.config, 'ft_flow_count', default=20)
@@ -1673,6 +1680,7 @@
                 match.wildcards = wildcards
                 msg.match = match
                 msg.buffer_id = 0xffffffff
+                msg.command = ofp.OFPFC_ADD
                 msg.actions.add(acts[toggle])
                 flows[toggle].append(msg)