From 9223429a1a199f6db61f4e1950b2990b3f5b418b Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Fri, 16 Jun 2023 21:10:26 +0000 Subject: [PATCH] fix: implement String for logging of PodInfo and IPConfig Signed-off-by: Evan Baker --- cns/NetworkContainerContract.go | 7 +++++++ cns/api.go | 6 +++--- cns/restserver/util.go | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go index c07cdaa0df..9d041a6cfe 100644 --- a/cns/NetworkContainerContract.go +++ b/cns/NetworkContainerContract.go @@ -169,6 +169,8 @@ type PodInfo interface { OrchestratorContext() (json.RawMessage, error) // Equals implements a functional equals for PodInfos Equals(PodInfo) bool + // String implements string for logging PodInfos + String() string } type KubernetesPodInfo struct { @@ -186,6 +188,11 @@ type podInfo struct { Version podInfoScheme } +func (p podInfo) String() string { + return fmt.Sprintf("InfraContainerID: [%s], InterfaceID: [%s], Key: [%s], Name: [%s], Namespace: [%s]", + p.InfraContainerID(), p.InterfaceID(), p.Key(), p.Name(), p.Namespace()) +} + func (p *podInfo) Equals(o PodInfo) bool { if (p == nil) != (o == nil) { return false diff --git a/cns/api.go b/cns/api.go index fd3ef728d9..705907b238 100644 --- a/cns/api.go +++ b/cns/api.go @@ -97,9 +97,9 @@ func (i *IPConfigurationStatus) WithStateMiddleware(fs ...stateMiddlewareFunc) { i.stateMiddlewareFuncs = append(i.stateMiddlewareFuncs, fs...) } -func (i *IPConfigurationStatus) String() string { - return fmt.Sprintf("IPConfigurationStatus: Id: [%s], NcId: [%s], IpAddress: [%s], State: [%s], PodInfo: [%v]", - i.ID, i.NCID, i.IPAddress, i.state, i.PodInfo) +func (i IPConfigurationStatus) String() string { + return fmt.Sprintf("ID: [%s], NCID: [%s], IPAddress: [%s], State: [%s], LastStateTransition: [%s] PodInfo: [%s]", + i.ID, i.NCID, i.IPAddress, i.state, i.LastStateTransition.Format(time.RFC3339), i.PodInfo) } // MarshalJSON is a custom marshaller for IPConfigurationStatus that diff --git a/cns/restserver/util.go b/cns/restserver/util.go index ba9d903463..f8b4822a07 100644 --- a/cns/restserver/util.go +++ b/cns/restserver/util.go @@ -290,7 +290,7 @@ func (service *HTTPRestService) addIPConfigStateUntransacted(ncID string, hostVe if ipState, exists := service.PodIPConfigState[ipID]; exists { logger.Printf("[Azure-Cns] Set ipId %s, IP %s version to %d, programmed host nc version is %d, "+ - "ipState: %+v", ipID, ipconfig.IPAddress, ipconfig.NCVersion, hostVersion, ipState) + "ipState: %s", ipID, ipconfig.IPAddress, ipconfig.NCVersion, hostVersion, ipState) continue }