* Implement the missing OpenFlow 1.0 matching conditions
* Code cleanup: reorder the implementation of the matching
conditions so the order everywhere is always same and matches the
order of listing those conditions in the OpenFlow-1.0 spec.
diff --git a/web/get_flow.py b/web/get_flow.py
index 033176d..9e954fe 100755
--- a/web/get_flow.py
+++ b/web/get_flow.py
@@ -55,20 +55,20 @@
matchSrcMac = match['matchSrcMac']
dstMac = match['dstMac']
matchDstMac = match['matchDstMac']
+ ethernetFrameType = match['ethernetFrameType']
+ matchEthernetFrameType = match['matchEthernetFrameType']
vlanId = match['vlanId']
matchVlanId = match['matchVlanId']
vlanPriority = match['vlanPriority']
matchVlanPriority = match['matchVlanPriority']
- ethernetFrameType = match['ethernetFrameType']
- matchEthernetFrameType = match['matchEthernetFrameType']
- ipToS = match['ipToS']
- matchIpToS = match['matchIpToS']
- ipProto = match['ipProto']
- matchIpProto = match['matchIpProto']
srcIPv4Net = match['srcIPv4Net']
matchSrcIPv4Net = match['matchSrcIPv4Net']
dstIPv4Net = match['dstIPv4Net']
matchDstIPv4Net = match['matchDstIPv4Net']
+ ipProto = match['ipProto']
+ matchIpProto = match['matchIpProto']
+ ipToS = match['ipToS']
+ matchIpToS = match['matchIpToS']
srcTcpUdpPort = match['srcTcpUdpPort']
matchSrcTcpUdpPort = match['matchSrcTcpUdpPort']
dstTcpUdpPort = match['dstTcpUdpPort']
@@ -79,20 +79,20 @@
print " srcMac: %s" % srcMac['value']
if matchDstMac == True:
print " dstMac: %s" % dstMac['value']
+ if matchEthernetFrameType == True:
+ print " ethernetFrameType: %s" % hex(ethernetFrameType)
if matchVlanId == True:
print " vlanId: %s" % vlanId
if matchVlanPriority == True:
print " vlanPriority: %s" % vlanPriority
- if matchEthernetFrameType == True:
- print " ethernetFrameType: %s" % hex(ethernetFrameType)
- if matchIpToS == True:
- print " ipToS: %s" % ipToS
- if matchIpProto == True:
- print " ipProto: %s" % ipProto
if matchSrcIPv4Net == True:
print " srcIPv4Net: %s" % srcIPv4Net['value']
if matchDstIPv4Net == True:
print " dstIPv4Net: %s" % dstIPv4Net['value']
+ if matchIpProto == True:
+ print " ipProto: %s" % ipProto
+ if matchIpToS == True:
+ print " ipToS: %s" % ipToS
if matchSrcTcpUdpPort == True:
print " srcTcpUdpPort: %s" % srcTcpUdpPort
if matchDstTcpUdpPort == True:
@@ -119,20 +119,20 @@
matchSrcMac = match['matchSrcMac']
dstMac = match['dstMac']
matchDstMac = match['matchDstMac']
+ ethernetFrameType = match['ethernetFrameType']
+ matchEthernetFrameType = match['matchEthernetFrameType']
vlanId = match['vlanId']
matchVlanId = match['matchVlanId']
vlanPriority = match['vlanPriority']
matchVlanPriority = match['matchVlanPriority']
- ethernetFrameType = match['ethernetFrameType']
- matchEthernetFrameType = match['matchEthernetFrameType']
- ipToS = match['ipToS']
- matchIpToS = match['matchIpToS']
- ipProto = match['ipProto']
- matchIpProto = match['matchIpProto']
srcIPv4Net = match['srcIPv4Net']
matchSrcIPv4Net = match['matchSrcIPv4Net']
dstIPv4Net = match['dstIPv4Net']
matchDstIPv4Net = match['matchDstIPv4Net']
+ ipProto = match['ipProto']
+ matchIpProto = match['matchIpProto']
+ ipToS = match['ipToS']
+ matchIpToS = match['matchIpToS']
srcTcpUdpPort = match['srcTcpUdpPort']
matchSrcTcpUdpPort = match['matchSrcTcpUdpPort']
dstTcpUdpPort = match['dstTcpUdpPort']
@@ -143,20 +143,20 @@
print " srcMac: %s" % srcMac['value']
if matchDstMac == True:
print " dstMac: %s" % dstMac['value']
+ if matchEthernetFrameType == True:
+ print " ethernetFrameType: %s" % hex(ethernetFrameType)
if matchVlanId == True:
print " vlanId: %s" % vlanId
if matchVlanPriority == True:
print " vlanPriority: %s" % vlanPriority
- if matchEthernetFrameType == True:
- print " ethernetFrameType: %s" % hex(ethernetFrameType)
- if matchIpToS == True:
- print " ipToS: %s" % ipToS
- if matchIpProto == True:
- print " ipProto: %s" % ipProto
if matchSrcIPv4Net == True:
print " srcIPv4Net: %s" % srcIPv4Net['value']
if matchDstIPv4Net == True:
print " dstIPv4Net: %s" % dstIPv4Net['value']
+ if matchIpProto == True:
+ print " ipProto: %s" % ipProto
+ if matchIpToS == True:
+ print " ipToS: %s" % ipToS
if matchSrcTcpUdpPort == True:
print " srcTcpUdpPort: %s" % srcTcpUdpPort
if matchDstTcpUdpPort == True: