Skip to content

Commit 8e7c43e

Browse files
Remove GetNetworkContainerStatus func (#741)
This change removes the unused / unsupported function exposed by CNS
1 parent 007e903 commit 8e7c43e

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

cns/restserver/api.go

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -953,66 +953,6 @@ func (service *HTTPRestService) deleteNetworkContainer(w http.ResponseWriter, r
953953
logger.Response(service.Name, reserveResp, resp.ReturnCode, ReturnCodeToString(resp.ReturnCode), err)
954954
}
955955

956-
func (service *HTTPRestService) getNetworkContainerStatus(w http.ResponseWriter, r *http.Request) {
957-
logger.Printf("[Azure CNS] getNetworkContainerStatus")
958-
959-
var req cns.GetNetworkContainerStatusRequest
960-
returnMessage := ""
961-
returnCode := 0
962-
963-
err := service.Listener.Decode(w, r, &req)
964-
logger.Request(service.Name, &req, err)
965-
if err != nil {
966-
return
967-
}
968-
969-
service.RLock()
970-
defer service.RUnlock()
971-
var ok bool
972-
var containerDetails containerstatus
973-
974-
containerInfo := service.state.ContainerStatus
975-
if containerInfo != nil {
976-
containerDetails, ok = containerInfo[req.NetworkContainerid]
977-
}
978-
979-
var hostVersion string
980-
var vmVersion string
981-
982-
if ok {
983-
savedReq := containerDetails.CreateNetworkContainerRequest
984-
containerVersion, err := service.imdsClient.GetNetworkContainerInfoFromHost(
985-
req.NetworkContainerid,
986-
savedReq.PrimaryInterfaceIdentifier,
987-
savedReq.AuthorizationToken, swiftAPIVersion)
988-
989-
if err != nil {
990-
returnCode = CallToHostFailed
991-
returnMessage = err.Error()
992-
} else {
993-
hostVersion = containerVersion.ProgrammedVersion
994-
}
995-
} else {
996-
returnMessage = "[Azure CNS] Never received call to create this container."
997-
returnCode = UnknownContainerID
998-
}
999-
1000-
resp := cns.Response{
1001-
ReturnCode: returnCode,
1002-
Message: returnMessage,
1003-
}
1004-
1005-
networkContainerStatusReponse := cns.GetNetworkContainerStatusResponse{
1006-
Response: resp,
1007-
NetworkContainerid: req.NetworkContainerid,
1008-
AzureHostVersion: hostVersion,
1009-
Version: vmVersion,
1010-
}
1011-
1012-
err = service.Listener.Encode(w, &networkContainerStatusReponse)
1013-
logger.Response(service.Name, networkContainerStatusReponse, resp.ReturnCode, ReturnCodeToString(resp.ReturnCode), err)
1014-
}
1015-
1016956
func (service *HTTPRestService) getInterfaceForContainer(w http.ResponseWriter, r *http.Request) {
1017957
logger.Printf("[Azure CNS] getInterfaceForContainer")
1018958

cns/restserver/restserver.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ func (service *HTTPRestService) Start(config *common.ServiceConfig) error {
161161
listener.AddHandler(cns.GetUnhealthyIPAddressesPath, service.getUnhealthyIPAddresses)
162162
listener.AddHandler(cns.CreateOrUpdateNetworkContainer, service.createOrUpdateNetworkContainer)
163163
listener.AddHandler(cns.DeleteNetworkContainer, service.deleteNetworkContainer)
164-
listener.AddHandler(cns.GetNetworkContainerStatus, service.getNetworkContainerStatus)
165164
listener.AddHandler(cns.GetInterfaceForContainer, service.getInterfaceForContainer)
166165
listener.AddHandler(cns.SetOrchestratorType, service.setOrchestratorType)
167166
listener.AddHandler(cns.GetNetworkContainerByOrchestratorContext, service.getNetworkContainerByOrchestratorContext)
@@ -190,7 +189,6 @@ func (service *HTTPRestService) Start(config *common.ServiceConfig) error {
190189
listener.AddHandler(cns.V2Prefix+cns.GetUnhealthyIPAddressesPath, service.getUnhealthyIPAddresses)
191190
listener.AddHandler(cns.V2Prefix+cns.CreateOrUpdateNetworkContainer, service.createOrUpdateNetworkContainer)
192191
listener.AddHandler(cns.V2Prefix+cns.DeleteNetworkContainer, service.deleteNetworkContainer)
193-
listener.AddHandler(cns.V2Prefix+cns.GetNetworkContainerStatus, service.getNetworkContainerStatus)
194192
listener.AddHandler(cns.V2Prefix+cns.GetInterfaceForContainer, service.getInterfaceForContainer)
195193
listener.AddHandler(cns.V2Prefix+cns.SetOrchestratorType, service.setOrchestratorType)
196194
listener.AddHandler(cns.V2Prefix+cns.GetNetworkContainerByOrchestratorContext, service.getNetworkContainerByOrchestratorContext)

0 commit comments

Comments
 (0)