Skip to content

Added support for NUM_IP_QOS, NUM_L4_PORT_SRC, NUM_PACKET_ATTRIBUTE_32 in createAclEntry #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sonikajindal merged 1 commit into from
Mar 3, 2026
Merged

Added support for NUM_IP_QOS, NUM_L4_PORT_SRC, NUM_PACKET_ATTRIBUTE_32 in createAclEntry #661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions dataplane/saiserver/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ import (
fwdpb "github.com/openconfig/lemming/proto/forwarding"
)

const (
// aclMeta is the key to PACKET_ATTRIBUTE_32 field for ACL metadata.
aclMeta = 1
)

// tableLocation indentifies the location of an acl table by the group, bank, member id.
type tableLocation struct {
groupID string
Expand Down Expand Up @@ -252,6 +257,13 @@ func (a *acl) createAclEntryFields(req *saipb.CreateAclEntryRequest, id uint64,
Masks: binary.BigEndian.AppendUint16(nil, uint16(req.GetFieldOuterVlanId().GetMaskUint())),
})
}
if req.GetFieldEcn() != nil {
aReq.EntryDesc.GetFlow().Fields = append(aReq.EntryDesc.GetFlow().Fields, &fwdpb.PacketFieldMaskedBytes{
FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_QOS}},
Bytes: []byte{byte(req.GetFieldEcn().GetDataUint())},
Masks: []byte{byte(req.GetFieldEcn().GetMaskUint())},
})
}
ipv6Field := false
ipv6Addr := make([]byte, 16)
ipv6Mask := make([]byte, 16)
Expand Down Expand Up @@ -354,13 +366,27 @@ func (a *acl) createAclEntryFields(req *saipb.CreateAclEntryRequest, id uint64,
Masks: binary.BigEndian.AppendUint16(nil, uint16(req.GetFieldL4DstPort().GetMaskUint())),
})
}
if req.GetFieldL4SrcPort() != nil {
aReq.EntryDesc.GetFlow().Fields = append(aReq.EntryDesc.GetFlow().Fields, &fwdpb.PacketFieldMaskedBytes{
FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_L4_PORT_SRC}},
Bytes: binary.BigEndian.AppendUint16(nil, uint16(req.GetFieldL4SrcPort().GetDataUint())),
Masks: binary.BigEndian.AppendUint16(nil, uint16(req.GetFieldL4SrcPort().GetMaskUint())),
})
}
if req.GetFieldSrcMac() != nil {
aReq.EntryDesc.GetFlow().Fields = append(aReq.EntryDesc.GetFlow().Fields, &fwdpb.PacketFieldMaskedBytes{
FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_ETHER_MAC_SRC}},
Bytes: req.GetFieldSrcMac().GetDataMac(),
Masks: req.GetFieldSrcMac().GetMaskMac(),
})
}
if req.GetFieldAclUserMeta() != nil {
aReq.EntryDesc.GetFlow().Fields = append(aReq.EntryDesc.GetFlow().Fields, &fwdpb.PacketFieldMaskedBytes{
FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_ATTRIBUTE_32, Instance: aclMeta}},
Bytes: binary.BigEndian.AppendUint32(nil, uint32(req.GetFieldAclUserMeta().GetDataUint())),
Masks: binary.BigEndian.AppendUint32(nil, uint32(req.GetFieldAclUserMeta().GetMaskUint())),
})
}
if req.GetFieldTtl() != nil {
aReq.EntryDesc.GetFlow().Fields = append(aReq.EntryDesc.GetFlow().Fields, &fwdpb.PacketFieldMaskedBytes{
FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_HOP}},
Expand Down Expand Up @@ -478,6 +504,17 @@ func (a *acl) CreateAclEntry(ctx context.Context, req *saipb.CreateAclEntryReque
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).
WithValue(binary.BigEndian.AppendUint16(nil, uint16(req.GetActionSetOuterVlanId().GetUint())))).Build())
}
if req.ActionSetTc != nil {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_QOS).
WithValue([]byte{byte(req.GetActionSetTc().GetUint()) << 2})).Build())
}
if req.ActionSetAclMetaData != nil {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_ATTRIBUTE_32).
WithFieldIDInstance(aclMeta).
WithValue(binary.BigEndian.AppendUint32(nil, uint32(req.GetActionSetAclMetaData().GetUint())))).Build())
}

cpuPortReq := &saipb.GetSwitchAttributeRequest{Oid: switchID, AttrType: []saipb.SwitchAttr{saipb.SwitchAttr_SWITCH_ATTR_CPU_PORT}}
resp := &saipb.GetSwitchAttributeResponse{}
Expand Down
Loading