Start two CNS servers with different handlers (#2650)

* start two cns servers * fix linter issues * fix linter issue * enhance echo server log * fix Quang's comments * gofumpt cns service.go * fix defaultAPIServerAddress * run servers asynchoronsly * add server_test.go * fix UT test * enhance log * fix log issue * fix an issue * add a check for defaultAPIServerURL * fix GetOption func * enhance comments * fix defaultAPI URL to 127.0.0.1 * fix restapi method in echo server * remove unnecessary log info * fix comment1 * fix comments * add context to control echo server * fix TM's comments * do not enable local server if user specifies cnsurl by -c option * add -p port check when getting nodeURL * fix comments and use -p select from customer to start local server * fix a case when customer does not provide -p option * fix the issue if customer also does not provide -p and -c option * add UTs to launch server with different combinations * fix linter issue for UTs * fix UT linter issues * UT needs to stop service * remove duplicated test case * comments fix * fix linter issue * fix Tim's comments * fix comments * fix linter issue * handle type assertion * Adding cnsURL and cnsPort options to test server The startService function is a mistake that has been perpetuated through time and needs to be removed. As a consequence of its existence, it requires mixing concerns in all tests and stands in the way of refactoring. The addition of two type assertion checks caused this function to break, because the corresponding options were not set in the Service's configuration. This is a problem in itself--there's no reason the options should be pulled out of a map[string]interface{}. Given this, we can just set these two options in startService, committing sins to offset the ones in service.(*HTTPRestService).Service.Options. --------- Signed-off-by: Paul Yu <129891899+paulyufan2@users.noreply.github.com> Co-authored-by: Tim Raymond <traymond@microsoft.com>
Azure · Apr 29, 2024 · be2dcc0 · be2dcc0
1 parent 654b1fa
commit be2dcc0
Show file tree

Hide file tree

Showing 15 changed files with 398 additions and 197 deletions.
diff --git a/cnm/ipam/ipam.go b/cnm/ipam/ipam.go
@@ -118,7 +118,7 @@ func (plugin *ipamPlugin) getCapabilities(w http.ResponseWriter, r *http.Request
 		RequiresRequestReplay: requiresRequestReplay,
 	}
 
-	err := plugin.Listener.Encode(w, &resp)
+	err := common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -135,7 +135,7 @@ func (plugin *ipamPlugin) getDefaultAddressSpaces(w http.ResponseWriter, r *http
 	resp.LocalDefaultAddressSpace = localId
 	resp.GlobalDefaultAddressSpace = globalId
 
-	err := plugin.Listener.Encode(w, &resp)
+	err := common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -145,7 +145,7 @@ func (plugin *ipamPlugin) requestPool(w http.ResponseWriter, r *http.Request) {
 	var req RequestPoolRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -163,7 +163,7 @@ func (plugin *ipamPlugin) requestPool(w http.ResponseWriter, r *http.Request) {
 	poolId = ipam.NewAddressPoolId(req.AddressSpace, poolId, "").String()
 	resp := RequestPoolResponse{PoolID: poolId, Pool: subnet, Data: data}
 
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -173,7 +173,7 @@ func (plugin *ipamPlugin) releasePool(w http.ResponseWriter, r *http.Request) {
 	var req ReleasePoolRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -195,7 +195,7 @@ func (plugin *ipamPlugin) releasePool(w http.ResponseWriter, r *http.Request) {
 	// Encode response.
 	resp := ReleasePoolResponse{}
 
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -205,7 +205,7 @@ func (plugin *ipamPlugin) getPoolInfo(w http.ResponseWriter, r *http.Request) {
 	var req GetPoolInfoRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -234,7 +234,7 @@ func (plugin *ipamPlugin) getPoolInfo(w http.ResponseWriter, r *http.Request) {
 		resp.UnhealthyAddresses = append(resp.UnhealthyAddresses, addr.String())
 	}
 
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -244,7 +244,7 @@ func (plugin *ipamPlugin) requestAddress(w http.ResponseWriter, r *http.Request)
 	var req RequestAddressRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -275,7 +275,7 @@ func (plugin *ipamPlugin) requestAddress(w http.ResponseWriter, r *http.Request)
 	data := make(map[string]string)
 	resp := RequestAddressResponse{Address: addr, Data: data}
 
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -285,7 +285,7 @@ func (plugin *ipamPlugin) releaseAddress(w http.ResponseWriter, r *http.Request)
 	var req ReleaseAddressRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -307,7 +307,7 @@ func (plugin *ipamPlugin) releaseAddress(w http.ResponseWriter, r *http.Request)
 	// Encode response.
 	resp := ReleaseAddressResponse{}
 
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
diff --git a/cnm/network/network.go b/cnm/network/network.go
@@ -128,7 +128,7 @@ func (plugin *netPlugin) getCapabilities(w http.ResponseWriter, r *http.Request)
 	log.Request(plugin.Name, &req, nil)
 
 	resp := getCapabilitiesResponse{Scope: plugin.scope}
-	err := plugin.Listener.Encode(w, &resp)
+	err := common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -138,7 +138,7 @@ func (plugin *netPlugin) createNetwork(w http.ResponseWriter, r *http.Request) {
 	var req createNetworkRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -182,7 +182,7 @@ func (plugin *netPlugin) createNetwork(w http.ResponseWriter, r *http.Request) {
 
 	// Encode response.
 	resp := createNetworkResponse{}
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -192,7 +192,7 @@ func (plugin *netPlugin) deleteNetwork(w http.ResponseWriter, r *http.Request) {
 	var req deleteNetworkRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -207,7 +207,7 @@ func (plugin *netPlugin) deleteNetwork(w http.ResponseWriter, r *http.Request) {
 
 	// Encode response.
 	resp := deleteNetworkResponse{}
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -217,7 +217,7 @@ func (plugin *netPlugin) createEndpoint(w http.ResponseWriter, r *http.Request)
 	var req createEndpointRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -256,7 +256,7 @@ func (plugin *netPlugin) createEndpoint(w http.ResponseWriter, r *http.Request)
 	// Encode response.
 	resp := createEndpointResponse{}
 
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -266,7 +266,7 @@ func (plugin *netPlugin) deleteEndpoint(w http.ResponseWriter, r *http.Request)
 	var req deleteEndpointRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -281,7 +281,7 @@ func (plugin *netPlugin) deleteEndpoint(w http.ResponseWriter, r *http.Request)
 
 	// Encode response.
 	resp := deleteEndpointResponse{}
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -291,7 +291,7 @@ func (plugin *netPlugin) join(w http.ResponseWriter, r *http.Request) {
 	var req joinRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -315,7 +315,7 @@ func (plugin *netPlugin) join(w http.ResponseWriter, r *http.Request) {
 		Gateway:       ep.Gateways[0].String(),
 	}
 
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -325,7 +325,7 @@ func (plugin *netPlugin) leave(w http.ResponseWriter, r *http.Request) {
 	var req leaveRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -340,7 +340,7 @@ func (plugin *netPlugin) leave(w http.ResponseWriter, r *http.Request) {
 
 	// Encode response.
 	resp := leaveResponse{}
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
@@ -350,7 +350,7 @@ func (plugin *netPlugin) endpointOperInfo(w http.ResponseWriter, r *http.Request
 	var req endpointOperInfoRequest
 
 	// Decode request.
-	err := plugin.Listener.Decode(w, r, &req)
+	err := common.Decode(w, r, &req)
 	log.Request(plugin.Name, &req, err)
 	if err != nil {
 		return
@@ -365,7 +365,7 @@ func (plugin *netPlugin) endpointOperInfo(w http.ResponseWriter, r *http.Request
 
 	// Encode response.
 	resp := endpointOperInfoResponse{Value: epInfo.Data}
-	err = plugin.Listener.Encode(w, &resp)
+	err = common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, returnCode, returnStr, err)
 }
diff --git a/cnm/plugin.go b/cnm/plugin.go
@@ -121,15 +121,15 @@ func (plugin *Plugin) activate(w http.ResponseWriter, r *http.Request) {
 	log.Request(plugin.Name, &req, nil)
 
 	resp := ActivateResponse{Implements: plugin.Listener.GetEndpoints()}
-	err := plugin.Listener.Encode(w, &resp)
+	err := common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, 0, "Success", err)
 }
 
 // SendErrorResponse sends and logs an error response.
 func (plugin *Plugin) SendErrorResponse(w http.ResponseWriter, errMsg error) {
 	resp := errorResponse{errMsg.Error()}
-	err := plugin.Listener.Encode(w, &resp)
+	err := common.Encode(w, &resp)
 
 	log.Response(plugin.Name, &resp, 0, "Success", err)
 }
diff --git a/cns/common/service.go b/cns/common/service.go
@@ -38,8 +38,16 @@ type ServiceConfig struct {
 	Listener    *acn.Listener
 	ErrChan     chan<- error
 	Store       store.KeyValueStore
+	Server      server
 	ChannelMode string
-	TlsSettings tls.TlsSettings
+	TLSSettings tls.TlsSettings
+}
+
+// server struct to store primaryInterfaceIP from VM, port where customer provides by -p and temporary flag EnableLocalServer
+type server struct {
+	PrimaryInterfaceIP string
+	Port               string
+	EnableLocalServer  bool // TODO: Remove this flag once -c option gets deprecated
 }
 
 // NewService creates a new Service object.