Просмотр исходного кода

Net 1990 (#3386)

* add peerkey to network egress routes model

* add peerkey to network egress routes model

* filter out conflicting routes from node

* add support for egress HA on relay

* add support for egress HA on relay

* add support for egress HA on relay

* skip if curr node is relay node of the peer

* skip if curr node is relay node of the peer

* fix failover egress HA

* add network to egress route model

* clone before modifying

* check for user policies on uni direction check

* add all network fwd rule

* delete all network policies and tags on network deletion
Abhishek K 5 месяцев назад
Родитель
Сommit
8a1f36ee8e
3 измененных файлов с 11 добавлено и 4 удалено
  1. 2 1
      controllers/network.go
  2. 3 3
      logic/acls.go
  3. 6 0
      logic/tags.go

+ 2 - 1
controllers/network.go

@@ -494,7 +494,8 @@ func deleteNetwork(w http.ResponseWriter, r *http.Request) {
 	}
 	go logic.UnlinkNetworkAndTagsFromEnrollmentKeys(network, true)
 	go logic.DeleteNetworkRoles(network)
-	go logic.DeleteDefaultNetworkPolicies(models.NetworkID(network))
+	go logic.DeleteAllNetworkTags(models.NetworkID(network))
+	go logic.DeleteNetworkPolicies(models.NetworkID(network))
 	//delete network from allocated ip map
 	go logic.RemoveNetworkFromAllocatedIpMap(network)
 	go func() {

+ 3 - 3
logic/acls.go

@@ -128,11 +128,11 @@ func CreateDefaultAclNetworkPolicies(netID models.NetworkID) {
 	CreateDefaultUserPolicies(netID)
 }
 
-// DeleteDefaultNetworkPolicies - deletes all default network acl policies
-func DeleteDefaultNetworkPolicies(netId models.NetworkID) {
+// DeleteNetworkPolicies - deletes all default network acl policies
+func DeleteNetworkPolicies(netId models.NetworkID) {
 	acls, _ := ListAclsByNetwork(netId)
 	for _, acl := range acls {
-		if acl.NetworkID == netId && acl.Default {
+		if acl.NetworkID == netId {
 			DeleteAcl(acl)
 		}
 	}

+ 6 - 0
logic/tags.go

@@ -105,6 +105,12 @@ func ListTagsWithNodes(netID models.NetworkID) ([]models.TagListResp, error) {
 	}
 	return resp, nil
 }
+func DeleteAllNetworkTags(networkID models.NetworkID) {
+	tags, _ := ListNetworkTags(networkID)
+	for _, tagI := range tags {
+		DeleteTag(tagI.ID, false)
+	}
+}
 
 // ListTags - lists all tags from DB
 func ListTags() ([]models.Tag, error) {