rm egress ranges removal from acl policies

logic/acls.go

@@ -282,13 +282,13 @@ 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.UserAclID:
 		if policyType == models.DevicePolicy {
 			return false

logic/gateway.go

@@ -150,42 +150,12 @@ func ValidateEgressGateway(gateway models.EgressGatewayRequest) error {
 	return nil
 }
 
-func cleanUpEgressRangesFromAclPolicies(node models.Node) {
-	if len(node.EgressGatewayRanges) == 0 {
-		return
-	}
-	acls, err := ListAclsByNetwork(models.NetworkID(node.Network))
-	if err != nil {
-		return
-	}
-	egressMap := make(map[string]struct{})
-	for _, egressI := range node.EgressGatewayRanges {
-		egressMap[egressI] = struct{}{}
-	}
-	for _, acl := range acls {
-		upsert := false
-		for i := len(acl.Dst) - 1; i >= 0; i-- {
-			if acl.Dst[i].ID == models.EgressRange {
-				if _, ok := egressMap[acl.Dst[i].Value]; ok {
-					acl.Dst = append(acl.Dst[:i], acl.Dst[i+1:]...)
-					upsert = true
-				}
-			}
-		}
-		if upsert {
-			UpsertAcl(acl)
-		}
-	}
-}
-
 // DeleteEgressGateway - deletes egress from node
 func DeleteEgressGateway(network, nodeid string) (models.Node, error) {
 	node, err := GetNodeByID(nodeid)
 	if err != nil {
 		return models.Node{}, err
 	}
-	// cleanUp egress ranges from acl policies
-	cleanUpEgressRangesFromAclPolicies(node)
 	node.IsEgressGateway = false
 	node.EgressGatewayRanges = []string{}
 	node.EgressGatewayRequest = models.EgressGatewayRequest{} // remove preserved request as the egress gateway is gone