From 2c29a70df19eeab854b9a1fac65c7d5903ebeb01 Mon Sep 17 00:00:00 2001 From: Abhishek K <32607604+abhishek9686@users.noreply.github.com> Date: Tue, 13 Feb 2024 20:24:22 +0700 Subject: [PATCH] NET-941: allows creation of gws without client node or egress ranges (#2822) * allow creation of relay without relayed nodes * allow creation of egress gw without egress ranges * initalize empty egress ranges --- logic/gateway.go | 11 ++++------- pro/logic/relays.go | 6 +----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/logic/gateway.go b/logic/gateway.go index c3310a5f..15eedfcd 100644 --- a/logic/gateway.go +++ b/logic/gateway.go @@ -106,6 +106,9 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro if err != nil { return models.Node{}, err } + if gateway.Ranges == nil { + gateway.Ranges = make([]string, 0) + } node.IsEgressGateway = true node.EgressGatewayRanges = gateway.Ranges node.EgressGatewayNatEnabled = models.ParseBool(gateway.NatEnabled) @@ -119,13 +122,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro // ValidateEgressGateway - validates the egress gateway model func ValidateEgressGateway(gateway models.EgressGatewayRequest) error { - var err error - - empty := len(gateway.Ranges) == 0 - if empty { - err = errors.New("IP Ranges Cannot Be Empty") - } - return err + return nil } // DeleteEgressGateway - deletes egress from node diff --git a/pro/logic/relays.go b/pro/logic/relays.go index 88106b4e..21f1dea0 100644 --- a/pro/logic/relays.go +++ b/pro/logic/relays.go @@ -103,11 +103,7 @@ func SetRelayedNodes(setRelayed bool, relay string, relayed []string) []models.N // ValidateRelay - checks if relay is valid func ValidateRelay(relay models.RelayRequest) 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) if err != nil { return err