From addf5b8ffd0588d7dcfc9e1b88e38f7cd470a165 Mon Sep 17 00:00:00 2001 From: paulyu Date: Mon, 17 Apr 2023 13:51:22 -0400 Subject: [PATCH 1/5] case insensitive fix --- cns/restserver/util.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cns/restserver/util.go b/cns/restserver/util.go index afbf126d11..e8aabaae5e 100644 --- a/cns/restserver/util.go +++ b/cns/restserver/util.go @@ -853,13 +853,18 @@ func (service *HTTPRestService) isNCWaitingForUpdate( "Skipping GetNCVersionStatus check from NMAgent", ncVersion, ncid) return true, types.NetworkContainerVfpProgramPending, "" } - nmaProgrammedNCVersionStr, ok := ncVersionList[ncid] + + // accept both upper and lower GUID from ncid(Swift_GUID) + // check each ncid in lower case if it's in ncVersionList + nmaProgrammedNCVersionStr, ok := ncVersionList[strings.ToLower(ncid)] if !ok { // NMA doesn't have this NC that we need programmed yet, bail out logger.Printf("[Azure CNS] Failed to get NC %s doesn't exist in NMAgent NC version list "+ "Skipping GetNCVersionStatus check from NMAgent", ncid) return true, types.NetworkContainerVfpProgramPending, "" + } + nmaProgrammedNCVersion, err := strconv.Atoi(nmaProgrammedNCVersionStr) if err != nil { // it's unclear whether or not this can actually happen. In the NMAgent From 969f3f7f3fbcdfb9c6242436eb92daccb193732d Mon Sep 17 00:00:00 2001 From: paulyufan2 Date: Thu, 11 May 2023 20:56:39 -0400 Subject: [PATCH 2/5] cnsclient log fix --- cns/restserver/api.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cns/restserver/api.go b/cns/restserver/api.go index 3ad7d72d71..7ecfbb2901 100644 --- a/cns/restserver/api.go +++ b/cns/restserver/api.go @@ -888,18 +888,22 @@ func (service *HTTPRestService) getAllNetworkContainers(w http.ResponseWriter, r var resp cns.GetAllNetworkContainersResponse - failedNCs := make([]string, 0) + failedNetworkContainerResponses := make([]cns.GetNetworkContainerResponse, 0) for i := 0; i < len(getAllNetworkContainerResponses); i++ { if getAllNetworkContainerResponses[i].Response.ReturnCode != types.Success { - failedNCs = append(failedNCs, getAllNetworkContainerResponses[i].NetworkContainerID) + failedNetworkContainerResponses = append(failedNetworkContainerResponses, getAllNetworkContainerResponses[i]) } } resp.NetworkContainers = getAllNetworkContainerResponses - if len(failedNCs) > 0 { + if len(failedNetworkContainerResponses) > 0 { + failedToGetNCErrMsg := make([]string, 0) + for _, failedNetworkContainerResponse := range failedNetworkContainerResponses { // nolint + failedToGetNCErrMsg = append(failedToGetNCErrMsg, fmt.Sprintf("Failed to get NC %s due to %s", failedNetworkContainerResponse.NetworkContainerID, failedNetworkContainerResponse.Response.Message)) + } resp.Response.ReturnCode = types.UnexpectedError - resp.Response.Message = fmt.Sprintf("Failed to get NCs %s", strings.Join(failedNCs, ",")) + resp.Response.Message = strings.Join(failedToGetNCErrMsg, "\n") } else { resp.Response.ReturnCode = types.Success resp.Response.Message = "Successfully retrieved NCs" From 755cd08edc5f8fa9ced2c7b5209ba2efdb547c9c Mon Sep 17 00:00:00 2001 From: paulyufan2 Date: Fri, 12 May 2023 20:17:52 -0400 Subject: [PATCH 3/5] remove util changes --- cns/restserver/util.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cns/restserver/util.go b/cns/restserver/util.go index e8aabaae5e..ea1bd4bd59 100644 --- a/cns/restserver/util.go +++ b/cns/restserver/util.go @@ -854,17 +854,13 @@ func (service *HTTPRestService) isNCWaitingForUpdate( return true, types.NetworkContainerVfpProgramPending, "" } - // accept both upper and lower GUID from ncid(Swift_GUID) - // check each ncid in lower case if it's in ncVersionList - nmaProgrammedNCVersionStr, ok := ncVersionList[strings.ToLower(ncid)] + nmaProgrammedNCVersionStr, ok := ncVersionList[ncid] if !ok { // NMA doesn't have this NC that we need programmed yet, bail out logger.Printf("[Azure CNS] Failed to get NC %s doesn't exist in NMAgent NC version list "+ "Skipping GetNCVersionStatus check from NMAgent", ncid) return true, types.NetworkContainerVfpProgramPending, "" - } - nmaProgrammedNCVersion, err := strconv.Atoi(nmaProgrammedNCVersionStr) if err != nil { // it's unclear whether or not this can actually happen. In the NMAgent From 90128018a1fc11bba18885880f18139d40f91900 Mon Sep 17 00:00:00 2001 From: paulyufan2 Date: Fri, 12 May 2023 20:18:19 -0400 Subject: [PATCH 4/5] remove util changes --- cns/restserver/util.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cns/restserver/util.go b/cns/restserver/util.go index ea1bd4bd59..afbf126d11 100644 --- a/cns/restserver/util.go +++ b/cns/restserver/util.go @@ -853,7 +853,6 @@ func (service *HTTPRestService) isNCWaitingForUpdate( "Skipping GetNCVersionStatus check from NMAgent", ncVersion, ncid) return true, types.NetworkContainerVfpProgramPending, "" } - nmaProgrammedNCVersionStr, ok := ncVersionList[ncid] if !ok { // NMA doesn't have this NC that we need programmed yet, bail out From 487efe0cae9d58534ecd3d711e98e5fa3ec5d818 Mon Sep 17 00:00:00 2001 From: paulyufan2 Date: Tue, 16 May 2023 19:48:28 -0400 Subject: [PATCH 5/5] add dummy commit --- cns/restserver/api.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cns/restserver/api.go b/cns/restserver/api.go index 7ecfbb2901..9c84d0b9ea 100644 --- a/cns/restserver/api.go +++ b/cns/restserver/api.go @@ -902,6 +902,7 @@ func (service *HTTPRestService) getAllNetworkContainers(w http.ResponseWriter, r for _, failedNetworkContainerResponse := range failedNetworkContainerResponses { // nolint failedToGetNCErrMsg = append(failedToGetNCErrMsg, fmt.Sprintf("Failed to get NC %s due to %s", failedNetworkContainerResponse.NetworkContainerID, failedNetworkContainerResponse.Response.Message)) } + resp.Response.ReturnCode = types.UnexpectedError resp.Response.Message = strings.Join(failedToGetNCErrMsg, "\n") } else {