VOL-2395: Support for getting metadata from WRITE_METADATA action.
- The ONU adapter needs to query metadata information from
WRITE_METADATA action. TP ID is then retrieved from this metadata.
The TP ID is used for deriving the VLAN Tagging Filter Data ME
entity ID during BrcmVlanFilterTask OMCI task.
- Add G_988_2014_Amd_1 OMCC Version
- Bump version to 2.3.5
Change-Id: Ia545b73e1b393bc3a46170d388881d28da6ca0b7
diff --git a/VERSION b/VERSION
index 3f684d2..cc6c9a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.4
+2.3.5
diff --git a/pyvoltha/adapters/extensions/omci/onu_configuration.py b/pyvoltha/adapters/extensions/omci/onu_configuration.py
index 4664120..52d5b6a 100644
--- a/pyvoltha/adapters/extensions/omci/onu_configuration.py
+++ b/pyvoltha/adapters/extensions/omci/onu_configuration.py
@@ -40,6 +40,8 @@
G_988_2011_Amd_1 = 0xB1 # Amd.1 (2011) Baseline and extended message set
G_988_2012_Amd_2 = 0xB2 # Amd.2 (2012) Baseline and extended message set
G_988_2012 = 0xB3 # (2012)Baseline and extended message set
+ G_988_2014_Amd_1 = 0xB4 # Amd1 (2014) Baseline and extended message
+ DO_NOT_USE = 0xB5
@staticmethod
def values():
diff --git a/pyvoltha/common/openflow/utils.py b/pyvoltha/common/openflow/utils.py
index 362b081..747ca0b 100644
--- a/pyvoltha/common/openflow/utils.py
+++ b/pyvoltha/common/openflow/utils.py
@@ -358,6 +358,11 @@
return instruction.goto_table.table_id
return None
+def get_write_metadata(flow):
+ for instruction in flow.instructions:
+ if instruction.type == ofp.OFPIT_WRITE_METADATA:
+ return instruction.write_metadata.metadata
+ return None
def get_tunnelid(flow):
for field in get_ofb_fields(flow):