|
@@ -396,7 +396,6 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("hostid or network cannot be empty"), "badrequest"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("hostid or network cannot be empty"), "badrequest"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- logger.Log(0, "Hereeeee-----> 1")
|
|
|
|
// confirm host exists
|
|
// confirm host exists
|
|
currHost, err := logic.GetHost(hostid)
|
|
currHost, err := logic.GetHost(hostid)
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -422,7 +421,6 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- logger.Log(0, "Hereeeee-----> 2")
|
|
|
|
|
|
|
|
node, err := logic.UpdateHostNetwork(currHost, network, false)
|
|
node, err := logic.UpdateHostNetwork(currHost, network, false)
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -447,25 +445,21 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- logger.Log(0, "Hereeeee-----> 3")
|
|
|
|
var gwClients []models.ExtClient
|
|
var gwClients []models.ExtClient
|
|
if node.IsIngressGateway {
|
|
if node.IsIngressGateway {
|
|
gwClients = logic.GetGwExtclients(node.ID.String(), node.Network)
|
|
gwClients = logic.GetGwExtclients(node.ID.String(), node.Network)
|
|
}
|
|
}
|
|
- logger.Log(0, "Hereeeee-----> 4")
|
|
|
|
logger.Log(1, "deleting node", node.ID.String(), "from host", currHost.Name)
|
|
logger.Log(1, "deleting node", node.ID.String(), "from host", currHost.Name)
|
|
if err := logic.DeleteNode(node, forceDelete); err != nil {
|
|
if err := logic.DeleteNode(node, forceDelete); err != nil {
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to delete node"), "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to delete node"), "internal"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- logger.Log(0, "Hereeeee-----> 5")
|
|
|
|
go func() {
|
|
go func() {
|
|
mq.PublishMqUpdatesForDeletedNode(*node, true, gwClients)
|
|
mq.PublishMqUpdatesForDeletedNode(*node, true, gwClients)
|
|
if servercfg.IsDNSMode() {
|
|
if servercfg.IsDNSMode() {
|
|
logic.SetDNS()
|
|
logic.SetDNS()
|
|
}
|
|
}
|
|
}()
|
|
}()
|
|
- logger.Log(0, "Hereeeee-----> 6")
|
|
|
|
logger.Log(2, r.Header.Get("user"), fmt.Sprintf("removed host %s from network %s", currHost.Name, network))
|
|
logger.Log(2, r.Header.Get("user"), fmt.Sprintf("removed host %s from network %s", currHost.Name, network))
|
|
w.WriteHeader(http.StatusOK)
|
|
w.WriteHeader(http.StatusOK)
|
|
}
|
|
}
|