From 48f78042ba8cca87d8b8760338589f5d8066f556 Mon Sep 17 00:00:00 2001
From: Daniel Grau <dgrau@google.com>
Date: Thu, 11 Jul 2024 21:37:41 +0000
Subject: [PATCH] test fix

---
 dataplane/saiserver/acl_test.go | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/dataplane/saiserver/acl_test.go b/dataplane/saiserver/acl_test.go
index 6f5e4c9e..630f0328 100644
--- a/dataplane/saiserver/acl_test.go
+++ b/dataplane/saiserver/acl_test.go
@@ -129,7 +129,7 @@ func TestCreateAclEntry(t *testing.T) {
 			EntryDesc: &fwdpb.EntryDesc{
 				Entry: &fwdpb.EntryDesc_Flow{
 					Flow: &fwdpb.FlowEntryDesc{
-						Id: 1,
+						Id: 2,
 						Fields: []*fwdpb.PacketFieldMaskedBytes{{
 							FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_ADDR_DST}},
 							Bytes:   []byte{127, 0, 0, 1},
@@ -207,7 +207,7 @@ func TestCreateAclEntry(t *testing.T) {
 			EntryDesc: &fwdpb.EntryDesc{
 				Entry: &fwdpb.EntryDesc_Flow{
 					Flow: &fwdpb.FlowEntryDesc{
-						Id: 1,
+						Id: 2,
 						Fields: []*fwdpb.PacketFieldMaskedBytes{{
 							FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_ADDR_DST}},
 							Bytes:   []byte{127, 0, 0, 1},
@@ -256,7 +256,7 @@ func TestCreateAclEntry(t *testing.T) {
 			EntryDesc: &fwdpb.EntryDesc{
 				Entry: &fwdpb.EntryDesc_Flow{
 					Flow: &fwdpb.FlowEntryDesc{
-						Id: 1,
+						Id: 2,
 						Fields: []*fwdpb.PacketFieldMaskedBytes{{
 							FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_ADDR_DST}},
 							Bytes:   []byte{127, 0, 0, 1},
@@ -305,7 +305,7 @@ func TestCreateAclEntry(t *testing.T) {
 			EntryDesc: &fwdpb.EntryDesc{
 				Entry: &fwdpb.EntryDesc_Flow{
 					Flow: &fwdpb.FlowEntryDesc{
-						Id: 1,
+						Id: 2,
 						Fields: []*fwdpb.PacketFieldMaskedBytes{{
 							FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_ADDR_DST}},
 							Bytes:   []byte{127, 0, 0, 1},
@@ -342,7 +342,7 @@ func TestCreateAclEntry(t *testing.T) {
 			EntryDesc: &fwdpb.EntryDesc{
 				Entry: &fwdpb.EntryDesc_Flow{
 					Flow: &fwdpb.FlowEntryDesc{
-						Id: 1,
+						Id: 2,
 						Fields: []*fwdpb.PacketFieldMaskedBytes{{
 							FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_ADDR_DST}},
 							Bytes:   []byte{127, 0, 0, 1},
@@ -379,7 +379,7 @@ func TestCreateAclEntry(t *testing.T) {
 			EntryDesc: &fwdpb.EntryDesc{
 				Entry: &fwdpb.EntryDesc_Flow{
 					Flow: &fwdpb.FlowEntryDesc{
-						Id: 1,
+						Id: 2,
 						Fields: []*fwdpb.PacketFieldMaskedBytes{{
 							FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_ADDR_DST}},
 							Bytes:   []byte{127, 0, 0, 1},
@@ -407,6 +407,9 @@ func TestCreateAclEntry(t *testing.T) {
 			}
 			dplane.ctx.Objects.Insert(&fwdobject.Base{}, &fwdpb.ObjectId{Id: "1"})
 			c, a, stopFn := newTestACL(t, dplane)
+			a.mgr.StoreAttributes(a.mgr.NextID(), &saipb.SwitchAttribute{
+				CpuPort: proto.Uint64(10),
+			})
 			a.tableToLocation[1] = tableLocation{
 				groupID: "1",
 				bank:    0,
@@ -435,21 +438,21 @@ func TestRemoveAclEntry(t *testing.T) {
 	}{{
 		desc: "not found",
 		req: &saipb.RemoveAclEntryRequest{
-			Oid: 2,
+			Oid: 3,
 		},
 		wantErr: "FailedPrecondition",
 	}, {
 		desc: "success",
 		req: &saipb.RemoveAclEntryRequest{
-			Oid: 1,
+			Oid: 2,
 		},
 		want: &fwdpb.TableEntryRemoveRequest{
 			ContextId: &fwdpb.ContextId{Id: "foo"},
-			TableId:   &fwdpb.TableId{ObjectId: &fwdpb.ObjectId{Id: "1"}},
+			TableId:   &fwdpb.TableId{ObjectId: &fwdpb.ObjectId{Id: "2"}},
 			EntryDesc: &fwdpb.EntryDesc{
 				Entry: &fwdpb.EntryDesc_Flow{
 					Flow: &fwdpb.FlowEntryDesc{
-						Id: 1,
+						Id: 2,
 						Fields: []*fwdpb.PacketFieldMaskedBytes{{
 							FieldId: &fwdpb.PacketFieldId{Field: &fwdpb.PacketField{FieldNum: fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_ADDR_DST}},
 							Bytes:   []byte{127, 0, 0, 1},
@@ -463,15 +466,17 @@ func TestRemoveAclEntry(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
 			dplane := &fakeSwitchDataplane{}
-
 			c, a, stopFn := newTestACL(t, dplane)
+			a.mgr.StoreAttributes(a.mgr.NextID(), &saipb.SwitchAttribute{
+				CpuPort: proto.Uint64(10),
+			})
 			defer stopFn()
-			a.tableToLocation[1] = tableLocation{
-				groupID: "1",
+			a.tableToLocation[2] = tableLocation{
+				groupID: "2",
 				bank:    0,
 			}
 			_, err := c.CreateAclEntry(context.TODO(), &saipb.CreateAclEntryRequest{
-				TableId: proto.Uint64(1),
+				TableId: proto.Uint64(2),
 				FieldDstIp: &saipb.AclFieldData{
 					Data: &saipb.AclFieldData_DataIp{
 						DataIp: []byte{127, 0, 0, 1},