commit d0478ff69b4be47852e98e663e78c4627202bb2a
author Rich Lane <rlane@bigswitch.com> Mon Mar 11 12:46:58 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Tue Mar 12 10:45:56 2013 -0700
tree 0983639c1c2d761345b866a8909ff5a0560a96c1
parent 5b44ab4d048a93acce528280b54fd572766b75f6

loxi-prep: rename uses of match fields

tools/pylibopenflow/pylib/of/msg.py

diff --git a/tools/pylibopenflow/pylib/of/msg.py b/tools/pylibopenflow/pylib/of/msg.py
index 8617f56..129bc45 100644
--- a/tools/pylibopenflow/pylib/of/msg.py
+++ b/tools/pylibopenflow/pylib/of/msg.py
@@ -58,17 +58,17 @@
         return prefix+"match wildcards:%x" % dic[nameprefix+"wildcards"][0]+\
                " inport="+str(dic[nameprefix+"in_port"][0])+\
                prefix+"     "+\
-               " ethertype="+str(dic[nameprefix+"dl_type"][0])+\
-               " vlan="+str(dic[nameprefix+"dl_vlan"][0])+\
-               " "+self.eth_describe(dic[nameprefix+"dl_src"])+"->"+\
-               self.eth_describe(dic[nameprefix+"dl_dst"])+\
+               " ethertype="+str(dic[nameprefix+"eth_type"][0])+\
+               " vlan="+str(dic[nameprefix+"vlan_vid"][0])+\
+               " "+self.eth_describe(dic[nameprefix+"eth_src"])+"->"+\
+               self.eth_describe(dic[nameprefix+"eth_dst"])+\
                prefix+"     "+\
-               " ipproto="+str(dic[nameprefix+"nw_proto"][0])+\
-               " "+self.ip_describe(dic[nameprefix+"nw_src"][0])+\
-               "->"+self.ip_describe(dic[nameprefix+"nw_src"][0])+\
+               " ipproto="+str(dic[nameprefix+"ip_proto"][0])+\
+               " "+self.ip_describe(dic[nameprefix+"ipv4_src"][0])+\
+               "->"+self.ip_describe(dic[nameprefix+"ipv4_src"][0])+\
                prefix+"     "+\
-               " transport "+str(dic[nameprefix+"tp_src"][0])+\
-               "->"+str(dic[nameprefix+"tp_dst"][0])
+               " transport "+str(dic[nameprefix+"tcp_src"][0])+\
+               "->"+str(dic[nameprefix+"tcp_dst"][0])
                
     def switch_config_describe(self, packet):
         """Parse OpenFlow switch config and return description