add egress id to acl group

controllers/acls.go

@@ -51,7 +51,8 @@ func aclPolicyTypes(w http.ResponseWriter, r *http.Request) {
 		DstGroupTypes: []models.AclGroupType{
 			models.NodeTagID,
 			models.NodeID,
-			models.EgressRange,
+			//models.EgressRange,
+			models.EgressID,
 			// models.NetmakerIPAclID,
 			// models.NetmakerSubNetRangeAClID,
 		},

controllers/egress.go

@@ -41,11 +41,17 @@ func createEgress(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
-	egressRange, err := logic.NormalizeCIDR(req.Range)
-	if err != nil {
-		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
-		return
+	var egressRange string
+	if !req.IsInetGw {
+		egressRange, err = logic.NormalizeCIDR(req.Range)
+		if err != nil {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+			return
+		}
+	} else {
+		egressRange = "*"
 	}
+
 	e := models.Egress{
 		ID:          uuid.New().String(),
 		Name:        req.Name,
@@ -127,22 +133,24 @@ func updateEgress(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
-	egressRange, err := logic.NormalizeCIDR(req.Range)
-	if err != nil {
-		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
-		return
+	var egressRange string
+	if !req.IsInetGw {
+		egressRange, err = logic.NormalizeCIDR(req.Range)
+		if err != nil {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+			return
+		}
+	} else {
+		egressRange = "*"
 	}
+
 	e := models.Egress{ID: req.ID}
 	err = e.Get()
 	if err != nil {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
-	e.Nodes = make(datatypes.JSONMap)
-	e.Tags = make(datatypes.JSONMap)
-	for nodeID, metric := range req.Nodes {
-		e.Nodes[nodeID] = metric
-	}
+
 	var updateNat bool
 	var updateInetGw bool
 	if req.Nat != e.Nat {
@@ -151,7 +159,11 @@ func updateEgress(w http.ResponseWriter, r *http.Request) {
 	if req.IsInetGw != e.IsInetGw {
 		updateInetGw = true
 	}
-
+	e.Nodes = make(datatypes.JSONMap)
+	e.Tags = make(datatypes.JSONMap)
+	for nodeID, metric := range req.Nodes {
+		e.Nodes[nodeID] = metric
+	}
 	e.Range = egressRange
 	e.Description = req.Description
 	e.Name = req.Name

logic/acls.go

@@ -293,13 +293,22 @@ func checkIfAclTagisValid(t models.AclPolicyTag, netID models.NetworkID, policyT
 		if isSrc {
 			return false
 		}
-		// _, rangesMap, err := GetEgressRanges(netID)
-		// if err != nil {
-		// 	return false
-		// }
-		// if _, ok := rangesMap[t.Value]; !ok {
-		// 	return false
-		// }
+	// _, rangesMap, err := GetEgressRanges(netID)
+	// if err != nil {
+	// 	return false
+	// }
+	// if _, ok := rangesMap[t.Value]; !ok {
+	// 	return false
+	// }
+	case models.EgressID:
+		e := models.Egress{
+			ID: t.Value,
+		}
+		err := e.Get()
+		if err != nil {
+			return false
+		}
+
 	case models.UserAclID:
 		if policyType == models.DevicePolicy {
 			return false
@@ -388,6 +397,20 @@ func IsAclPolicyValid(acl models.Acl) bool {
 	return true
 }
 
+func UniqueAclPolicyTags(tags []models.AclPolicyTag) []models.AclPolicyTag {
+	seen := make(map[string]bool)
+	var result []models.AclPolicyTag
+
+	for _, tag := range tags {
+		key := fmt.Sprintf("%v-%s", tag.ID, tag.Value)
+		if !seen[key] {
+			seen[key] = true
+			result = append(result, tag)
+		}
+	}
+	return result
+}
+
 // UpdateAcl - updates allowed fields on acls and commits to DB
 func UpdateAcl(newAcl, acl models.Acl) error {
 	if !acl.Default {

models/acl.go

@@ -60,6 +60,7 @@ const (
 	NodeTagID                AclGroupType = "tag"
 	NodeID                   AclGroupType = "device"
 	EgressRange              AclGroupType = "egress-range"
+	EgressID                 AclGroupType = "egress-id"
 	NetmakerIPAclID          AclGroupType = "ip"
 	NetmakerSubNetRangeAClID AclGroupType = "ipset"
 )
@@ -92,7 +93,6 @@ type Acl struct {
 	Port             []string                `json:"ports"`
 	AllowedDirection AllowedTrafficDirection `json:"allowed_traffic_direction"`
 	Enabled          bool                    `json:"enabled"`
-	ReferenceID      string                  `json:"reference_id"`
 	CreatedBy        string                  `json:"created_by"`
 	CreatedAt        time.Time               `json:"created_at"`
 }