VOL-3211 Flow Remove following subscriber remove not propagated to adapter
Change-Id: I93568ad7b5ca669edfcb7ca7fcbad1d00728208c
diff --git a/VERSION b/VERSION
index 23aa839..e8ea05d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.2
+1.2.4
diff --git a/internal/pkg/openflow/flowMod.go b/internal/pkg/openflow/flowMod.go
index cc0c595..82cacd0 100644
--- a/internal/pkg/openflow/flowMod.go
+++ b/internal/pkg/openflow/flowMod.go
@@ -369,6 +369,10 @@
field.Value = &voltha.OfpOxmOfbField_Ipv4Dst{
Ipv4Dst: binary.BigEndian.Uint32(val.(net.IP)),
}
+ case voltha.OxmOfbFieldTypes_OFPXMT_OFB_ETH_DST:
+ field.Value = &voltha.OfpOxmOfbField_EthDst{
+ EthDst: val.(net.HardwareAddr),
+ }
case voltha.OxmOfbFieldTypes_OFPXMT_OFB_UDP_SRC:
field.Value = &voltha.OfpOxmOfbField_UdpSrc{
UdpSrc: uint32(val.(uint16)),
@@ -381,6 +385,10 @@
field.Value = &voltha.OfpOxmOfbField_VlanVid{
VlanVid: uint32(val.(uint16)),
}
+ case voltha.OxmOfbFieldTypes_OFPXMT_OFB_VLAN_PCP:
+ field.Value = &voltha.OfpOxmOfbField_VlanPcp{
+ VlanPcp: uint32(val.(uint8)),
+ }
case 200: // voltha-protos doesn't actually have a type for vlan_mask
field = voltha.OfpOxmOfbField{Type: voltha.OxmOfbFieldTypes(oxmMap["vlan_vid"])}
field.HasMask = true