ci fixes

openconfig · Jul 13, 2023 · 47a64c9 · 47a64c9
1 parent 33d1199
commit 47a64c9
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 17 deletions.
diff --git a/bgp/tests/proto/policyval/policy_validation.pb.go b/bgp/tests/proto/policyval/policy_validation.pb.go
diff --git a/dataplane/forwarding/fwdtable/bridge/BUILD b/dataplane/forwarding/fwdtable/bridge/BUILD
@@ -40,6 +40,7 @@ go_test(
         "//dataplane/forwarding/infra/fwdpacket",
         "//dataplane/forwarding/protocol",
         "//proto/forwarding",
+        "@com_github_go_logr_logr//:logr",
         "@org_uber_go_mock//gomock",
     ],
 )
diff --git a/dataplane/forwarding/fwdtable/bridge/bridge_test.go b/dataplane/forwarding/fwdtable/bridge/bridge_test.go
@@ -22,6 +22,8 @@ import (
 
 	"go.uber.org/mock/gomock"
 
+	"github.com/go-logr/logr"
+
 	"github.com/openconfig/lemming/dataplane/forwarding/fwdaction"
 	"github.com/openconfig/lemming/dataplane/forwarding/fwdport"
 	"github.com/openconfig/lemming/dataplane/forwarding/fwdport/porttestutil"
@@ -149,11 +151,11 @@ func (packet) Frame() []byte { return nil }
 // Debug control debugging for the packet.
 func (packet) Debug(bool) {}
 
-// Logf writes a message to the packet's log.
-func (packet) Logf(int, string, ...interface{}) {}
+// LogMsg eturns the contents of the packet's log.
+func (packet) LogMsgs() []string { return nil }
 
-// Log returns the contents of the packet's log.
-func (packet) Log() []string { return nil }
+// Log returns the packet logger.
+func (packet) Log() logr.Logger { return logr.New(nil) }
 
 // Attributes returns the attributes associated with the packet.
 func (packet) Attributes() fwdattribute.Set { return nil }

diff --git a/proto/dataplane/dataplane.pb.go b/proto/dataplane/dataplane.pb.go
diff --git a/proto/forwarding/forwarding_action.pb.go b/proto/forwarding/forwarding_action.pb.go
diff --git a/proto/forwarding/forwarding_attribute.pb.go b/proto/forwarding/forwarding_attribute.pb.go
diff --git a/proto/forwarding/forwarding_common.pb.go b/proto/forwarding/forwarding_common.pb.go
diff --git a/proto/forwarding/forwarding_info.pb.go b/proto/forwarding/forwarding_info.pb.go
diff --git a/proto/forwarding/forwarding_notification.pb.go b/proto/forwarding/forwarding_notification.pb.go
diff --git a/proto/forwarding/forwarding_operation.pb.go b/proto/forwarding/forwarding_operation.pb.go
diff --git a/proto/forwarding/forwarding_packetsink.pb.go b/proto/forwarding/forwarding_packetsink.pb.go
diff --git a/proto/forwarding/forwarding_port.pb.go b/proto/forwarding/forwarding_port.pb.go
diff --git a/proto/forwarding/forwarding_service.pb.go b/proto/forwarding/forwarding_service.pb.go
diff --git a/proto/forwarding/forwarding_table.pb.go b/proto/forwarding/forwarding_table.pb.go
diff --git a/proto/sysrib/sysrib.pb.go b/proto/sysrib/sysrib.pb.go