gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-01 17:34:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

remove adding,modifying roles

Browse source
This commit is contained in:
Abhishek Kondur 2023-01-22 17:57:49 +04:00
parent 20bad4e2ee
commit a33338fa99
3 changed files with 1 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
controllers/hosts.go
View file

@ -100,16 +100,6 @@ func updateHost(w http.ResponseWriter, r *http.Request) {
logic.UpdateHostRelay(currHost.ID.String(), currHost.RelayedHosts, newHost.RelayedHosts)
}
newNetworks := logic.GetHostNetworks(newHost.ID.String())
if len(newNetworks) > 0 {
if err = mq.ModifyClient(&mq.MqClient{
ID: currHost.ID.String(),
Text: currHost.Name,
Networks: newNetworks,
}); err != nil {
logger.Log(0, r.Header.Get("user"), "failed to update host networks roles in DynSec:", err.Error())
}
}
// publish host update through MQ
if err := mq.HostUpdate(&models.HostUpdate{
Action: models.UpdateHost,
@ -215,16 +205,6 @@ func addHostToNetwork(w http.ResponseWriter, r *http.Request) {
}); err != nil {
logger.Log(0, r.Header.Get("user"), "failed to update host to join network:", hostid, network, err.Error())
}
networks := logic.GetHostNetworks(currHost.ID.String())
if len(networks) > 0 {
if err = mq.ModifyClient(&mq.MqClient{
ID: currHost.ID.String(),
Text: currHost.Name,
Networks: networks,
}); err != nil {
logger.Log(0, r.Header.Get("user"), "failed to update host networks roles in DynSec:", hostid, err.Error())
}
}
logger.Log(2, r.Header.Get("user"), fmt.Sprintf("added host %s to network %s", currHost.Name, network))
w.WriteHeader(http.StatusOK)

9
controllers/network.go
View file

@ -372,10 +372,6 @@ func deleteNetwork(w http.ResponseWriter, r *http.Request) {
return
}
if err := mq.DeleteNetworkRole(network); err != nil {
logger.Log(0, fmt.Sprintf("failed to remove network DynSec role: %v", err.Error()))
}
logger.Log(1, r.Header.Get("user"), "deleted network", network)
w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode("success")
@ -423,11 +419,6 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
return
}
if err = mq.CreateNetworkRole(network.NetID); err != nil {
logger.Log(0, r.Header.Get("user"), "failed to create network DynSec role:",
err.Error())
}
if err = logic.AddDefaultHostsToNetwork(network.NetID, servercfg.GetServer()); err != nil {
logger.Log(0, fmt.Sprintf("failed to add default hosts to network [%v]: %v",
network.NetID, err.Error()))

27
controllers/node.go
View file

@ -591,16 +591,6 @@ func createNode(w http.ResponseWriter, r *http.Request) {
return
}
logic.UpdateHost(&data.Host, host) // update the in memory struct values
networks := logic.GetHostNetworks(data.Host.ID.String())
if err := mq.ModifyClient(&mq.MqClient{
ID: data.Host.ID.String(),
Text: data.Host.Name,
Networks: networks,
}); err != nil {
logger.Log(0, fmt.Sprintf("failed to modify DynSec client: %v", err.Error()))
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
return
}
} else {
logger.Log(0, "error creating host", err.Error())
@ -1014,12 +1004,6 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return
}
host, err := logic.GetHost(node.HostID.String())
if err != nil {
logger.Log(0, "error retrieving host for node", node.ID.String(), err.Error())
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return
}
if r.Header.Get("ismaster") != "yes" {
username := r.Header.Get("user")
if username != "" && !doesUserOwnNode(username, params["network"], nodeid) {
@ -1033,16 +1017,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
}
logic.ReturnSuccessResponse(w, r, nodeid+" deleted.")
logger.Log(1, r.Header.Get("user"), "Deleted node", nodeid, "from network", params["network"])
if fromNode { // update networks for host mq client
currNets := logic.GetHostNetworks(host.ID.String())
if len(currNets) > 0 {
mq.ModifyClient(&mq.MqClient{
ID: host.ID.String(),
Text: host.Name,
Networks: currNets,
})
}
} else { // notify node change
if !fromNode { // notify node change
runUpdates(&node, false)
}
go func() { // notify of peer change