Skip to content

Add a function to handle updating pending programming IPs. #700

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

Closed
wants to merge 2 commits into from
Closed

Add a function to handle updating pending programming IPs. #700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ee592c
Add a function to handle updating pending programming IPs.
csfmomo Oct 21, 2020
b5b3fbf
Simplify the logic.
csfmomo Oct 22, 2020
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
22 changes: 22 additions & 0 deletions cns/restserver/ipam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,28 @@ func (service *HTTPRestService) MarkIPsAsPending(numberToMark int) (map[string]c
return nil, fmt.Errorf("Failed to mark %d IP's as pending, only marked %d IP's", numberToMark, len(pendingReleaseIPs))
}

// UpdatePendingProgrammingIPs will update pending programming IPs to available if
// NMAgent side's programmed NC version keep up with NC version attached with secondary IP.
func (service *HTTPRestService) UpdatePendingProgrammingIPs(nmagentNCVersion string) error {
service.Lock()
defer service.Unlock()
//for uuid, ipConfigurationStatus := range service.PodIPConfigState {
for _, containerstatus := range service.state.ContainerStatus {
for uuid, secondaryIPConfigs := range containerstatus.CreateNetworkContainerRequest.SecondaryIPConfigs {
ipConfigStatus, exist := service.PodIPConfigState[uuid]
if exist {
// TODO change cns.Available to cns.PendingProgrammiong when #690 merged.
// TODO change ipConfigStatus.IPAddress to ipConfigStatus.NCVersion when #697 merged.
if ipConfigStatus.State == cns.Available && secondaryIPConfigs.IPAddress <= nmagentNCVersion {
ipConfigStatus.State = cns.Available
logger.Printf("Change ip %s with uuid %s from pending programming to %s", ipConfigStatus.IPAddress, uuid, cns.Available)
}
}
}
}
return fmt.Errorf("Failed to mark IP's from pending programming to available")
}

func (service *HTTPRestService) GetPodIPConfigState() map[string]cns.IPConfigurationStatus {
service.RLock()
defer service.RUnlock()
Expand Down