commit df20bf7bfec0d4b84e7a28164d97ad9b9f61c596
author ssiddiqui <salmansiddiquimailbox@gmail.com> Mon Aug 23 14:00:56 2021 +0530
committer ssiddiqui <salmansiddiquimailbox@gmail.com> Tue Aug 24 20:38:56 2021 +0530
tree fe1c56b16d13fc9eef1954515f6c11fcf9f8eeb6
parent 0f751d5a0c4ff4865958b1c8414781a5272f9cf9

[VOL-4005] Add support for matches on MPLS fields

Change-Id: If74dbb747b22cb0ea66e65f4b256d76f6894695c

internal/pkg/openflow/utils.go

diff --git a/internal/pkg/openflow/utils.go b/internal/pkg/openflow/utils.go
index 08de458..36642fa 100644
--- a/internal/pkg/openflow/utils.go
+++ b/internal/pkg/openflow/utils.go
@@ -20,6 +20,7 @@
 	"fmt"
 	ofp "github.com/opencord/goloxi/of13"
 	"github.com/opencord/voltha-protos/v4/go/openflow_13"
+	"net"
 	"strings"
 	"sync"
 )
@@ -62,6 +63,14 @@
 	case ofp.OFPATCopyTtlOut: //CopyTtltOut
 	case ofp.OFPATCopyTtlIn: //CopyTtlIn
 	case ofp.OFPATSetMplsTtl: //SetMplsTtl
+		mplsTtl := action.(*ofp.ActionSetMplsTtl)
+		setMplsTtl := openflow_13.OfpAction_MplsTtl{
+			MplsTtl: &openflow_13.OfpActionMplsTtl{
+				MplsTtl: uint32(mplsTtl.MplsTtl),
+			},
+		}
+		ofpAction.Type = openflow_13.OfpActionType_OFPAT_SET_MPLS_TTL
+		ofpAction.Action = &setMplsTtl
 	case ofp.OFPATDecMplsTtl: //DecMplsTtl
 	case ofp.OFPATPushVLAN: //PushVlan
 		var pushVlan openflow_13.OfpAction_Push
@@ -74,7 +83,15 @@
 	case ofp.OFPATPopVLAN: //PopVlan
 		ofpAction.Type = openflow_13.OfpActionType_OFPAT_POP_VLAN
 	case ofp.OFPATPushMpls: //PushMpls
+		var pushMpls openflow_13.OfpAction_Push
+		mplsPushAction := action.(*ofp.ActionPushMpls)
+		var push openflow_13.OfpActionPush
+		push.Ethertype = uint32(mplsPushAction.Ethertype)
+		pushMpls.Push = &push
+		ofpAction.Type = openflow_13.OfpActionType_OFPAT_PUSH_MPLS
+		ofpAction.Action = &pushMpls
 	case ofp.OFPATPopMpls: //PopMpls
+		ofpAction.Type = openflow_13.OfpActionType_OFPAT_POP_MPLS
 	case ofp.OFPATSetQueue: //SetQueue
 	case ofp.OFPATGroup: //ActionGroup
 		ofpAction.Type = openflow_13.OfpActionType_OFPAT_GROUP
@@ -110,6 +127,30 @@
 			var VlanPcp = loxiSetField.Field.GetOXMValue().(uint8)
 			vlanPcp.VlanPcp = uint32(VlanPcp)
 			ofpOxmOfbField.Value = &vlanPcp
+		case "mpls_label":
+			ofpOxmOfbField.Type = openflow_13.OxmOfbFieldTypes_OFPXMT_OFB_MPLS_LABEL
+			var mplsLabel openflow_13.OfpOxmOfbField_MplsLabel
+			label := loxiSetField.Field.GetOXMValue().(uint32)
+			mplsLabel.MplsLabel = label
+			ofpOxmOfbField.Value = &mplsLabel
+		case "mpls_bos":
+			ofpOxmOfbField.Type = openflow_13.OxmOfbFieldTypes_OFPXMT_OFB_MPLS_BOS
+			var mplsBos openflow_13.OfpOxmOfbField_MplsBos
+			bos := loxiSetField.Field.GetOXMValue().(uint8)
+			mplsBos.MplsBos = uint32(bos)
+			ofpOxmOfbField.Value = &mplsBos
+		case "eth_src":
+			ofpOxmOfbField.Type = openflow_13.OxmOfbFieldTypes_OFPXMT_OFB_ETH_SRC
+			var ethSrc openflow_13.OfpOxmOfbField_EthSrc
+			src := loxiSetField.Field.GetOXMValue().(net.HardwareAddr)
+			ethSrc.EthSrc = src
+			ofpOxmOfbField.Value = &ethSrc
+		case "eth_dst":
+			ofpOxmOfbField.Type = openflow_13.OxmOfbFieldTypes_OFPXMT_OFB_ETH_DST
+			var ethDst openflow_13.OfpOxmOfbField_EthDst
+			dst := loxiSetField.Field.GetOXMValue().(net.HardwareAddr)
+			ethDst.EthDst = dst
+			ofpOxmOfbField.Value = &ethDst
 		}
 		ofpOxmField_OfbField.OfbField = &ofpOxmOfbField
 		ofpOxmField.Field = &ofpOxmField_OfbField