summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-01-15 18:05:21 +0100
committerGitHub <noreply@github.com>2024-01-15 18:05:21 +0100
commitb2fbff135fe4b83093b36927a8dcaa43ba4ecb9a (patch)
tree58ba82b52c0b01bd05df7e8a94bf4cf215167ed7 /src
parent24c6248a25f2d5edaf7dad762e222b139f3b529b (diff)
parentff5ae0d811d373b6efb3bbba630cde955471a7ce (diff)
downloadvyos-1x-b2fbff135fe4b83093b36927a8dcaa43ba4ecb9a.tar.gz
vyos-1x-b2fbff135fe4b83093b36927a8dcaa43ba4ecb9a.zip
Merge pull request #2830 from vyos/mergify/bp/sagitta/pr-2829
ospf: T5936: when migrating passive interfaces set_tag() must be set (backport #2829)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/migration-scripts/ospf/0-to-14
1 files changed, 3 insertions, 1 deletions
diff --git a/src/migration-scripts/ospf/0-to-1 b/src/migration-scripts/ospf/0-to-1
index 8f02acada..a6cb9feb8 100755
--- a/src/migration-scripts/ospf/0-to-1
+++ b/src/migration-scripts/ospf/0-to-1
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2021 VyOS maintainers and contributors
+# Copyright (C) 2021-2024 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -28,6 +28,7 @@ def ospf_passive_migration(config, ospf_base):
default = True
continue
config.set(ospf_base + ['interface', interface, 'passive'])
+ config.set_tag(ospf_base + ['interface'])
config.delete(ospf_base + ['passive-interface'])
config.set(ospf_base + ['passive-interface'], value='default')
@@ -35,6 +36,7 @@ def ospf_passive_migration(config, ospf_base):
if config.exists(ospf_base + ['passive-interface-exclude']):
for interface in config.return_values(ospf_base + ['passive-interface-exclude']):
config.set(ospf_base + ['interface', interface, 'passive', 'disable'])
+ config.set_tag(ospf_base + ['interface'])
config.delete(ospf_base + ['passive-interface-exclude'])
if len(argv) < 2: