Merge branch 'netclient_refactor_latest' of https://github.com/gravitl/netmaker into netclient_refactor_peer_updates

controllers/hosts.go

@@ -130,6 +130,10 @@ func deleteHost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if err = mq.DeleteMqClient(currHost.ID.String()); err != nil {
+		logger.Log(0, "error removing DynSec credentials for host:", currHost.Name, err.Error())
+	}
+
 	apiHostData := currHost.ConvertNMHostToAPI()
 	logger.Log(2, r.Header.Get("user"), "removed host", currHost.Name)
 	w.WriteHeader(http.StatusOK)

models/api_node.go

@@ -113,7 +113,7 @@ func (a *ApiNode) ConvertToServerNode(currentNode *Node) *Node {
 func (nm *Node) ConvertToAPINode() *ApiNode {
 	apiNode := ApiNode{}
 	apiNode.ID = nm.ID.String()
-	apiNode.HostID = nm.ID.String()
+	apiNode.HostID = nm.HostID.String()
 	apiNode.Address = nm.Address.String()
 	if isEmptyAddr(apiNode.Address) {
 		apiNode.Address = ""