dhcp(v6): T4333: migrate to new vyos_defined Jinja2 test

2 files changed, 6 insertions, 6 deletions

diff --git a/data/templates/dhcp-relay/dhcrelay.conf.tmpl b/data/templates/dhcp-relay/dhcrelay.conf.tmpl
index a9d17ed9a..11710bd8e 100644
--- a/data/templates/dhcp-relay/dhcrelay.conf.tmpl
+++ b/data/templates/dhcp-relay/dhcrelay.conf.tmpl
@@ -1,6 +1,6 @@
 ### Autogenerated by dhcp_relay.py ###
 
-{% set max_size = '-A ' + relay_options.max_size if relay_options.max_size is defined and relay_options.max_size is not none %}
+{% set max_size = '-A ' ~ relay_options.max_size if relay_options.max_size is vyos_defined %}
 {# hop_count and relay_agents_packets is a default option, thus it is always present #}
 OPTIONS="-c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -i {{ interface | join(' -i ') }} {{ server | join(' ') }}"
 
diff --git a/data/templates/dhcp-relay/dhcrelay6.conf.tmpl b/data/templates/dhcp-relay/dhcrelay6.conf.tmpl
index 58c216b7c..1fd5de18c 100644
--- a/data/templates/dhcp-relay/dhcrelay6.conf.tmpl
+++ b/data/templates/dhcp-relay/dhcrelay6.conf.tmpl
@@ -4,18 +4,18 @@
 {% set upstream = namespace(value='')  %}
 {% for interface, config in upstream_interface.items() %}
 {%   for address in config.address %}
-{%     set upstream.value = upstream.value + '-u ' + address + '%' + interface + ' ' %}
+{%     set upstream.value = upstream.value ~ '-u ' ~ address ~ '%' ~ interface ~ ' ' %}
 {%   endfor %}
 {% endfor %}
 {# listen_interface is mandatory so it's always present #}
 {% set listen = namespace(value='')  %}
 {% for interface, config in listen_interface.items() %}
-{%   if config.address is defined and config.address is not none %}
-{%     set listen.value = listen.value + '-l ' + config.address + '%' + interface + ' ' %}
+{%   if config.address is vyos_defined %}
+{%     set listen.value = listen.value ~ '-l ' ~ config.address ~ '%' ~ interface ~ ' ' %}
 {%   else %}
-{%     set listen.value = listen.value + '-l ' + interface + ' ' %}
+{%     set listen.value = listen.value ~ '-l ' ~ interface ~ ' ' %}
 {%   endif %}
 {% endfor %}
 
-OPTIONS="{{ listen.value }} {{ upstream.value }} -c {{ max_hop_count }} {{ '-I' if use_interface_id_option is defined }}"
+OPTIONS="{{ listen.value }} {{ upstream.value }} -c {{ max_hop_count }} {{ '-I' if use_interface_id_option is vyos_defined }}"