Skip to content

Fix the NC ID error when get container #1767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 7, 2023
Merged

Fix the NC ID error when get container #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0204111
Fix nc id mismatch
csfmomo Jan 23, 2023
6cb3b5a
Fix the nc ID prefix issue
csfmomo Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions cns/restserver/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,30 @@ func TestGetNetworkContainerByOrchestratorContext(t *testing.T) {
t.Fatal(err)
}

mnma := &fakes.NMAgentClientFake{
PutNetworkContainerF: func(_ context.Context, _ *nmagent.PutNetworkContainerRequest) error {
return nil
},
JoinNetworkF: func(_ context.Context, _ nmagent.JoinNetworkRequest) error {
return nil
},
}

cleanup := setMockNMAgent(svc, mnma)
defer cleanup()

mnma.GetNCVersionListF = func(_ context.Context) (nmagent.NCVersionList, error) {
return nmagent.NCVersionList{
Containers: []nmagent.NCVersion{
{
// Must set it as params.ncID without cns.SwiftPrefix to mock real nmagent nc format.
NetworkContainerID: params.ncID,
Version: params.ncVersion,
},
},
}, nil
}

fmt.Println("Now calling getNetworkContainerByContext")
resp, err := getNetworkContainerByContext(params)
if err != nil {
Expand Down Expand Up @@ -554,7 +578,8 @@ func TestGetNetworkContainerVersionStatus(t *testing.T) {
return nmagent.NCVersionList{
Containers: []nmagent.NCVersion{
{
NetworkContainerID: cns.SwiftPrefix + params.ncID,
// Must set it as params.ncID without cns.SwiftPrefix to mock real nmagent nc format.
NetworkContainerID: params.ncID,
Version: params.ncVersion,
},
},
Expand Down Expand Up @@ -596,7 +621,8 @@ func TestGetNetworkContainerVersionStatus(t *testing.T) {
return nmagent.NCVersionList{
Containers: []nmagent.NCVersion{
{
NetworkContainerID: cns.SwiftPrefix + params.ncID,
// Must set it as params.ncID without cns.SwiftPrefix to mock real nmagent nc format.
NetworkContainerID: params.ncID,
Version: "0",
},
},
Expand Down
3 changes: 1 addition & 2 deletions cns/restserver/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,8 @@ func (service *HTTPRestService) getNetworkContainerResponse(
}
nmaNCs := map[string]string{}
for _, nc := range ncVersionListResp.Containers {
nmaNCs[nc.NetworkContainerID] = nc.Version
nmaNCs[cns.SwiftPrefix+nc.NetworkContainerID] = nc.Version
}

if exists && !skipNCVersionCheck {
// If the goal state is available with CNS, check if the NC is pending VFP programming
waitingForUpdate, getNetworkContainerResponse.Response.ReturnCode, getNetworkContainerResponse.Response.Message = service.isNCWaitingForUpdate(
Expand Down