zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-07 09:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

NET-941: allows creation of gws without client node or egress ranges (#2822)

Browse Source 
* allow creation of relay without relayed nodes

* allow creation of egress gw without egress ranges

* initalize empty egress ranges
This commit is contained in:
Abhishek K
2024-02-13 20:24:22 +07:00
committed by GitHub
parent 1f592a60a2
commit 2c29a70df1
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
logic/gateway.go
View File

@@ -106,6 +106,9 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
if err != nil { if err != nil {
return models.Node{}, err return models.Node{}, err
} }
if gateway.Ranges == nil {
gateway.Ranges = make([]string, 0)
}
node.IsEgressGateway = true node.IsEgressGateway = true
node.EgressGatewayRanges = gateway.Ranges node.EgressGatewayRanges = gateway.Ranges
node.EgressGatewayNatEnabled = models.ParseBool(gateway.NatEnabled) node.EgressGatewayNatEnabled = models.ParseBool(gateway.NatEnabled)
@@ -119,13 +122,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
// ValidateEgressGateway - validates the egress gateway model // ValidateEgressGateway - validates the egress gateway model
func ValidateEgressGateway(gateway models.EgressGatewayRequest) error { func ValidateEgressGateway(gateway models.EgressGatewayRequest) error {
var err error return nil
empty := len(gateway.Ranges) == 0
if empty {
err = errors.New("IP Ranges Cannot Be Empty")
}
return err
} }
// DeleteEgressGateway - deletes egress from node // DeleteEgressGateway - deletes egress from node

6
pro/logic/relays.go
View File

@@ -103,11 +103,7 @@ func SetRelayedNodes(setRelayed bool, relay string, relayed []string) []models.N
// ValidateRelay - checks if relay is valid // ValidateRelay - checks if relay is valid
func ValidateRelay(relay models.RelayRequest) error { func ValidateRelay(relay models.RelayRequest) error {
var err error var err error
// isIp := functions.IsIpCIDR(gateway.RangeString)
empty := len(relay.RelayedNodes) == 0
if empty {
return errors.New("IP Ranges Cannot Be Empty")
}
node, err := logic.GetNodeByID(relay.NodeID) node, err := logic.GetNodeByID(relay.NodeID)
if err != nil { if err != nil {
return err return err