vyos.template: provide general is_ip(v4|v6) helpers

We had two places were the is_ip, is_ipv4 and is_ipv6 helpers had been defined.
All places now have been converged into vyos.template as they are used both
in the Jinja2 templates and also in our scripts.

1 files changed, 3 insertions, 3 deletions

diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl
index e8f7c3ab8..bc4306039 100644
--- a/data/templates/openvpn/server.conf.tmpl
+++ b/data/templates/openvpn/server.conf.tmpl
@@ -65,7 +65,7 @@ topology p2p
 {%     elif server.topology is defined and server.topology is not none %}
 topology {{ server.topology }}
 {%     endif %}
-{%       for subnet in server.subnet if subnet | ipv4 %}
+{%       for subnet in server.subnet if subnet | is_ipv4 %}
 server {{ subnet | address_from_cidr }} {{ subnet | netmask_from_cidr }} nopool
 {# OpenVPN assigns the first IP address to its local interface so the pool used #}
 {# in net30 topology - where each client receives a /30 must start from the second subnet #}
@@ -130,12 +130,12 @@ push "dhcp-option DNS6 {{ ns6 }}"
 ping {{ keep_alive.interval }}
 ping-restart {{ keep_alive.failure_count }}
 
-{%   for laddr, laddr_conf in local_address.items() if laddr | ipv4 %}
+{%   for laddr, laddr_conf in local_address.items() if laddr | is_ipv4 %}
 {%     if laddr_conf is defined and laddr_conf.subnet_mask is defined and laddr_conf.subnet_mask is not none %}
 ifconfig {{ laddr }} {{ laddr_conf.subnet_mask }}
 {%     else %}
 {%       for raddr in remote_address %}
-{%         if raddr | ipv4 %}
+{%         if raddr | is_ipv4 %}
 ifconfig {{ laddr }} {{ raddr }}
 {%         else %}
 ifconfig-ipv6 {{ laddr }} {{ raddr }}