commit 9326c511fcdfadc71b55c0f06565a0e20dcebc76
author Mahir Gunyel <mahir.gunyel@netsia.com> Sun Feb 23 21:36:15 2020 -0800
committer Mahir Gunyel <mahir.gunyel@netsia.com> Sun Feb 23 22:58:13 2020 -0800
tree be1a19c9706a68ba6c722a3aa628d19303d52334
parent 3ff8b71264a5e1c12d7240ece2c4011acd2d5748

VOL-2618 add new extractors to utils.py

Change-Id: I721713c9f349bda5918c8a5e71d04517a3723052

VERSION

diff --git a/VERSION b/VERSION
index ed09221..81e9469 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.16
+2.3.17

pyvoltha/common/openflow/utils.py

diff --git a/pyvoltha/common/openflow/utils.py b/pyvoltha/common/openflow/utils.py
index bf9c48e..169c8ba 100644
--- a/pyvoltha/common/openflow/utils.py
+++ b/pyvoltha/common/openflow/utils.py
@@ -85,7 +85,8 @@
 PBB_ISID = ofp.OFPXMT_OFB_PBB_ISID
 TUNNEL_ID = ofp.OFPXMT_OFB_TUNNEL_ID
 IPV6_EXTHDR = ofp.OFPXMT_OFB_IPV6_EXTHDR
-
+IPV4_DHCP_SRC_PORT = 68
+IPV6_DHCP_SRC_PORT = 546
 
 # ofp_action_* shortcuts
 
@@ -351,6 +352,11 @@
         ofb_fields.append(field.ofb_field)
     return ofb_fields
 
+def get_meter_id_from_flow(flow):
+    for instruction in flow.instructions:
+        if instruction.type == ofp.OFPIT_METER:
+            return instruction.meter.meter_id
+    return None
 
 def get_out_port(flow):
     for action in get_actions(flow):
@@ -384,6 +390,11 @@
             return field.tunnel_id
     return None
 
+def is_dhcp_flow(flow):
+    for field in get_ofb_fields(flow):
+        if field.type == UDP_SRC and (field.udp_src == IPV4_DHCP_SRC_PORT or field.udp_src == IPV6_DHCP_SRC_PORT):
+            return True
+    return False
 
 def get_metadata(flow):
     ''' legacy get method (only want lower 32 bits '''