summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfett0 <50275740+fett0@users.noreply.github.com>2022-05-31 01:46:07 -0300
committerGitHub <noreply@github.com>2022-05-31 06:46:07 +0200
commit0e32faf6db96262b0a6376b54be033b4b72477f2 (patch)
treefd1be7c11c2cd31330e46b65b8a20bb14a9cb6e3 /src
parente771eab37de6841b4c3b9d98e8f974dacde34075 (diff)
downloadvyos-1x-0e32faf6db96262b0a6376b54be033b4b72477f2.tar.gz
vyos-1x-0e32faf6db96262b0a6376b54be033b4b72477f2.zip
IPv6: T3976: add prefix-list and access-list option from ipv6 route-map
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/policy.py10
-rwxr-xr-xsrc/migration-scripts/policy/2-to-359
2 files changed, 69 insertions, 0 deletions
diff --git a/src/conf_mode/policy.py b/src/conf_mode/policy.py
index ef6008140..3008a20e0 100755
--- a/src/conf_mode/policy.py
+++ b/src/conf_mode/policy.py
@@ -150,6 +150,16 @@ def verify(policy):
tmp = dict_search('match.ipv6.address.prefix_list', rule_config)
if tmp and tmp not in policy.get('prefix_list6', []):
raise ConfigError(f'prefix-list6 {tmp} does not exist!')
+
+ # Specified access_list6 in nexthop must exist
+ tmp = dict_search('match.ipv6.nexthop.access_list', rule_config)
+ if tmp and tmp not in policy.get('access_list6', []):
+ raise ConfigError(f'access_list6 {tmp} does not exist!')
+
+ # Specified prefix-list6 in nexthop must exist
+ tmp = dict_search('match.ipv6.nexthop.prefix_list', rule_config)
+ if tmp and tmp not in policy.get('prefix_list6', []):
+ raise ConfigError(f'prefix-list6 {tmp} does not exist!')
# When routing protocols are active some use prefix-lists, route-maps etc.
# to apply the systems routing policy to the learned or redistributed routes.
diff --git a/src/migration-scripts/policy/2-to-3 b/src/migration-scripts/policy/2-to-3
new file mode 100755
index 000000000..5caec2dd2
--- /dev/null
+++ b/src/migration-scripts/policy/2-to-3
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2022 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
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+​
+# T3976: change cli
+# from: set policy route-map FOO rule 10 match ipv6 nexthop 'h:h:h:h:h:h:h:h'
+# to: set policy route-map FOO rule 10 match ipv6 nexthop address 'h:h:h:h:h:h:h:h'
+​
+from sys import argv
+from sys import exit
+​
+from vyos.configtree import ConfigTree
+​
+if (len(argv) < 1):
+ print("Must specify file name!")
+ exit(1)
+​
+file_name = argv[1]
+​
+with open(file_name, 'r') as f:
+ config_file = f.read()
+​
+base = ['policy', 'route-map']
+config = ConfigTree(config_file)
+​
+if not config.exists(base):
+ # Nothing to do
+ exit(0)
+​
+​
+for route_map in config.list_nodes(base):
+ if not config.exists(base + [route_map, 'rule']):
+ continue
+ for rule in config.list_nodes(base + [route_map, 'rule']):
+ base_rule = base + [route_map, 'rule', rule]
+​
+ if config.exists(base_rule + ['match', 'ipv6', 'nexthop']):
+ tmp = config.return_value(base_rule + ['match', 'ipv6', 'nexthop'])
+ config.delete(base_rule + ['match', 'ipv6', 'nexthop'])
+ config.set(base_rule + ['match', 'ipv6', 'nexthop', 'address'], value=tmp)
+​
+try:
+ with open(file_name, 'w') as f:
+ f.write(config.to_string())
+except OSError as e:
+ print(f'Failed to save the modified config: {e}')
+ exit(1) \ No newline at end of file