address comments

Author: smittal22

cns/restserver/restserver.go

@@ -292,10 +292,10 @@ func (service *HTTPRestService) Init(config *common.ServiceConfig) error {
 	listener.AddHandler(cns.NetworkContainersURLPath, service.getOrRefreshNetworkContainers)
 	listener.AddHandler(cns.GetHomeAz, service.getHomeAz)
 	listener.AddHandler(cns.EndpointPath, service.EndpointHandlerAPI)
-	listener.AddHandler(cns.GetNCList, service.nmAgentNCListHandler)
-	// This API is only needed for Direct channel mode with Swift v2.
+	// This API is only needed for Direct channel mode.
 	if config.ChannelMode == cns.Direct {
 		listener.AddHandler(cns.GetVMUniqueID, service.getVMUniqueID)
+		listener.AddHandler(cns.GetNCList, service.nmAgentNCListHandler)
 	}
 
 	// handlers for v0.2
@@ -319,10 +319,10 @@ func (service *HTTPRestService) Init(config *common.ServiceConfig) error {
 	listener.AddHandler(cns.V2Prefix+cns.NmAgentSupportedApisPath, service.nmAgentSupportedApisHandler)
 	listener.AddHandler(cns.V2Prefix+cns.GetHomeAz, service.getHomeAz)
 	listener.AddHandler(cns.V2Prefix+cns.EndpointPath, service.EndpointHandlerAPI)
-	listener.AddHandler(cns.V2Prefix+cns.GetNCList, service.nmAgentNCListHandler)
-	// This API is only needed for Direct channel mode with Swift v2.
+	// This API is only needed for Direct channel mode.
 	if config.ChannelMode == cns.Direct {
 		listener.AddHandler(cns.V2Prefix+cns.GetVMUniqueID, service.getVMUniqueID)
+		listener.AddHandler(cns.V2Prefix+cns.GetNCList, service.nmAgentNCListHandler)
 	}
 
 	// Initialize HTTP client to be reused in CNS