Quellcode durchsuchen

migrate all policies

abhishek9686 vor 9 Monaten
Ursprung
Commit
1d75647b49
2 geänderte Dateien mit 12 neuen und 31 gelöschten Zeilen
  1. 10 30
      logic/acls.go
  2. 2 1
      migrate/migrate.go

+ 10 - 30
logic/acls.go

@@ -18,37 +18,17 @@ var (
 	aclCacheMap   = make(map[string]models.Acl)
 )
 
-func MigrateDefaulAclPolicies(netID models.NetworkID) {
-	if netID.String() == "" {
-		return
-	}
-	acl, err := GetAcl(fmt.Sprintf("%s.%s", netID, "all-nodes"))
-	if err == nil {
-		//if acl.Proto.String() == "" {
-		acl.Proto = models.ALL
-		acl.ServiceType = models.Custom
-		acl.Port = []string{}
-		UpsertAcl(acl)
-		//}
-	}
-	acl, err = GetAcl(fmt.Sprintf("%s.%s", netID, "all-users"))
-	if err == nil {
-		//if acl.Proto.String() == "" {
-		acl.Proto = models.ALL
-		acl.ServiceType = models.Custom
-		acl.Port = []string{}
-		UpsertAcl(acl)
-		//}
-	}
-	acl, err = GetAcl(fmt.Sprintf("%s.%s", netID, "all-remote-access-gws"))
-	if err == nil {
-		//if acl.Proto.String() == "" {
-		acl.Proto = models.ALL
-		acl.ServiceType = models.Custom
-		acl.Port = []string{}
-		UpsertAcl(acl)
-		//}
+func MigrateAclPolicies() {
+	acls := ListAcls()
+	for _, acl := range acls {
+		if acl.Proto.String() == "" {
+			acl.Proto = models.ALL
+			acl.ServiceType = models.Custom
+			acl.Port = []string{}
+			UpsertAcl(acl)
+		}
 	}
+
 }
 
 // CreateDefaultAclNetworkPolicies - create default acl network policies

+ 2 - 1
migrate/migrate.go

@@ -437,6 +437,7 @@ func createDefaultTagsAndPolicies() {
 	for _, network := range networks {
 		logic.CreateDefaultTags(models.NetworkID(network.NetID))
 		logic.CreateDefaultAclNetworkPolicies(models.NetworkID(network.NetID))
-		logic.MigrateDefaulAclPolicies(models.NetworkID(network.NetID))
+
 	}
+	logic.MigrateDefaulAclPolicies(models.NetworkID(network.NetID))
 }