From 47a64c902e0a36ee09c2df5b2a118d2827d2235b Mon Sep 17 00:00:00 2001 From: Daniel Grau Date: Thu, 13 Jul 2023 00:08:53 +0000 Subject: [PATCH] ci fixes --- bgp/tests/proto/policyval/policy_validation.pb.go | 2 +- dataplane/forwarding/fwdtable/bridge/BUILD | 1 + dataplane/forwarding/fwdtable/bridge/bridge_test.go | 10 ++++++---- proto/dataplane/dataplane.pb.go | 2 +- proto/forwarding/forwarding_action.pb.go | 2 +- proto/forwarding/forwarding_attribute.pb.go | 2 +- proto/forwarding/forwarding_common.pb.go | 2 +- proto/forwarding/forwarding_info.pb.go | 2 +- proto/forwarding/forwarding_notification.pb.go | 2 +- proto/forwarding/forwarding_operation.pb.go | 2 +- proto/forwarding/forwarding_packetsink.pb.go | 2 +- proto/forwarding/forwarding_port.pb.go | 2 +- proto/forwarding/forwarding_service.pb.go | 2 +- proto/forwarding/forwarding_table.pb.go | 2 +- proto/sysrib/sysrib.pb.go | 2 +- 15 files changed, 20 insertions(+), 17 deletions(-) diff --git a/bgp/tests/proto/policyval/policy_validation.pb.go b/bgp/tests/proto/policyval/policy_validation.pb.go index 3ab7444e..26ad11b9 100644 --- a/bgp/tests/proto/policyval/policy_validation.pb.go +++ b/bgp/tests/proto/policyval/policy_validation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: bgp/tests/proto/policyval/policy_validation.proto diff --git a/dataplane/forwarding/fwdtable/bridge/BUILD b/dataplane/forwarding/fwdtable/bridge/BUILD index f904934e..5cdb8cf6 100644 --- 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 index fbce0600..ebdf56ff 100644 --- 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 index 051f1e75..a0586c11 100644 --- a/proto/dataplane/dataplane.pb.go +++ b/proto/dataplane/dataplane.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/dataplane/dataplane.proto diff --git a/proto/forwarding/forwarding_action.pb.go b/proto/forwarding/forwarding_action.pb.go index ab184dfd..b9200a7f 100644 --- a/proto/forwarding/forwarding_action.pb.go +++ b/proto/forwarding/forwarding_action.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_action.proto diff --git a/proto/forwarding/forwarding_attribute.pb.go b/proto/forwarding/forwarding_attribute.pb.go index 4504913d..77890a2f 100644 --- a/proto/forwarding/forwarding_attribute.pb.go +++ b/proto/forwarding/forwarding_attribute.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_attribute.proto diff --git a/proto/forwarding/forwarding_common.pb.go b/proto/forwarding/forwarding_common.pb.go index 8a98b352..f1517197 100644 --- a/proto/forwarding/forwarding_common.pb.go +++ b/proto/forwarding/forwarding_common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_common.proto diff --git a/proto/forwarding/forwarding_info.pb.go b/proto/forwarding/forwarding_info.pb.go index 70af7430..e5050139 100644 --- a/proto/forwarding/forwarding_info.pb.go +++ b/proto/forwarding/forwarding_info.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_info.proto diff --git a/proto/forwarding/forwarding_notification.pb.go b/proto/forwarding/forwarding_notification.pb.go index 546c1593..9d7d66b2 100644 --- a/proto/forwarding/forwarding_notification.pb.go +++ b/proto/forwarding/forwarding_notification.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_notification.proto diff --git a/proto/forwarding/forwarding_operation.pb.go b/proto/forwarding/forwarding_operation.pb.go index 602cca32..216a73ef 100644 --- a/proto/forwarding/forwarding_operation.pb.go +++ b/proto/forwarding/forwarding_operation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_operation.proto diff --git a/proto/forwarding/forwarding_packetsink.pb.go b/proto/forwarding/forwarding_packetsink.pb.go index a93b3867..c0fd0b0e 100644 --- a/proto/forwarding/forwarding_packetsink.pb.go +++ b/proto/forwarding/forwarding_packetsink.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_packetsink.proto diff --git a/proto/forwarding/forwarding_port.pb.go b/proto/forwarding/forwarding_port.pb.go index 9f58f754..15fbb03e 100644 --- a/proto/forwarding/forwarding_port.pb.go +++ b/proto/forwarding/forwarding_port.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_port.proto diff --git a/proto/forwarding/forwarding_service.pb.go b/proto/forwarding/forwarding_service.pb.go index 579e81d1..0f634fcb 100644 --- a/proto/forwarding/forwarding_service.pb.go +++ b/proto/forwarding/forwarding_service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_service.proto diff --git a/proto/forwarding/forwarding_table.pb.go b/proto/forwarding/forwarding_table.pb.go index 12a7baf8..3635d1f7 100644 --- a/proto/forwarding/forwarding_table.pb.go +++ b/proto/forwarding/forwarding_table.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/forwarding/forwarding_table.proto diff --git a/proto/sysrib/sysrib.pb.go b/proto/sysrib/sysrib.pb.go index 20ca00da..73ae3a68 100644 --- a/proto/sysrib/sysrib.pb.go +++ b/proto/sysrib/sysrib.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: proto/sysrib/sysrib.proto