Merge pull request #1870 from sever-sever/T5058

T5058: Extend template filter range_to_regex to allow list as arg

1 files changed, 14 insertions, 0 deletions

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