mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-12 20:20:52 +08:00
return 'currently unimplemented' on egress endpoints
updated logic in logic.CheckHostPorts to fix failing test
This commit is contained in:
@@ -689,32 +689,33 @@ func createNode(w http.ResponseWriter, r *http.Request) {
|
||||
// Responses:
|
||||
// 200: nodeResponse
|
||||
func createEgressGateway(w http.ResponseWriter, r *http.Request) {
|
||||
var gateway models.EgressGatewayRequest
|
||||
var params = mux.Vars(r)
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
err := json.NewDecoder(r.Body).Decode(&gateway)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||
return
|
||||
}
|
||||
gateway.NetID = params["network"]
|
||||
gateway.NodeID = params["nodeid"]
|
||||
node, err := logic.CreateEgressGateway(gateway)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"),
|
||||
fmt.Sprintf("failed to create egress gateway on node [%s] on network [%s]: %v",
|
||||
gateway.NodeID, gateway.NetID, err))
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
return
|
||||
}
|
||||
|
||||
apiNode := node.ConvertToAPINode()
|
||||
logger.Log(1, r.Header.Get("user"), "created egress gateway on node", gateway.NodeID, "on network", gateway.NetID)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(apiNode)
|
||||
|
||||
runUpdates(&node, true)
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("currently unimplemented"), "internal"))
|
||||
// var gateway models.EgressGatewayRequest
|
||||
// var params = mux.Vars(r)
|
||||
// w.Header().Set("Content-Type", "application/json")
|
||||
// err := json.NewDecoder(r.Body).Decode(&gateway)
|
||||
// if err != nil {
|
||||
// logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
|
||||
// logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
|
||||
// return
|
||||
// }
|
||||
// gateway.NetID = params["network"]
|
||||
// gateway.NodeID = params["nodeid"]
|
||||
// node, err := logic.CreateEgressGateway(gateway)
|
||||
// if err != nil {
|
||||
// logger.Log(0, r.Header.Get("user"),
|
||||
// fmt.Sprintf("failed to create egress gateway on node [%s] on network [%s]: %v",
|
||||
// gateway.NodeID, gateway.NetID, err))
|
||||
// logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// apiNode := node.ConvertToAPINode()
|
||||
// logger.Log(1, r.Header.Get("user"), "created egress gateway on node", gateway.NodeID, "on network", gateway.NetID)
|
||||
// w.WriteHeader(http.StatusOK)
|
||||
// json.NewEncoder(w).Encode(apiNode)
|
||||
//
|
||||
// runUpdates(&node, true)
|
||||
}
|
||||
|
||||
// swagger:route DELETE /api/nodes/{network}/{nodeid}/deletegateway nodes deleteEgressGateway
|
||||
@@ -729,25 +730,26 @@ func createEgressGateway(w http.ResponseWriter, r *http.Request) {
|
||||
// Responses:
|
||||
// 200: nodeResponse
|
||||
func deleteEgressGateway(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
var params = mux.Vars(r)
|
||||
nodeid := params["nodeid"]
|
||||
netid := params["network"]
|
||||
node, err := logic.DeleteEgressGateway(netid, nodeid)
|
||||
if err != nil {
|
||||
logger.Log(0, r.Header.Get("user"),
|
||||
fmt.Sprintf("failed to delete egress gateway on node [%s] on network [%s]: %v",
|
||||
nodeid, netid, err))
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
return
|
||||
}
|
||||
|
||||
apiNode := node.ConvertToAPINode()
|
||||
logger.Log(1, r.Header.Get("user"), "deleted egress gateway on node", nodeid, "on network", netid)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(apiNode)
|
||||
|
||||
runUpdates(&node, true)
|
||||
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("currently unimplemented"), "internal"))
|
||||
//w.Header().Set("Content-Type", "application/json")
|
||||
// var params = mux.Vars(r)
|
||||
// nodeid := params["nodeid"]
|
||||
// netid := params["network"]
|
||||
// node, err := logic.DeleteEgressGateway(netid, nodeid)
|
||||
// if err != nil {
|
||||
// logger.Log(0, r.Header.Get("user"),
|
||||
// fmt.Sprintf("failed to delete egress gateway on node [%s] on network [%s]: %v",
|
||||
// nodeid, netid, err))
|
||||
// logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// apiNode := node.ConvertToAPINode()
|
||||
// logger.Log(1, r.Header.Get("user"), "deleted egress gateway on node", nodeid, "on network", netid)
|
||||
// w.WriteHeader(http.StatusOK)
|
||||
// json.NewEncoder(w).Encode(apiNode)
|
||||
//
|
||||
// runUpdates(&node, true)
|
||||
}
|
||||
|
||||
// == INGRESS ==
|
||||
|
Reference in New Issue
Block a user