diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-13 14:50:09 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-11-13 14:50:11 +0100 |
| commit | 6962bc53fa246f3e5c081ffec5f996fcb821273b (patch) | |
| tree | c5eb5ffb11cb9dd633c39e8ddafde27083e8acf1 /src/conf_mode/vpn_l2tp.py | |
| parent | 943a4a5016cfc75a352bb3711b5c4c8bfe32b740 (diff) | |
| download | vyos-1x-6962bc53fa246f3e5c081ffec5f996fcb821273b.tar.gz vyos-1x-6962bc53fa246f3e5c081ffec5f996fcb821273b.zip | |
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.
Diffstat (limited to 'src/conf_mode/vpn_l2tp.py')
| -rwxr-xr-x | src/conf_mode/vpn_l2tp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py index 465986d5b..80eb8daf2 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -25,10 +25,10 @@ from time import sleep from ipaddress import ip_network from vyos.config import Config +from vyos.template import is_ipv4 +from vyos.template import render from vyos.util import call, get_half_cpus -from vyos.validate import is_ipv4 from vyos import ConfigError -from vyos.template import render from vyos import airbag airbag.enable() |