Merge release branch 4.13 to master

* 4.13:
  Fix network rules issue if default egress policy is Allow (#3905)
This commit is contained in:
Daan Hoogland 2020-02-23 22:23:50 +01:00
commit b96fbee9e5
1 changed files with 2 additions and 4 deletions

View File

@ -2448,10 +2448,8 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
// Fetch firewall Egress rules.
if (_networkModel.isProviderSupportServiceInNetwork(guestNetworkId, Service.Firewall, provider)) {
firewallRulesEgress.addAll(_rulesDao.listByNetworkPurposeTrafficType(guestNetworkId, Purpose.Firewall, FirewallRule.TrafficType.Egress));
if (firewallRulesEgress.isEmpty()) {
//create egress default rule for VR
createDefaultEgressFirewallRule(firewallRulesEgress, guestNetworkId);
}
//create egress default rule for VR
createDefaultEgressFirewallRule(firewallRulesEgress, guestNetworkId);
}
// Re-apply firewall Egress rules