summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-11-29 06:47:04 +0100
committerGitHub <noreply@github.com>2022-11-29 06:47:04 +0100
commit42ed0ae62021af2abc29f965fdb202e546326573 (patch)
tree4c4c07d13c0f9b9f627bff93034967f32a7c87b3 /src
parent7573c7eb6fed01b7181074737390a07f5abfc4fa (diff)
parent86c3afdb75e1ff8a13cab11d6f4f372fd250f632 (diff)
downloadvyos-1x-42ed0ae62021af2abc29f965fdb202e546326573.tar.gz
vyos-1x-42ed0ae62021af2abc29f965fdb202e546326573.zip
Merge pull request #1683 from jestabro/config-script-dependency
T4845: add smoketest to detect cycles in config-mode script dependency calls
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/firewall.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/conf_mode/firewall.py b/src/conf_mode/firewall.py
index 9fee20358..38a332be3 100755
--- a/src/conf_mode/firewall.py
+++ b/src/conf_mode/firewall.py
@@ -26,7 +26,7 @@ from vyos.config import Config
from vyos.configdict import dict_merge
from vyos.configdict import node_changed
from vyos.configdiff import get_config_diff, Diff
-from vyos.configdep import set_dependent, call_dependents
+from vyos.configdep import set_dependents, call_dependents
# from vyos.configverify import verify_interface_exists
from vyos.firewall import fqdn_config_parse
from vyos.firewall import geoip_update
@@ -162,11 +162,8 @@ def get_config(config=None):
firewall['group_resync'] = bool('group' in firewall or node_changed(conf, base + ['group']))
if firewall['group_resync']:
- # Update nat as firewall groups were updated
- set_dependent(nat_conf_script, conf)
- # Update policy route as firewall groups were updated
- set_dependent(policy_route_conf_script, conf)
-
+ # Update nat and policy-route as firewall groups were updated
+ set_dependents('group_resync', conf)
if 'config_trap' in firewall and firewall['config_trap'] == 'enable':
diff = get_config_diff(conf)