Merge pull request #3313 from gravitl/NET-1902

don't override acl rules for multi-net host
gravitl · Feb 4, 2025 · 7b04861 · 7b04861
2 parents 68b257b + 01e7ccf
commit 7b04861
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/logic/peers.go b/logic/peers.go
@@ -187,7 +187,14 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 
 		} else {
 			hostPeerUpdate.FwUpdate.AllowAll = false
-			hostPeerUpdate.FwUpdate.AclRules = GetAclRulesForNode(&node)
+			rules := GetAclRulesForNode(&node)
+			if len(hostPeerUpdate.FwUpdate.AclRules) == 0 {
+				hostPeerUpdate.FwUpdate.AclRules = rules
+			} else {
+				for aclID, rule := range rules {
+					hostPeerUpdate.FwUpdate.AclRules[aclID] = rule
+				}
+			}
 		}
 
 		currentPeers := GetNetworkNodesMemory(allNodes, node.Network)