Skip to content

Remove unused/unsupported func - GetNetworkContainerStatus #741

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 1 commit into from
Nov 25, 2020
Merged

Remove unused/unsupported func - GetNetworkContainerStatus #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 0 additions & 60 deletions cns/restserver/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,66 +953,6 @@ func (service *HTTPRestService) deleteNetworkContainer(w http.ResponseWriter, r
logger.Response(service.Name, reserveResp, resp.ReturnCode, ReturnCodeToString(resp.ReturnCode), err)
}

func (service *HTTPRestService) getNetworkContainerStatus(w http.ResponseWriter, r *http.Request) {
logger.Printf("[Azure CNS] getNetworkContainerStatus")

var req cns.GetNetworkContainerStatusRequest
returnMessage := ""
returnCode := 0

err := service.Listener.Decode(w, r, &req)
logger.Request(service.Name, &req, err)
if err != nil {
return
}

service.RLock()
defer service.RUnlock()
var ok bool
var containerDetails containerstatus

containerInfo := service.state.ContainerStatus
if containerInfo != nil {
containerDetails, ok = containerInfo[req.NetworkContainerid]
}

var hostVersion string
var vmVersion string

if ok {
savedReq := containerDetails.CreateNetworkContainerRequest
containerVersion, err := service.imdsClient.GetNetworkContainerInfoFromHost(
req.NetworkContainerid,
savedReq.PrimaryInterfaceIdentifier,
savedReq.AuthorizationToken, swiftAPIVersion)

if err != nil {
returnCode = CallToHostFailed
returnMessage = err.Error()
} else {
hostVersion = containerVersion.ProgrammedVersion
}
} else {
returnMessage = "[Azure CNS] Never received call to create this container."
returnCode = UnknownContainerID
}

resp := cns.Response{
ReturnCode: returnCode,
Message: returnMessage,
}

networkContainerStatusReponse := cns.GetNetworkContainerStatusResponse{
Response: resp,
NetworkContainerid: req.NetworkContainerid,
AzureHostVersion: hostVersion,
Version: vmVersion,
}

err = service.Listener.Encode(w, &networkContainerStatusReponse)
logger.Response(service.Name, networkContainerStatusReponse, resp.ReturnCode, ReturnCodeToString(resp.ReturnCode), err)
}

func (service *HTTPRestService) getInterfaceForContainer(w http.ResponseWriter, r *http.Request) {
logger.Printf("[Azure CNS] getInterfaceForContainer")

Expand Down
2 changes: 0 additions & 2 deletions cns/restserver/restserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ func (service *HTTPRestService) Start(config *common.ServiceConfig) error {
listener.AddHandler(cns.GetUnhealthyIPAddressesPath, service.getUnhealthyIPAddresses)
listener.AddHandler(cns.CreateOrUpdateNetworkContainer, service.createOrUpdateNetworkContainer)
listener.AddHandler(cns.DeleteNetworkContainer, service.deleteNetworkContainer)
listener.AddHandler(cns.GetNetworkContainerStatus, service.getNetworkContainerStatus)
listener.AddHandler(cns.GetInterfaceForContainer, service.getInterfaceForContainer)
listener.AddHandler(cns.SetOrchestratorType, service.setOrchestratorType)
listener.AddHandler(cns.GetNetworkContainerByOrchestratorContext, service.getNetworkContainerByOrchestratorContext)
Expand Down Expand Up @@ -190,7 +189,6 @@ func (service *HTTPRestService) Start(config *common.ServiceConfig) error {
listener.AddHandler(cns.V2Prefix+cns.GetUnhealthyIPAddressesPath, service.getUnhealthyIPAddresses)
listener.AddHandler(cns.V2Prefix+cns.CreateOrUpdateNetworkContainer, service.createOrUpdateNetworkContainer)
listener.AddHandler(cns.V2Prefix+cns.DeleteNetworkContainer, service.deleteNetworkContainer)
listener.AddHandler(cns.V2Prefix+cns.GetNetworkContainerStatus, service.getNetworkContainerStatus)
listener.AddHandler(cns.V2Prefix+cns.GetInterfaceForContainer, service.getInterfaceForContainer)
listener.AddHandler(cns.V2Prefix+cns.SetOrchestratorType, service.setOrchestratorType)
listener.AddHandler(cns.V2Prefix+cns.GetNetworkContainerByOrchestratorContext, service.getNetworkContainerByOrchestratorContext)
Expand Down