From 045562e1d5c655622444c95df192f7e49cca2565 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 6 Mar 2023 18:16:45 +0000 Subject: T5058: Extend template filter range_to_regex to allow list as arg Extend template filter 'range_to_regex' Allow list of ranges as argument % range_to_regex(['11-12', '14-15']) '(1[1-2]|1[4-5])' --- python/vyos/template.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/python/vyos/template.py b/python/vyos/template.py index 6367f51e5..7f417992e 100644 --- a/python/vyos/template.py +++ b/python/vyos/template.py @@ -663,7 +663,21 @@ def nat_static_rule(rule_conf, rule_id, nat_type): @register_filter('range_to_regex') def range_to_regex(num_range): + """Convert range of numbers or list of ranges + to regex + + % range_to_regex('11-12') + '(1[1-2])' + % range_to_regex(['11-12', '14-15']) + '(1[1-2]|1[4-5])' + """ from vyos.range_regex import range_to_regex + if isinstance(num_range, list): + data = [] + for entry in num_range: + data.append(range_to_regex(entry)) + return f'({"|".join(data)})' + if '-' not in num_range: return num_range -- cgit v1.2.3