commit 1879dc74881a84e324aebfa5a6b33e8605e3ec18
author Rich Lane <rlane@bigswitch.com> Mon Mar 11 22:08:51 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Tue Mar 12 11:04:30 2013 -0700
tree 24bc003245743124713ccba053d46aac5c65151f
parent c7b85d2cdfade2a5b9af25fe4283a18a4de7e811

loxi-prep: always handle missing entry in type map

tests/flow_query.py

diff --git a/tests/flow_query.py b/tests/flow_query.py
index 0e914fc..49b1a9b 100644
--- a/tests/flow_query.py
+++ b/tests/flow_query.py
@@ -304,7 +304,7 @@
     result = "{"
     sep    = ""
     for a in all_actions_list:
-        if ((1 << a) & bm) != 0:
+        if ((1 << a) & bm) != 0 and a in ofp.ofp_action_type_map:
             result = result + sep + ofp.ofp_action_type_map[a]
             sep = ", "
     result = result + "}"
@@ -473,7 +473,7 @@
         result = result + (", idle_timeout=%d" % self.idle_timeout)
         result = result + (", hard_timeout=%d" % self.hard_timeout)
         for a in self.actions:
-            result = result + (", action=%s" % ofp.ofp_action_type_map[a.type])
+            result = result + (", action=%s" % ofp.ofp_action_type_map.get(a.type, "unknown"))
             if a.type == ofp.OFPAT_OUTPUT:
                 result = result + ("(%d)" % (a.port))
             elif a.type == ofp.OFPAT_SET_VLAN_VID: