openvpn: T2994: migrate to get_config_dict()

5 files changed, 504 insertions, 1047 deletions

diff --git a/data/templates/openvpn/client.conf.tmpl b/data/templates/openvpn/client.conf.tmpl
index 508d8da94..b57c45ce5 100644
--- a/data/templates/openvpn/client.conf.tmpl
+++ b/data/templates/openvpn/client.conf.tmpl
@@ -1,35 +1,33 @@
 ### Autogenerated by interfaces-openvpn.py ###
 
-{% if ip -%}
-ifconfig-push {{ ip[0] }} {{ remote_netmask }}
-{% endif -%}
-
-{% for route in push_route -%}
-push "route {{ route }}"
-{% endfor -%}
-
-{% for net in subnet -%}
-iroute {{ net }}
-{% endfor -%}
+{% if ip %}
+ifconfig-push {{ ip[0] }} {{ subnet[0] | netmask_from_cidr }}
+{% endif %}
+{% if push_route is defined and push_route is not none %}
+{%   for route in push_route %}
+push "route {{ route | address_from_cidr }} {{ route | netmask_from_cidr }}"
+{%   endfor %}
+{% endif %}
+{% if subnet is defined and subnet is not none %}
+{%   for network in subnet %}
+iroute {{ network | address_from_cidr }} {{ network | netmask_from_cidr }}
+{%   endfor %}
+{% endif %}
 
 {# ipv6_remote is only set when IPv6 server is enabled #}
-{% if ipv6_remote -%}
+{% if ipv6_remote %}
 # IPv6
-
-{%- if ipv6_ip %}
+{%   if ipv6_ip %}
 ifconfig-ipv6-push {{ ipv6_ip[0] }} {{ ipv6_remote }}
-{%- endif %}
-
-{%- for route6 in ipv6_push_route %}
+{%   endif %}
+{%   for route6 in ipv6_push_route %}
 push "route-ipv6 {{ route6 }}"
-{%- endfor %}
-
-{%- for net6 in ipv6_subnet %}
+{%   endfor %}
+{%   for net6 in ipv6_subnet %}
 iroute {{ net6 }}
-{%- endfor %}
-
-{% endif -%}
+{%   endfor %}
+{% endif %}
 
-{% if disable -%}
+{% if disable is defined %}
 disable
-{% endif -%}
+{% endif %}
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl
index fea310236..84836f177 100644
--- a/data/templates/openvpn/server.conf.tmpl
+++ b/data/templates/openvpn/server.conf.tmpl
@@ -2,246 +2,215 @@
 #
 # See https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage
 # for individual keyword definition
-
-{% if description -%}
-# {{ description }}
-
-{% endif -%}
+#
+# {{ description if description is defined and description is not none }}
+#
 
 verb 3
-
-user {{ uid }}
-group {{ gid }}
-
-dev-type {{ type }}
-dev {{ intf }}
+user {{ daemon_user }}
+group {{ daemon_group }}
+dev-type {{ device_type }}
+dev {{ ifname }}
 persist-key
 iproute /usr/libexec/vyos/system/unpriv-ip
-
-proto {{ protocol_real }}
-
-{%- if local_host %}
+proto {{ protocol }}
+{% if local_host is defined and local_host is not none %}
 local {{ local_host }}
-{%- endif %}
-
-{%- if mode == 'server' and protocol == 'udp' and not local_host %}
+{% endif %}
+{% if mode is defined and mode == 'server' and protocol == 'udp' and local_host is not defined %}
 multihome
-{%- endif %}
-
-{%- if local_port %}
+{% endif %}
+{% if local_port is defined and local_port is not none %}
 lport {{ local_port }}
-{%- endif %}
-
-{% if remote_port -%}
+{% endif %}
+{% if remote_port is defined and remote_port is not none %}
 rport {{ remote_port }}
 {% endif %}
-
-{%- if remote_host %}
-{%- for remote in remote_host -%}
+{% if remote_host is defined and remote_host is not none %}
+{%   for remote in remote_host %}
 remote {{ remote }}
-{% endfor -%}
-{% endif -%}
-
-{% if shared_secret_file %}
-secret {{ shared_secret_file }}
-{%- endif %}
-
-{%- if persistent_tunnel %}
+{%   endfor %}
+{% endif %}
+{% if shared_secret_key_file is defined and shared_secret_key_file is not none %}
+secret {{ shared_secret_key_file }}
+{% endif %}
+{% if persistent_tunnel is defined %}
 persist-tun
-{%- endif %}
-
-{%- if redirect_gateway %}
-push "redirect-gateway {{ redirect_gateway }}"
-{%- endif %}
-
-{%- if compress_lzo %}
+{% endif %}
+{% if redirect_gateway is defined and redirect_gateway.local is defined %}
+push "redirect-gateway local def1"
+{% elif redirect_gateway is defined %}
+push "redirect-gateway def1"
+{% endif %}
+{% if use_lzo_compression is defined %}
 compress lzo
-{%- endif %}
+{% endif %}
 
-{% if 'client' in mode -%}
+{% if 'client' in mode %}
 #
 # OpenVPN Client mode
 #
 client
 nobind
-
-{% elif 'server' in mode -%}
+{% elif 'server' in mode %}
 #
 # OpenVPN Server mode
 #
-
-{%- if server_topology %}
-topology {% if server_topology == 'point-to-point' %}p2p{% else %}{{ server_topology }}{% endif %}
-{%- endif %}
-
-{%- if is_bridge_member %}
 mode server
 tls-server
-{%- else %}
-server {{ server_subnet[0] }} nopool
-{%- endif %}
-
-{%- if server_pool %}
-ifconfig-pool {{ server_pool_start }} {{ server_pool_stop }}{% if server_pool_netmask %} {{ server_pool_netmask }}{% endif %}
-{%- endif %}
-
-{%- if server_max_conn %}
-max-clients {{ server_max_conn }}
-{%- endif %}
-
-{%- if client %}
-client-config-dir /run/openvpn/ccd/{{ intf }}
-{%- endif %}
-
-{%- if server_reject_unconfigured %}
-ccd-exclusive
-{%- endif %}
-
-keepalive {{ ping_interval }} {{ ping_restart }}
+{%   if server is defined and server is not none %}
+{%     if server.subnet_v4 is defined and server.subnet_v4 is not none %}
+server {{ server.subnet_v4[0] | address_from_cidr }} {{ server.subnet_v4[0] | netmask_from_cidr }} nopool
+{%     endif %}
+{%     if server.topology is defined and server.topology == 'point-to-point' %}
+topology p2p
+{%     elif server.topology is defined and server.topology is not none %}
+topology {{ server.topology }}
+{%     endif %}
+{%     if server.client_ip_pool is defined and server.client_ip_pool is not none and server.client_ip_pool.disable is not defined %}
+ifconfig-pool {{ server.client_ip_pool.start }} {{ server.client_ip_pool.stop }}{{ server.client_ip_pool.subnet_mask if server.client_ip_pool.subnet_mask is defined and server.client_ip_pool.subnet_mask is not none }}
+{%     endif %}
+{%     if server.max_connections is defined and server.max_connections is not none %}
+max-clients {{ server.max_connections }}
+{%     endif %}
+{%     if server.client is defined and server.client is not none %}
+client-config-dir /run/openvpn/ccd/{{ ifname }}
+{%     endif %}
+{%   endif %}
+keepalive {{ keep_alive.interval }} {{ keep_alive.failure_count }}
 management /run/openvpn/openvpn-mgmt-intf unix
-
-{% for route in server_push_route -%}
+{%   if server is defined and server is not none %}
+{%     if server.reject_unconfigured_clients is defined %}
+ccd-exclusive
+{%     endif %}
+{%     if server.push_route is defined and server.push_route is not none %}
+{%       for route in server.push_route %}
 push "route {{ route }}"
-{% endfor -%}
-
-{% for ns in server_dns_nameserver -%}
-push "dhcp-option DNS {{ ns }}"
-{% endfor -%}
-
-{%- if server_domain -%}
-push "dhcp-option DOMAIN {{ server_domain }}"
-{% endif -%}
-
-{%- if server_ipv6_local %}
+{%       endfor %}
+{%     endif %}
+{%     if server.name_server is defined and server.name_server is not none %}
+{%       for nameserver in server.name_server %}
+push "dhcp-option DNS {{ nameserver }}"
+{%       endfor %}
+{%     endif %}
+{%     if server.domain_name is defined and server.domain_name is not none %}
+push "dhcp-option DOMAIN {{ server.domain_name }}"
+{%     endif %}
+{%   endif %}
+
+{%   if subnet_v6 is defined and subnet_v6 is not none %}
 # IPv6
 push "tun-ipv6"
 ifconfig-ipv6 {{ server_ipv6_local }}/{{ server_ipv6_prefixlen }} {{ server_ipv6_remote }}
-
-{%- if server_ipv6_pool %}
+{%     if server_ipv6_pool %}
 ifconfig-ipv6-pool {{ server_ipv6_pool_base }}/{{ server_ipv6_pool_prefixlen }}
-{%- endif %}
-
-{%- for route6 in server_ipv6_push_route %}
+{%     endif %}
+{%     for route6 in server_ipv6_push_route %}
 push "route-ipv6 {{ route6 }}"
-{%- endfor %}
-
-{%- for ns6 in server_ipv6_dns_nameserver %}
+{%     endfor %}
+{%     for ns6 in server_ipv6_dns_nameserver %}
 push "dhcp-option DNS6 {{ ns6 }}"
-{%- endfor %}
-
-{%- endif %}
-
-{% else -%}
+{%     endfor %}
+{%   endif %}
+{% else %}
 #
 # OpenVPN site-2-site mode
 #
-ping {{ ping_interval }}
-ping-restart {{ ping_restart }}
-
-{% if local_address_subnet -%}
-ifconfig {{ local_address[0] }} {{ local_address_subnet }}
-{%- elif remote_address -%}
-ifconfig {{ local_address[0] }} {{ remote_address[0] }}
-{%- endif %}
-
-{% if ipv6_local_address -%}
-ifconfig-ipv6 {{ ipv6_local_address[0] }} {{ ipv6_remote_address[0] }}
-{%- endif %}
-
-{% endif -%}
+ping {{ keep_alive.interval }}
+ping-restart {{ keep_alive.failure_count }}
+{%   if local_address_v4_netmask is defined and local_address_v4_netmask is not none %}
+ifconfig {{ local_address_v4[0] }} {{ local_address_v4_netmask[0] }}
+{%   elif remote_address_v4 is defined and remote_address_v4 is not none %}
+ifconfig {{ local_address_v4[0] }} {{ remote_address_v4[0] }}
+{%   endif %}
+{%   if local_address_v6 is defined and remote_address_v6 is defined and local_address_v6 is not none and remote_address_v6 is not none %}
+ifconfig-ipv6 {{ local_address_v6[0] }} {{ remote_address_v6[0] }}
+{%   endif %}
+{% endif %}
 
-{% if tls -%}
+{% if tls is defined and tls is not none %}
 # TLS options
-{%- if tls_ca_cert %}
-ca {{ tls_ca_cert }}
-{%- endif %}
-
-{%- if tls_cert %}
-cert {{ tls_cert }}
-{%- endif %}
-
-{%- if tls_key %}
-key {{ tls_key }}
-{%- endif %}
-
-{%- if tls_crypt %}
-tls-crypt {{ tls_crypt }}
-{%- endif %}
-
-{%- if tls_crl %}
-crl-verify {{ tls_crl }}
-{%- endif %}
-
-{%- if tls_version_min %}
-tls-version-min {{tls_version_min}}
-{%- endif %}
-
-{%- if tls_dh %}
-dh {{ tls_dh }}
-{%- endif %}
-
-{%- if tls_auth %}
-{%- if mode == 'client' %}
-tls-auth {{tls_auth}} 1
-{%- elif mode == 'server' %}
-tls-auth {{tls_auth}} 0
-{%- endif %}
-{%- endif %}
-
-{%- if tls_role %}
-{%- if 'active' in tls_role %}
+{%   if tls.ca_cert_file is defined and tls.ca_cert_file is not none %}
+ca {{ tls.ca_cert_file }}
+{%   endif %}
+{%   if tls.cert_file is defined and tls.cert_file is not none %}
+cert {{ tls.cert_file }}
+{%   endif %}
+{%   if tls.key_file is defined and tls.key_file is not none %}
+key {{ tls.key_file }}
+{%   endif %}
+{%   if tls.crypt_file is defined and tls.crypt_file is not none %}
+tls-crypt {{ tls.crypt_file }}
+{%   endif %}
+{%   if tls.crl_file is defined and tls.crl_file is not none %}
+crl-verify {{ tls.crl_file }}
+{%   endif %}
+{%   if tls.tls_version_min is defined and tls.tls_version_min is not none %}
+tls-version-min {{ tls.tls_version_min }}
+{%   endif %}
+{%   if tls.dh_file is defined and tls.dh_file is not none %}
+dh {{ tls.dh_file }}
+{%   endif %}
+{%   if tls.auth_file is defined and tls.auth_file is not none %}
+{%     if mode == 'client' %}
+tls-auth {{ tls.auth_file }} 1
+{%     elif mode == 'server' %}
+tls-auth {{ tls.auth_file }} 0
+{%     endif %}
+{%   endif %}
+{%   if tls.role is defined and tls.role is not none %}
+{%     if tls.role == 'active' %}
 tls-client
-{%- elif 'passive' in tls_role %}
+{%     elif tls.role == 'passive' %}
 tls-server
-{%- endif %}
-{%- endif %}
-
-{%- endif %}
+{%     endif %}
+{%   endif %}
+{% endif %}
 
 # Encryption options
-{%- if encryption %}
-{% if encryption == 'none' -%}
+{% if encryption is defined and encryption is not none %}
+{%   if encryption.cipher is defined and encryption.cipher is not none %}
+{%     if encryption.cipher == 'none' %}
 cipher none
-{%- elif encryption == 'des' -%}
+{%     elif encryption.cipher == 'des' %}
 cipher des-cbc
-{%- elif encryption == '3des' -%}
+{%     elif encryption.cipher == '3des' %}
 cipher des-ede3-cbc
-{%- elif encryption == 'bf128' -%}
+{%     elif encryption.cipher == 'bf128' %}
 cipher bf-cbc
 keysize 128
-{%- elif encryption == 'bf256' -%}
+{%     elif encryption.cipher == 'bf256' %}
 cipher bf-cbc
 keysize 25
-{%- elif encryption == 'aes128gcm' -%}
+{%     elif encryption.cipher == 'aes128gcm' %}
 cipher aes-128-gcm
-{%- elif encryption == 'aes128' -%}
+{%     elif encryption.cipher == 'aes128' %}
 cipher aes-128-cbc
-{%- elif encryption == 'aes192gcm' -%}
+{%     elif encryption.cipher == 'aes192gcm' %}
 cipher aes-192-gcm
-{%- elif encryption == 'aes192' -%}
+{%     elif encryption.cipher == 'aes192' %}
 cipher aes-192-cbc
-{%- elif encryption == 'aes256gcm' -%}
+{%     elif encryption.cipher == 'aes256gcm' %}
 cipher aes-256-gcm
-{%- elif encryption == 'aes256' -%}
+{%     elif encryption.cipher == 'aes256' %}
 cipher aes-256-cbc
-{%- endif -%}
-{%- endif %}
-
-{%- if ncp_ciphers %}
-ncp-ciphers {{ncp_ciphers}}
-{%- endif %}
-{%- if disable_ncp %}
+{%     endif %}
+{%   endif %}
+{%   if encryption.ncp_ciphers is defined and encryption.ncp_ciphers is not none %}
+ncp-ciphers {{ encryption.ncp_ciphers | join(':') }}
+{%   elif encryption.disable_ncp is defined %}
 ncp-disable
-{%- endif %}
+{%   endif %}
+{% endif %}
 
-{% if hash -%}
+{% if hash is defined and hash is not none %}
 auth {{ hash }}
-{%- endif -%}
+{% endif %}
 
-{%- if auth %}
+{% if authentication is defined and authentication is not none %}
 auth-user-pass {{ auth_user_pass_file }}
 auth-retry nointeract
-{%- endif %}
+{% endif %}
 
 # DEPRECATED This option will be removed in OpenVPN 2.5
 # Until OpenVPN v2.3 the format of the X.509 Subject fields was formatted like this:
@@ -257,12 +226,11 @@ auth-retry nointeract
 # See https://phabricator.vyos.net/T1512
 compat-names
 
-{% if options -%}
+{% if openvpn_option is defined and openvpn_option is not none %}
 #
 # Custom options added by user (not validated)
 #
-
-{% for option in options -%}
+{%   for option in openvpn_option %}
 {{ option }}
-{% endfor -%}
-{%- endif %}
+{%   endfor %}
+{% endif %}
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 5675379d5..80e1d2fa0 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -36,7 +36,7 @@
           #include <include/interface-description.xml.i>
           <leafNode name="device-type">
             <properties>
-              <help>OpenVPN interface device-type</help>
+              <help>OpenVPN interface device-type (default: tun)</help>
               <completionHelp>
                 <list>tun tap</list>
               </completionHelp>
@@ -49,9 +49,10 @@
                 <description>TAP device, required for OSI layer 2</description>
               </valueHelp>
               <constraint>
-                <regex>(tun|tap)</regex>
+                <regex>^(tun|tap)$</regex>
               </constraint>
             </properties>
+            <defaultValue>tun</defaultValue>
           </leafNode>
           #include <include/interface-disable.xml.i>
           <node name="encryption">
@@ -110,7 +111,7 @@
                     <description>AES algorithm with 256-bit key GCM</description>
                   </valueHelp>
                   <constraint>
-                    <regex>(none|des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex>
+                    <regex>^(none|des|3des|bf128|bf256|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)$</regex>
                   </constraint>
                 </properties>
               </leafNode>
@@ -157,7 +158,7 @@
                     <description>AES algorithm with 256-bit key GCM</description>
                   </valueHelp>
                   <constraint>
-                    <regex>(none|des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)</regex>
+                    <regex>^(none|des|3des|aes128|aes128gcm|aes192|aes192gcm|aes256|aes256gcm)$</regex>
                   </constraint>
                   <multi/>
                 </properties>
@@ -204,7 +205,7 @@
                 <description>SHA-512 algorithm</description>
               </valueHelp>
               <constraint>
-                <regex>(md5|sha1|sha256|sha384|sha512)</regex>
+                <regex>^(md5|sha1|sha256|sha384|sha512)$</regex>
               </constraint>
             </properties>
           </leafNode>
@@ -215,7 +216,7 @@
             <children>
               <leafNode name="failure-count">
                 <properties>
-                  <help>Maximum number of keepalive packet failures [default 6]</help>
+                  <help>Maximum number of keepalive packet failures (default: 60)</help>
                   <valueHelp>
                     <format>0-1000</format>
                     <description>Maximum number of keepalive packet failures</description>
@@ -224,10 +225,11 @@
                     <validator name="numeric" argument="--range 0-1000"/>
                   </constraint>
                 </properties>
+                <defaultValue>60</defaultValue>
               </leafNode>
               <leafNode name="interval">
                 <properties>
-                  <help>Keepalive packet interval (seconds) [default 10]</help>
+                  <help>Keepalive packet interval in seconds (default: 10)</help>
                   <valueHelp>
                     <format>0-600</format>
                     <description>Keepalive packet interval (seconds)</description>
@@ -236,6 +238,7 @@
                     <validator name="numeric" argument="--range 0-600"/>
                   </constraint>
                 </properties>
+                <defaultValue>10</defaultValue>
               </leafNode>
             </children>
           </node>
@@ -304,7 +307,7 @@
                 <description>Server in client-server mode</description>
               </valueHelp>
               <constraint>
-                <regex>(site-to-site|client|server)</regex>
+                <regex>^(site-to-site|client|server)$</regex>
               </constraint>
             </properties>
           </leafNode>
@@ -342,9 +345,10 @@
                 <description>TCP and initiates connections actively</description>
               </valueHelp>
               <constraint>
-                <regex>(udp|tcp-passive|tcp-active)</regex>
+                <regex>^(udp|tcp-passive|tcp-active)$</regex>
               </constraint>
             </properties>
+            <defaultValue>udp</defaultValue>
           </leafNode>
           <leafNode name="remote-address">
             <properties>
@@ -613,6 +617,7 @@
               <leafNode name="reject-unconfigured-clients">
                 <properties>
                   <help>Reject connections from clients that are not explicitly configured</help>
+                  <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="subnet">
@@ -634,7 +639,7 @@
               </leafNode>
               <leafNode name="topology">
                 <properties>
-                  <help>Topology for clients</help>
+                  <help>Topology for clients (default: net30)</help>
                   <completionHelp>
                     <list>net30 point-to-point subnet</list>
                   </completionHelp>
@@ -651,9 +656,10 @@
                     <description>Subnet topology</description>
                   </valueHelp>
                   <constraint>
-                    <regex>(subnet|point-to-point|net30)</regex>
+                    <regex>^(subnet|point-to-point|net30)$</regex>
                   </constraint>
                 </properties>
+                <defaultValue>net30</defaultValue>
               </leafNode>
             </children>
           </node>
@@ -777,13 +783,13 @@
                     <description>TLS v1.2</description>
                   </valueHelp>
                   <constraint>
-                    <regex>(1.0|1.1|1.2)</regex>
+                    <regex>^(1.0|1.1|1.2)$</regex>
                   </constraint>
                 </properties>
               </leafNode>
               <leafNode name="role">
                 <properties>
-                  <help>Private key for this host</help>
+                  <help>TLS negotiation role</help>
                   <completionHelp>
                     <list>active passive</list>
                   </completionHelp>
@@ -793,10 +799,10 @@
                   </valueHelp>
                   <valueHelp>
                     <format>passive</format>
-                    <description>Waiting for TLS connections passively</description>
+                    <description>Wait for incoming TLS connection</description>
                   </valueHelp>
                   <constraint>
-                    <regex>(active|passive)</regex>
+                    <regex>^(active|passive)$</regex>
                   </constraint>
                 </properties>
               </leafNode>
diff --git a/python/vyos/ifconfig/vtun.py b/python/vyos/ifconfig/vtun.py
index b25e32d63..99a592b3e 100644
--- a/python/vyos/ifconfig/vtun.py
+++ b/python/vyos/ifconfig/vtun.py
@@ -19,6 +19,7 @@ from vyos.ifconfig.interface import Interface
 class VTunIf(Interface):
     default = {
         'type': 'vtun',
+        'device_type': 'tun',
     }
     definition = {
         **Interface.definition,
@@ -28,15 +29,44 @@ class VTunIf(Interface):
             'bridgeable': True,
         },
     }
-
-    # stub this interface is created in the configure script
+    options = Interface.options + ['device_type']
 
     def _create(self):
-        # we can not create this interface as it is managed outside
-        # it requires configuring OpenVPN
+        """ Depending on OpenVPN operation mode the interface is created
+        immediately (e.g. Server mode) or once the connection to the server is
+        established (client mode). The latter will only be brought up once the
+        server can be reached, thus we might need to create this interface in
+        advance for the service to be operational. """
+        try:
+            cmd = 'openvpn --mktun --dev-type {device_type} --dev {ifname}'.format(**self.config)
+            return self._cmd(cmd)
+        except PermissionError:
+            # interface created by OpenVPN daemon in the meantime ...
+            pass
+
+    def add_addr(self, addr):
+        # IP addresses are managed by OpenVPN daemon
         pass
 
-    def _delete(self):
-        # we can not create this interface as it is managed outside
-        # it requires configuring OpenVPN
+    def del_addr(self, addr):
+        # IP addresses are managed by OpenVPN daemon
         pass
+
+    def update(self, config):
+        """ General helper function which works on a dictionary retrived by
+        get_config_dict(). It's main intention is to consolidate the scattered
+        interface setup code and provide a single point of entry when workin
+        on any interface. """
+
+        # call base class first
+        super().update(config)
+
+        # Enable/Disable of an interface must always be done at the end of the
+        # derived class to make use of the ref-counting set_admin_state()
+        # function. We will only enable the interface if 'up' was called as
+        # often as 'down'. This is required by some interface implementations
+        # as certain parameters can only be changed when the interface is
+        # in admin-down state. This ensures the link does not flap during
+        # reconfiguration.
+        state = 'down' if 'disable' in config else 'up'
+        self.set_admin_state(state)
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index 3f4965029..6b5a3363e 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -17,110 +17,36 @@
 import os
 import re
 
-from copy import deepcopy
-from sys import exit,stderr
-from ipaddress import ip_address,ip_network,IPv4Address,IPv4Network,IPv6Address,IPv6Network,summarize_address_range
+from sys import exit
+from ipaddress import IPv4Address
+from ipaddress import IPv4Network
+from ipaddress import IPv6Address
+from ipaddress import IPv6Network
+from ipaddress import summarize_address_range
 from netifaces import interfaces
 from shutil import rmtree
 
 from vyos.config import Config
-from vyos.configdict import list_diff
-from vyos.configdict import is_member
+from vyos.configdict import get_interface_dict
 from vyos.ifconfig import VTunIf
 from vyos.template import render
-from vyos.util import call, chown, chmod_600, chmod_755
-from vyos.validate import is_addr_assigned, is_ipv4
-from vyos import ConfigError
-from vyos.util import cmd
+from vyos.util import call
+from vyos.util import chown
+from vyos.util import chmod_600
+from vyos.util import dict_search
+from vyos.validate import is_addr_assigned
+from vyos.validate import is_ipv6
+from vyos.configverify import verify_vrf
+from vyos.configverify import verify_bridge_delete
 
+from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
 
 user = 'openvpn'
 group = 'openvpn'
 
-default_config_data = {
-    'address': [],
-    'auth_user': '',
-    'auth_pass': '',
-    'auth_user_pass_file': '',
-    'auth': False,
-    'compress_lzo': False,
-    'deleted': False,
-    'description': '',
-    'disable': False,
-    'disable_ncp': False,
-    'encryption': '',
-    'hash': '',
-    'intf': '',
-    'ipv6_accept_ra': 1,
-    'ipv6_autoconf': 0,
-    'ipv6_eui64_prefix': [],
-    'ipv6_eui64_prefix_remove': [],
-    'ipv6_forwarding': 1,
-    'ipv6_dup_addr_detect': 1,
-    'ipv6_local_address': [],
-    'ipv6_remote_address': [],
-    'is_bridge_member': False,
-    'ping_restart': '60',
-    'ping_interval': '10',
-    'local_address': [],
-    'local_address_subnet': '',
-    'local_host': '',
-    'local_port': '',
-    'mode': '',
-    'ncp_ciphers': '',
-    'options': [],
-    'persistent_tunnel': False,
-    'protocol': 'udp',
-    'protocol_real': '',
-    'redirect_gateway': '',
-    'remote_address': [],
-    'remote_host': [],
-    'remote_port': '',
-    'client': [],
-    'server_domain': '',
-    'server_max_conn': '',
-    'server_dns_nameserver': [],
-    'server_pool': True,
-    'server_pool_start': '',
-    'server_pool_stop': '',
-    'server_pool_netmask': '',
-    'server_push_route': [],
-    'server_reject_unconfigured': False,
-    'server_subnet': [],
-    'server_topology': '',
-    'server_ipv6_dns_nameserver': [],
-    'server_ipv6_local': '',
-    'server_ipv6_prefixlen': '',
-    'server_ipv6_remote': '',
-    'server_ipv6_pool': True,
-    'server_ipv6_pool_base': '',
-    'server_ipv6_pool_prefixlen': '',
-    'server_ipv6_push_route': [],
-    'server_ipv6_subnet': [],
-    'shared_secret_file': '',
-    'tls': False,
-    'tls_auth': '',
-    'tls_ca_cert': '',
-    'tls_cert': '',
-    'tls_crl': '',
-    'tls_dh': '',
-    'tls_key': '',
-    'tls_crypt': '',
-    'tls_role': '',
-    'tls_version_min': '',
-    'type': 'tun',
-    'uid': user,
-    'gid': group,
-    'vrf': ''
-}
-
-
-def get_config_name(intf):
-    cfg_file = f'/run/openvpn/{intf}.conf'
-    return cfg_file
-
+cfg_file = '/run/openvpn/{ifname}.conf'
 
 def checkCertHeader(header, filename):
     """
@@ -137,600 +63,158 @@ def checkCertHeader(header, filename):
 
     return False
 
-def getDefaultServer(network, topology, devtype):
+def get_config(config=None):
     """
-    Gets the default server parameters for a IPv4 "server" directive.
-    Logic from openvpn's src/openvpn/helper.c.
-    Returns a dict with addresses or False if the input parameters were incorrect.
+    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
+    interface name will be added or a deleted flag
     """
-    if not (devtype == 'tun' or devtype == 'tap'):
-        return False
-
-    if not network.version == 4:
-        return False
-    elif (devtype == 'tun' and network.prefixlen > 29) or (devtype == 'tap' and network.prefixlen > 30):
-        return False
-
-    server = {
-        'local': '',
-        'remote_netmask': '',
-        'client_remote_netmask': '',
-        'pool_start': '',
-        'pool_stop': '',
-        'pool_netmask': ''
-    }
-
-    if devtype == 'tun':
-        if topology == 'net30' or topology == 'point-to-point':
-            server['local'] = network[1]
-            server['remote_netmask'] = network[2]
-            server['client_remote_netmask'] = server['local']
-
-            # pool start is 4th host IP in subnet (.4 in a /24)
-            server['pool_start'] = network[4]
-
-            if network.prefixlen == 29:
-                server['pool_stop'] = network.broadcast_address
-            else:
-                # pool end is -4 from the broadcast address (.251 in a /24)
-                server['pool_stop'] = network[-5]
-
-        elif topology == 'subnet':
-            server['local'] = network[1]
-            server['remote_netmask'] = str(network.netmask)
-            server['client_remote_netmask'] = server['remote_netmask']
-            server['pool_start'] = network[2]
-            server['pool_stop'] = network[-3]
-            server['pool_netmask'] = server['remote_netmask']
-
-    elif devtype == 'tap':
-        server['local'] = network[1]
-        server['remote_netmask'] = str(network.netmask)
-        server['client_remote_netmask'] = server['remote_netmask']
-        server['pool_start'] = network[2]
-        server['pool_stop'] = network[-2]
-        server['pool_netmask'] = server['remote_netmask']
-
-    return server
-
-def get_config(config=None):
-    openvpn = deepcopy(default_config_data)
     if config:
         conf = config
     else:
         conf = Config()
+    base = ['interfaces', 'openvpn']
+    openvpn = get_interface_dict(conf, base)
+
+    openvpn['auth_user_pass_file'] = '/run/openvpn/{ifname}.pw'.format(**openvpn)
+    openvpn['daemon_user'] = user
+    openvpn['daemon_group'] = group
+
+    for addr_type in ['local_address', 'remote_address']:
+        # Split the {local,remote}_address property into separate IPv4 and IPv6
+        # lists for proper validation/configuration
+        if addr_type in openvpn:
+            # actually only one ipv4 and one ipv6 address is allowed - validated
+            # later on, thus keep this simple
+            address_v4 = []
+            netmask_v4 = []
+            address_v6 = []
+
+            for addr in openvpn[addr_type]:
+                if is_ipv6(addr):
+                    address_v6.append(addr)
+                else:
+                    if addr_type == 'local_address' and addr in openvpn['local_address'] and 'subnet_mask' in openvpn['local_address'][addr]:
+                        netmask_v4.append(openvpn['local_address'][addr]['subnet_mask'])
+                    address_v4.append(addr)
+
+            if address_v4: openvpn.update({addr_type + '_v4': address_v4})
+            if address_v6: openvpn.update({addr_type + '_v6': address_v6})
+            if netmask_v4: openvpn.update({'local_address_v4_netmask': netmask_v4})
+
+            del openvpn[addr_type]
+
+    if dict_search('server.subnet', openvpn):
+        # Split the subnet property into separate IPv4 and IPv6 lists for
+        # proper validation/configuration
+        subnet_v4 = []
+        subnet_v6 = []
+
+        for subnet in dict_search('server.subnet', openvpn):
+            if is_ipv6(subnet):
+                subnet_v6.append(subnet)
+            else:
+                subnet_v4.append(subnet)
 
-    # determine tagNode instance
-    if 'VYOS_TAGNODE_VALUE' not in os.environ:
-        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
-
-    openvpn['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    openvpn['auth_user_pass_file'] = f"/run/openvpn/{openvpn['intf']}.pw"
-
-    # check if interface is member of a bridge
-    tmp = is_member(conf, openvpn['intf'], 'bridge')
-    if tmp: openvpn['is_bridge_member'] = next(iter(tmp))
-
-    # Check if interface instance has been removed
-    if not conf.exists('interfaces openvpn ' + openvpn['intf']):
-        openvpn['deleted'] = True
-        return openvpn
-
-    # bridged server should not have a pool by default (but can be specified manually)
-    if openvpn['is_bridge_member']:
-        openvpn['server_pool'] = False
-        openvpn['server_ipv6_pool'] = False
-
-    # set configuration level
-    conf.set_level('interfaces openvpn ' + openvpn['intf'])
-
-    # retrieve authentication options - username
-    if conf.exists('authentication username'):
-        openvpn['auth_user'] = conf.return_value('authentication username')
-        openvpn['auth'] = True
-
-    # retrieve authentication options - username
-    if conf.exists('authentication password'):
-        openvpn['auth_pass'] = conf.return_value('authentication password')
-        openvpn['auth'] = True
-
-    # retrieve interface description
-    if conf.exists('description'):
-        openvpn['description'] = conf.return_value('description')
-
-    # interface device-type
-    if conf.exists('device-type'):
-        openvpn['type'] = conf.return_value('device-type')
-
-    # disable interface
-    if conf.exists('disable'):
-        openvpn['disable'] = True
-
-    # data encryption algorithm cipher
-    if conf.exists('encryption cipher'):
-        openvpn['encryption'] = conf.return_value('encryption cipher')
-
-    # disable ncp-ciphers support
-    if conf.exists('encryption disable-ncp'):
-        openvpn['disable_ncp'] = True
-
-    # data encryption algorithm ncp-list
-    if conf.exists('encryption ncp-ciphers'):
-        _ncp_ciphers = []
-        for enc in conf.return_values('encryption ncp-ciphers'):
-            if enc == 'none':
-                _ncp_ciphers.append('none')
-                _ncp_ciphers.append('NONE')
-            elif enc == 'des':
-                _ncp_ciphers.append('des-cbc')
-                _ncp_ciphers.append('DES-CBC')
-            elif enc == '3des':
-                _ncp_ciphers.append('des-ede3-cbc')
-                _ncp_ciphers.append('DES-EDE3-CBC')
-            elif enc == 'aes128':
-                _ncp_ciphers.append('aes-128-cbc')
-                _ncp_ciphers.append('AES-128-CBC')
-            elif enc == 'aes128gcm':
-                _ncp_ciphers.append('aes-128-gcm')
-                _ncp_ciphers.append('AES-128-GCM')
-            elif enc == 'aes192':
-                _ncp_ciphers.append('aes-192-cbc')
-                _ncp_ciphers.append('AES-192-CBC')
-            elif enc == 'aes192gcm':
-                _ncp_ciphers.append('aes-192-gcm')
-                _ncp_ciphers.append('AES-192-GCM')
-            elif enc == 'aes256':
-                _ncp_ciphers.append('aes-256-cbc')
-                _ncp_ciphers.append('AES-256-CBC')
-            elif enc == 'aes256gcm':
-                _ncp_ciphers.append('aes-256-gcm')
-                _ncp_ciphers.append('AES-256-GCM')
-        openvpn['ncp_ciphers'] = ':'.join(_ncp_ciphers)
-
-    # hash algorithm
-    if conf.exists('hash'):
-        openvpn['hash'] = conf.return_value('hash')
-
-    # Maximum number of keepalive packet failures
-    if conf.exists('keep-alive failure-count') and conf.exists('keep-alive interval'):
-        fail_count = conf.return_value('keep-alive failure-count')
-        interval = conf.return_value('keep-alive interval')
-        openvpn['ping_interval' ] = interval
-        openvpn['ping_restart' ] = int(interval) * int(fail_count)
-
-    # Local IP address of tunnel - even as it is a tag node - we can only work
-    # on the first address
-    if conf.exists('local-address'):
-        for tmp in conf.list_nodes('local-address'):
-            tmp_ip = ip_address(tmp)
-            if tmp_ip.version == 4:
-                openvpn['local_address'].append(tmp)
-                if conf.exists('local-address {} subnet-mask'.format(tmp)):
-                    openvpn['local_address_subnet'] = conf.return_value('local-address {} subnet-mask'.format(tmp))
-            elif tmp_ip.version == 6:
-                # input IPv6 address could be expanded so get the compressed version
-                openvpn['ipv6_local_address'].append(str(tmp_ip))
-
-    # Local IP address to accept connections
-    if conf.exists('local-host'):
-        openvpn['local_host'] = conf.return_value('local-host')
-
-    # Local port number to accept connections
-    if conf.exists('local-port'):
-        openvpn['local_port'] = conf.return_value('local-port')
-
-    # Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)
-    if conf.exists('ipv6 address autoconf'):
-        openvpn['ipv6_autoconf'] = 1
-
-    # Get prefixes for IPv6 addressing based on MAC address (EUI-64)
-    if conf.exists('ipv6 address eui64'):
-        openvpn['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
-
-    # Determine currently effective EUI64 addresses - to determine which
-    # address is no longer valid and needs to be removed
-    eff_addr = conf.return_effective_values('ipv6 address eui64')
-    openvpn['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, openvpn['ipv6_eui64_prefix'])
-
-    # Remove the default link-local address if set.
-    if conf.exists('ipv6 address no-default-link-local'):
-        openvpn['ipv6_eui64_prefix_remove'].append('fe80::/64')
-    else:
-        # add the link-local by default to make IPv6 work
-        openvpn['ipv6_eui64_prefix'].append('fe80::/64')
-
-    # Disable IPv6 forwarding on this interface
-    if conf.exists('ipv6 disable-forwarding'):
-        openvpn['ipv6_forwarding'] = 0
-
-    # IPv6 Duplicate Address Detection (DAD) tries
-    if conf.exists('ipv6 dup-addr-detect-transmits'):
-        openvpn['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
-
-    # to make IPv6 SLAAC and DHCPv6 work with forwarding=1,
-    # accept_ra must be 2
-    if openvpn['ipv6_autoconf'] or 'dhcpv6' in openvpn['address']:
-        openvpn['ipv6_accept_ra'] = 2
-
-    # OpenVPN operation mode
-    if conf.exists('mode'):
-        openvpn['mode'] = conf.return_value('mode')
-
-    # Additional OpenVPN options
-    if conf.exists('openvpn-option'):
-        openvpn['options'] = conf.return_values('openvpn-option')
-
-    # Do not close and reopen interface
-    if conf.exists('persistent-tunnel'):
-        openvpn['persistent_tunnel'] = True
-
-    # Communication protocol
-    if conf.exists('protocol'):
-        openvpn['protocol'] = conf.return_value('protocol')
-
-    # IP address of remote end of tunnel
-    if conf.exists('remote-address'):
-        for tmp in conf.return_values('remote-address'):
-            tmp_ip = ip_address(tmp)
-            if tmp_ip.version == 4:
-                openvpn['remote_address'].append(tmp)
-            elif tmp_ip.version == 6:
-                openvpn['ipv6_remote_address'].append(str(tmp_ip))
-
-    # Remote host to connect to (dynamic if not set)
-    if conf.exists('remote-host'):
-        openvpn['remote_host'] = conf.return_values('remote-host')
-
-    # Remote port number to connect to
-    if conf.exists('remote-port'):
-        openvpn['remote_port'] = conf.return_value('remote-port')
-
-    # OpenVPN tunnel to be used as the default route
-    # see https://openvpn.net/community-resources/reference-manual-for-openvpn-2-4/
-    # redirect-gateway flags
-    if conf.exists('replace-default-route'):
-        openvpn['redirect_gateway'] = 'def1'
-
-    if conf.exists('replace-default-route local'):
-        openvpn['redirect_gateway'] = 'local def1'
-
-    # Topology for clients
-    if conf.exists('server topology'):
-        openvpn['server_topology'] = conf.return_value('server topology')
-
-    # Server-mode subnet (from which client IPs are allocated)
-    server_network_v4 = None
-    server_network_v6 = None
-    if conf.exists('server subnet'):
-        for tmp in conf.return_values('server subnet'):
-            tmp_ip = ip_network(tmp)
-            if tmp_ip.version == 4:
-                server_network_v4 = tmp_ip
-                # convert the network to format: "192.0.2.0 255.255.255.0" for later use in template
-                openvpn['server_subnet'].append(tmp_ip.with_netmask.replace(r'/', ' '))
-            elif tmp_ip.version == 6:
-                server_network_v6 = tmp_ip
-                openvpn['server_ipv6_subnet'].append(str(tmp_ip))
-
-    # Client-specific settings
-    for client in conf.list_nodes('server client'):
-        # set configuration level
-        conf.set_level('interfaces openvpn ' + openvpn['intf'] + ' server client ' + client)
-        data = {
-            'name': client,
-            'disable': False,
-            'ip': [],
-            'ipv6_ip': [],
-            'ipv6_remote': '',
-            'ipv6_push_route': [],
-            'ipv6_subnet': [],
-            'push_route': [],
-            'subnet': [],
-            'remote_netmask': ''
-        }
-
-        # Option to disable client connection
-        if conf.exists('disable'):
-            data['disable'] = True
-
-        # IP address of the client
-        for tmp in conf.return_values('ip'):
-            tmp_ip = ip_address(tmp)
-            if tmp_ip.version == 4:
-                data['ip'].append(tmp)
-            elif tmp_ip.version == 6:
-                data['ipv6_ip'].append(str(tmp_ip))
-
-        # Route to be pushed to the client
-        for tmp in conf.return_values('push-route'):
-            tmp_ip = ip_network(tmp)
-            if tmp_ip.version == 4:
-                data['push_route'].append(tmp_ip.with_netmask.replace(r'/', ' '))
-            elif tmp_ip.version == 6:
-                data['ipv6_push_route'].append(str(tmp_ip))
-
-        # Subnet belonging to the client
-        for tmp in conf.return_values('subnet'):
-            tmp_ip = ip_network(tmp)
-            if tmp_ip.version == 4:
-                data['subnet'].append(tmp_ip.with_netmask.replace(r'/', ' '))
-            elif tmp_ip.version == 6:
-                data['ipv6_subnet'].append(str(tmp_ip))
-
-        # Append to global client list
-        openvpn['client'].append(data)
-
-    # re-set configuration level
-    conf.set_level('interfaces openvpn ' + openvpn['intf'])
-
-    # Server client IP pool
-    if conf.exists('server client-ip-pool'):
-        conf.set_level('interfaces openvpn ' + openvpn['intf'] + ' server client-ip-pool')
-
-        # enable or disable server_pool where necessary
-        # default is enabled, or disabled in bridge mode
-        openvpn['server_pool'] = not conf.exists('disable')
-
-        if conf.exists('start'):
-            openvpn['server_pool_start'] = conf.return_value('start')
-
-        if conf.exists('stop'):
-            openvpn['server_pool_stop'] = conf.return_value('stop')
-
-        if conf.exists('netmask'):
-            openvpn['server_pool_netmask'] = conf.return_value('netmask')
-
-        conf.set_level('interfaces openvpn ' + openvpn['intf'])
-
-    # Server client IPv6 pool
-    if conf.exists('server client-ipv6-pool'):
-        conf.set_level('interfaces openvpn ' + openvpn['intf'] + ' server client-ipv6-pool')
-        openvpn['server_ipv6_pool'] = not conf.exists('disable')
-        if conf.exists('base'):
-            tmp = conf.return_value('base').split('/')
-            openvpn['server_ipv6_pool_base'] = str(IPv6Address(tmp[0]))
-            if 1 < len(tmp):
-                openvpn['server_ipv6_pool_prefixlen'] = tmp[1]
-
-        conf.set_level('interfaces openvpn ' + openvpn['intf'])
-
-    # DNS suffix to be pushed to all clients
-    if conf.exists('server domain-name'):
-        openvpn['server_domain'] = conf.return_value('server domain-name')
-
-    # Number of maximum client connections
-    if conf.exists('server max-connections'):
-        openvpn['server_max_conn'] = conf.return_value('server max-connections')
-
-    # Domain Name Server (DNS)
-    if conf.exists('server name-server'):
-        for tmp in conf.return_values('server name-server'):
-            tmp_ip = ip_address(tmp)
-            if tmp_ip.version == 4:
-                openvpn['server_dns_nameserver'].append(tmp)
-            elif tmp_ip.version == 6:
-                openvpn['server_ipv6_dns_nameserver'].append(str(tmp_ip))
-
-    # Route to be pushed to all clients
-    if conf.exists('server push-route'):
-        for tmp in conf.return_values('server push-route'):
-            tmp_ip = ip_network(tmp)
-            if tmp_ip.version == 4:
-                openvpn['server_push_route'].append(tmp_ip.with_netmask.replace(r'/', ' '))
-            elif tmp_ip.version == 6:
-                openvpn['server_ipv6_push_route'].append(str(tmp_ip))
-
-    # Reject connections from clients that are not explicitly configured
-    if conf.exists('server reject-unconfigured-clients'):
-        openvpn['server_reject_unconfigured'] = True
-
-    # File containing TLS auth static key
-    if conf.exists('tls auth-file'):
-        openvpn['tls_auth'] = conf.return_value('tls auth-file')
-        openvpn['tls'] = True
-
-    # File containing certificate for Certificate Authority (CA)
-    if conf.exists('tls ca-cert-file'):
-         openvpn['tls_ca_cert'] = conf.return_value('tls ca-cert-file')
-         openvpn['tls'] = True
-
-    # File containing certificate for this host
-    if conf.exists('tls cert-file'):
-         openvpn['tls_cert'] = conf.return_value('tls cert-file')
-         openvpn['tls'] = True
-
-    # File containing certificate revocation list (CRL) for this host
-    if conf.exists('tls crl-file'):
-         openvpn['tls_crl'] = conf.return_value('tls crl-file')
-         openvpn['tls'] = True
-
-    # File containing Diffie Hellman parameters (server only)
-    if conf.exists('tls dh-file'):
-         openvpn['tls_dh'] = conf.return_value('tls dh-file')
-         openvpn['tls'] = True
-
-    # File containing this host's private key
-    if conf.exists('tls key-file'):
-         openvpn['tls_key'] = conf.return_value('tls key-file')
-         openvpn['tls'] = True
-
-    # File containing key to encrypt control channel packets
-    if conf.exists('tls crypt-file'):
-         openvpn['tls_crypt'] = conf.return_value('tls crypt-file')
-         openvpn['tls'] = True
-
-    # Role in TLS negotiation
-    if conf.exists('tls role'):
-         openvpn['tls_role'] = conf.return_value('tls role')
-         openvpn['tls'] = True
-
-    # Minimum required TLS version
-    if conf.exists('tls tls-version-min'):
-         openvpn['tls_version_min'] = conf.return_value('tls tls-version-min')
-         openvpn['tls'] = True
-
-    if conf.exists('shared-secret-key-file'):
-        openvpn['shared_secret_file'] = conf.return_value('shared-secret-key-file')
-
-    if conf.exists('use-lzo-compression'):
-        openvpn['compress_lzo'] = True
-
-    # Special case when using EC certificates:
-    # if key-file is EC and dh-file is unset, set tls_dh to 'none'
-    if not openvpn['tls_dh'] and openvpn['tls_key'] and checkCertHeader('-----BEGIN EC PRIVATE KEY-----', openvpn['tls_key']):
-        openvpn['tls_dh'] = 'none'
-
-    # set default server topology to net30
-    if openvpn['mode'] == 'server' and not openvpn['server_topology']:
-        openvpn['server_topology'] = 'net30'
-
-    # Convert protocol to real protocol used by openvpn.
-    # To make openvpn listen on both IPv4 and IPv6 we must use *6 protocols
-    # (https://community.openvpn.net/openvpn/ticket/360), unless the local-host
-    # or each of the remote-host in client mode is IPv4
-    # in which case it must use the standard protocols.
-    if openvpn['protocol'] == 'tcp-active':
-        openvpn['protocol_real'] = 'tcp6-client'
-    elif openvpn['protocol'] == 'tcp-passive':
-        openvpn['protocol_real'] = 'tcp6-server'
-    else:
-        openvpn['protocol_real'] = 'udp6'
-
-    if ( is_ipv4(openvpn['local_host']) or
-            # in client mode test all the remotes instead
-            (openvpn['mode'] == 'client' and all([is_ipv4(h) for h in openvpn['remote_host']])) ):
-        # takes out the '6'
-        openvpn['protocol_real'] = openvpn['protocol_real'][:3] + openvpn['protocol_real'][4:]
-
-    # Set defaults where necessary.
-    # If any of the input parameters are wrong,
-    # this will return False and no defaults will be set.
-    if server_network_v4 and openvpn['server_topology'] and openvpn['type']:
-        default_server = None
-        default_server = getDefaultServer(server_network_v4, openvpn['server_topology'], openvpn['type'])
-        if default_server:
-            # server-bridge doesn't require a pool so don't set defaults for it
-            if openvpn['server_pool'] and not openvpn['is_bridge_member']:
-                if not openvpn['server_pool_start']:
-                    openvpn['server_pool_start'] = default_server['pool_start']
-
-                if not openvpn['server_pool_stop']:
-                    openvpn['server_pool_stop'] = default_server['pool_stop']
-
-                if not openvpn['server_pool_netmask']:
-                    openvpn['server_pool_netmask'] = default_server['pool_netmask']
-
-            for client in openvpn['client']:
-                client['remote_netmask'] = default_server['client_remote_netmask']
-
-    if server_network_v6:
-        if not openvpn['server_ipv6_local']:
-            openvpn['server_ipv6_local'] = server_network_v6[1]
-        if not openvpn['server_ipv6_prefixlen']:
-            openvpn['server_ipv6_prefixlen'] = server_network_v6.prefixlen
-        if not openvpn['server_ipv6_remote']:
-            openvpn['server_ipv6_remote'] = server_network_v6[2]
-
-        if openvpn['server_ipv6_pool'] and server_network_v6.prefixlen < 112:
-            if not openvpn['server_ipv6_pool_base']:
-                openvpn['server_ipv6_pool_base'] = server_network_v6[0x1000]
-            if not openvpn['server_ipv6_pool_prefixlen']:
-                openvpn['server_ipv6_pool_prefixlen'] = openvpn['server_ipv6_prefixlen']
-
-        for client in openvpn['client']:
-            client['ipv6_remote'] = openvpn['server_ipv6_local']
-
-        if openvpn['redirect_gateway']:
-            openvpn['redirect_gateway'] += ' ipv6'
-
-    # retrieve VRF instance
-    if conf.exists('vrf'):
-        openvpn['vrf'] = conf.return_value('vrf')
+        if subnet_v4: openvpn['server'].update({'subnet_v4': subnet_v4})
+        if subnet_v6: openvpn['server'].update({'subnet_v6': subnet_v6})
+
+        del openvpn['server']['subnet']
 
     return openvpn
 
 def verify(openvpn):
-    if openvpn['deleted']:
-        if openvpn['is_bridge_member']:
-            raise ConfigError((
-                f'Cannot delete interface "{openvpn["intf"]}" as it is a '
-                f'member of bridge "{openvpn["is_bridge_menber"]}"!'))
+    if 'deleted' in openvpn:
+        verify_bridge_delete(openvpn)
         return None
 
-
-    if not openvpn['mode']:
-        raise ConfigError('Must specify OpenVPN operation mode')
+    if 'mode' not in openvpn:
+        raise ConfigError('Must specify OpenVPN operation mode!')
 
     # Check if we have disabled ncp and at the same time specified ncp-ciphers
-    if openvpn['disable_ncp'] and openvpn['ncp_ciphers']:
-        raise ConfigError('Cannot specify both "encryption disable-ncp" and "encryption ncp-ciphers"')
+    if 'encryption' in openvpn:
+        if {'disable_ncp', 'ncp_ciphers'} <= set(openvpn.get('encryption')):
+            raise ConfigError('Can not specify both "encryption disable-ncp" '\
+                              'and "encryption ncp-ciphers"')
+
     #
     # OpenVPN client mode - VERIFY
     #
     if openvpn['mode'] == 'client':
-        if openvpn['local_port']:
+        if 'local_port' in openvpn:
             raise ConfigError('Cannot specify "local-port" in client mode')
 
-        if openvpn['local_host']:
+        if 'local_host' in openvpn:
             raise ConfigError('Cannot specify "local-host" in client mode')
 
+        if 'remote_host' not in openvpn:
+            raise ConfigError('Must specify "remote-host" in client mode')
+
         if openvpn['protocol'] == 'tcp-passive':
             raise ConfigError('Protocol "tcp-passive" is not valid in client mode')
 
-        if not openvpn['remote_host']:
-            raise ConfigError('Must specify "remote-host" in client mode')
-
-        if openvpn['tls_dh'] and openvpn['tls_dh'] != 'none':
+        if dict_search('tls.dh_file', openvpn):
             raise ConfigError('Cannot specify "tls dh-file" in client mode')
 
     #
     # OpenVPN site-to-site - VERIFY
     #
-    if openvpn['mode'] == 'site-to-site':
-        if openvpn['ncp_ciphers']:
-            raise ConfigError('encryption ncp-ciphers cannot be specified in site-to-site mode, only server or client')
+    elif openvpn['mode'] == 'site-to-site':
+        if dict_search('encryption.ncp_ciphers', openvpn):
+            raise ConfigError('NCP ciphers can only be used in client or server mode')
+
+    elif openvpn['mode'] == 'site-to-site' and 'is_bridge_member' not in openvpn:
 
-    if openvpn['mode'] == 'site-to-site' and not openvpn['is_bridge_member']:
-        if not (openvpn['local_address'] or openvpn['ipv6_local_address']):
+        if not ('local_address_v4' in openvpn or 'local_address_v6' in openvpn):
             raise ConfigError('Must specify "local-address" or add interface to bridge')
 
-        if len(openvpn['local_address']) > 1 or len(openvpn['ipv6_local_address']) > 1:
-            raise ConfigError('Cannot specify more than 1 IPv4 and 1 IPv6 "local-address"')
+        if 'local_address_v4' in openvpn and len(openvpn['local_address_v4']) > 1:
+            raise ConfigError('Only one IPv4 local-address can be specified')
 
-        if len(openvpn['remote_address']) > 1 or len(openvpn['ipv6_remote_address']) > 1:
-            raise ConfigError('Cannot specify more than 1 IPv4 and 1 IPv6 "remote-address"')
+        if 'local_address_v6' in openvpn and len(openvpn['local_address_v6']) > 1:
+            raise ConfigError('Only one IPv6 local-address can be specified')
 
-        for host in openvpn['remote_host']:
-            if host in openvpn['remote_address'] or host in openvpn['ipv6_remote_address']:
-                raise ConfigError('"remote-address" cannot be the same as "remote-host"')
+        if 'remote_address_v4' in openvpn and len(openvpn['remote_address_v4']) > 1:
+            raise ConfigError('Only one IPv4 remote-address can be specified')
 
-        if openvpn['local_address'] and not (openvpn['remote_address'] or openvpn['local_address_subnet']):
-            raise ConfigError('IPv4 "local-address" requires IPv4 "remote-address" or IPv4 "local-address subnet"')
+        if 'remote_address_v6' in openvpn and len(openvpn['remote_address_v6']) > 1:
+            raise ConfigError('Only one IPv6 remote-address can be specified')
 
-        if openvpn['remote_address'] and not openvpn['local_address']:
+        for host in (dict_search('remote_host', openvpn) or []):
+            if host in (dict_search('remote_address_v4', openvpn) or vyos_dict_search('remote_address_v6', openvpn) or []):
+                raise ConfigError('"remote-address" and "remote-host" can not be the same')
+
+        if 'local_address_v4' in openvpn:
+            if not ({'remote_address', 'local_address_v4_netmask'} <= set(openvpn)):
+                raise ConfigError('IPv4 "local-address" requires IPv4 "remote-address" or IPv4 "local-address subnet"')
+
+        if 'remote_address_v4' in openvpn and not 'local_address_v4' in openvpn:
             raise ConfigError('IPv4 "remote-address" requires IPv4 "local-address"')
 
-        if openvpn['ipv6_local_address'] and not openvpn['ipv6_remote_address']:
-            raise ConfigError('IPv6 "local-address" requires IPv6 "remote-address"')
+        if 'local_address_v4' in openvpn and not 'remote_address_v4' in openvpn:
+            raise ConfigError('IPv4 "local-address" requires IPv4 "remote-address"')
 
-        if openvpn['ipv6_remote_address'] and not openvpn['ipv6_local_address']:
+        if 'remote_address_v6' in openvpn and not 'local_address_v6' in openvpn:
             raise ConfigError('IPv6 "remote-address" requires IPv6 "local-address"')
 
-        if openvpn['type'] == 'tun':
-            if not (openvpn['remote_address'] or openvpn['ipv6_remote_address']):
+        if 'local_address_v6' in openvpn and not 'remote_address_v6' in openvpn:
+            raise ConfigError('IPv6 "local-address" requires IPv6 "remote-address"')
+
+        if openvpn['device_type'] == 'tun':
+            if not ('remote_address_v4' in openvpn or 'remote_address_v6' in openvpn):
                 raise ConfigError('Must specify "remote-address"')
 
-            if ( (openvpn['local_address'] and openvpn['local_address'] == openvpn['remote_address']) or
-                    (openvpn['ipv6_local_address'] and openvpn['ipv6_local_address'] == openvpn['ipv6_remote_address']) ):
+            if (dict_search('local_address_v4', openvpn) == vyos_dict_search('remote_address_v4', openvpn) or
+                dict_search('local_address_v6', openvpn) == vyos_dict_search('remote_address_v6', openvpn)):
                 raise ConfigError('"local-address" and "remote-address" cannot be the same')
 
-            if openvpn['local_host'] in openvpn['local_address'] or openvpn['local_host'] in openvpn['ipv6_local_address']:
+            if dict_search('local_host', openvpn) in vyos_dict_search('local_address_v4', openvpn) or vyos_dict_search('local_address_v6', openvpn):
                 raise ConfigError('"local-address" cannot be the same as "local-host"')
 
     else:
         # checks for client-server or site-to-site bridged
-        if openvpn['local_address'] or openvpn['ipv6_local_address'] or openvpn['remote_address'] or openvpn['ipv6_remote_address']:
-            raise ConfigError('Cannot specify "local-address" or "remote-address" in client-server or bridge mode')
+        if 'local_address' in openvpn or 'remote_address' in openvpn:
+            raise ConfigError('Cannot specify "local-address" or "remote-address" ' \
+                              'in client/server or bridge mode')
 
     #
     # OpenVPN server mode - VERIFY
@@ -739,47 +223,51 @@ def verify(openvpn):
         if openvpn['protocol'] == 'tcp-active':
             raise ConfigError('Protocol "tcp-active" is not valid in server mode')
 
-        if openvpn['remote_port']:
+        if 'remote_port' in openvpn:
             raise ConfigError('Cannot specify "remote-port" in server mode')
 
-        if openvpn['remote_host']:
+        if 'remote_host' in openvpn:
             raise ConfigError('Cannot specify "remote-host" in server mode')
 
-        if openvpn['protocol'] == 'tcp-passive' and len(openvpn['remote_host']) > 1:
-            raise ConfigError('Cannot specify more than 1 "remote-host" with "tcp-passive"')
+        tmp = dict_search('tls.dh_file', openvpn)
+        if 'tls' in openvpn:
+            if 'dh_file' not in openvpn['tls']:
+                if 'key_file' in openvpn['tls'] and not checkCertHeader('-----BEGIN EC PRIVATE KEY-----', openvpn['tls']['key_file']):
+                    raise ConfigError('Must specify "tls dh-file" when not using EC keys in server mode')
 
-        if not openvpn['tls_dh'] and not checkCertHeader('-----BEGIN EC PRIVATE KEY-----', openvpn['tls_key']):
-            raise ConfigError('Must specify "tls dh-file" when not using EC keys in server mode')
+        if len(dict_search('server.subnet_v4', openvpn) or []) > 1:
+            raise ConfigError('Cannot specify more than 1 IPv4 server subnet')
 
-        if len(openvpn['server_subnet']) > 1 or len(openvpn['server_ipv6_subnet']) > 1:
-            raise ConfigError('Cannot specify more than 1 IPv4 and 1 IPv6 server subnet')
+        if len(dict_search('server.subnet_v6', openvpn) or []) > 1:
+            raise ConfigError('Cannot specify more than 1 IPv6 server subnet')
 
-        for client in openvpn['client']:
+        for client in (dict_search('client', openvpn) or []):
             if len(client['ip']) > 1 or len(client['ipv6_ip']) > 1:
                 raise ConfigError(f'Server client "{client["name"]}": cannot specify more than 1 IPv4 and 1 IPv6 IP')
 
-        if openvpn['server_subnet']:
-            subnet = IPv4Network(openvpn['server_subnet'][0].replace(' ', '/'))
+        tmp = dict_search('server.subnet_v4', openvpn)
+        if tmp:
+            subnet = IPv4Network(tmp[0].replace(' ', '/'))
 
-            if openvpn['type'] == 'tun' and subnet.prefixlen > 29:
+            if openvpn['device_type'] == 'tun' and subnet.prefixlen > 29:
                 raise ConfigError('Server subnets smaller than /29 with device type "tun" are not supported')
-            elif openvpn['type'] == 'tap' and subnet.prefixlen > 30:
+            elif openvpn['device_type'] == 'tap' and subnet.prefixlen > 30:
                 raise ConfigError('Server subnets smaller than /30 with device type "tap" are not supported')
 
-            for client in openvpn['client']:
+            for client in (dict_search('client', openvpn) or []):
                 if client['ip'] and not IPv4Address(client['ip'][0]) in subnet:
                     raise ConfigError(f'Client "{client["name"]}" IP {client["ip"][0]} not in server subnet {subnet}')
 
         else:
-            if not openvpn['is_bridge_member']:
+            if 'is_bridge_member' not in openvpn:
                 raise ConfigError('Must specify "server subnet" or add interface to bridge in server mode')
 
-        if openvpn['server_pool']:
-            if not (openvpn['server_pool_start'] and openvpn['server_pool_stop']):
-                raise ConfigError('Server client-ip-pool requires both start and stop addresses in bridged mode')
+        if dict_search('server.client_ip_pool', openvpn):
+            if not (dict_search('server.client_ip_pool.start', openvpn) and vyos_dict_search('server.client_ip_pool.stop', openvpn)):
+                raise ConfigError('Server client-ip-pool requires both start and stop addresses')
             else:
-                v4PoolStart = IPv4Address(openvpn['server_pool_start'])
-                v4PoolStop = IPv4Address(openvpn['server_pool_stop'])
+                v4PoolStart = IPv4Address(dict_search('server.client_ip_pool.start', openvpn))
+                v4PoolStop = IPv4Address(dict_search('server.client_ip_pool.stop', openvpn))
                 if v4PoolStart > v4PoolStop:
                     raise ConfigError(f'Server client-ip-pool start address {v4PoolStart} is larger than stop address {v4PoolStop}')
 
@@ -788,59 +276,60 @@ def verify(openvpn):
                     raise ConfigError(f'Server client-ip-pool is too large [{v4PoolStart} -> {v4PoolStop} = {v4PoolSize}], maximum is 65536 addresses.')
 
                 v4PoolNets = list(summarize_address_range(v4PoolStart, v4PoolStop))
-                for client in openvpn['client']:
+                for client in (dict_search('client', openvpn) or []):
                     if client['ip']:
                         for v4PoolNet in v4PoolNets:
                             if IPv4Address(client['ip'][0]) in v4PoolNet:
-                                print(f'Warning: Client "{client["name"]}" IP {client["ip"][0]} is in server IP pool, it is not reserved for this client.',
-                                        file=stderr)
+                                print(f'Warning: Client "{client["name"]}" IP {client["ip"][0]} is in server IP pool, it is not reserved for this client.')
 
-        if openvpn['server_ipv6_subnet']:
-            if not openvpn['server_subnet']:
+        if dict_search('server.subnet_v6', openvpn):
+            if not dict_search('server.subnet_v4', openvpn):
                 raise ConfigError('IPv6 server requires an IPv4 server subnet')
 
-            if openvpn['server_ipv6_pool']:
-                if not openvpn['server_pool']:
+            tmp = dict_search('client_ipv6_pool.base', openvpn)
+            if tmp:
+                if not dict_search('server.client_ip_pool', openvpn):
                     raise ConfigError('IPv6 server pool requires an IPv4 server pool')
 
-                if int(openvpn['server_ipv6_pool_prefixlen']) >= 112:
+                if int(tmp.split('/')[1]) >= 112:
                     raise ConfigError('IPv6 server pool must be larger than /112')
 
-                v6PoolStart = IPv6Address(openvpn['server_ipv6_pool_base'])
+                #
+                # todo - weird logic
+                #
+
+                v6PoolStart = IPv6Address(tmp)
                 v6PoolStop = IPv6Network((v6PoolStart, openvpn['server_ipv6_pool_prefixlen']), strict=False)[-1] # don't remove the parentheses, it's a 2-tuple
                 v6PoolSize = int(v6PoolStop) - int(v6PoolStart) if int(openvpn['server_ipv6_pool_prefixlen']) > 96 else 65536
                 if v6PoolSize < v4PoolSize:
                     raise ConfigError(f'IPv6 server pool must be at least as large as the IPv4 pool (current sizes: IPv6={v6PoolSize} IPv4={v4PoolSize})')
 
                 v6PoolNets = list(summarize_address_range(v6PoolStart, v6PoolStop))
-                for client in openvpn['client']:
+                for client in (dict_search('client', openvpn) or []):
                     if client['ipv6_ip']:
                         for v6PoolNet in v6PoolNets:
                             if IPv6Address(client['ipv6_ip'][0]) in v6PoolNet:
-                                print(f'Warning: Client "{client["name"]}" IP {client["ipv6_ip"][0]} is in server IP pool, it is not reserved for this client.',
-                                        file=stderr)
+                                print(f'Warning: Client "{client["name"]}" IP {client["ipv6_ip"][0]} is in server IP pool, it is not reserved for this client.')
 
         else:
-            if openvpn['server_ipv6_push_route']:
-                raise ConfigError('IPv6 push-route requires an IPv6 server subnet')
-
-            for client in openvpn ['client']:
-                if client['ipv6_ip']:
-                    raise ConfigError(f'Server client "{client["name"]}" IPv6 IP requires an IPv6 server subnet')
-                if client['ipv6_push_route']:
-                    raise ConfigError(f'Server client "{client["name"]} IPv6 push-route requires an IPv6 server subnet"')
-                if client['ipv6_subnet']:
-                    raise ConfigError(f'Server client "{client["name"]} IPv6 subnet requires an IPv6 server subnet"')
+            for route in (dict_search('server.push_route', openvpn) or []):
+                if is_ipv6(route):
+                    raise ConfigError('IPv6 push-route requires an IPv6 server subnet')
+
+            #for client in openvpn ['client']:
+            #    if client['ipv6_ip']:
+            #        raise ConfigError(f'Server client "{client["name"]}" IPv6 IP requires an IPv6 server subnet')
+            #    if client['ipv6_push_route']:
+            #        raise ConfigError(f'Server client "{client["name"]} IPv6 push-route requires an IPv6 server subnet"')
+            #    if client['ipv6_subnet']:
+            #        raise ConfigError(f'Server client "{client["name"]} IPv6 subnet requires an IPv6 server subnet"')
 
     else:
         # checks for both client and site-to-site go here
-        if openvpn['server_reject_unconfigured']:
-            raise ConfigError('reject-unconfigured-clients is only supported in OpenVPN server mode')
-
-        if openvpn['server_topology']:
-            raise ConfigError('The "topology" option is only valid in server mode')
+        if dict_search('server.reject_unconfigured_clients', openvpn):
+            raise ConfigError('Option reject-unconfigured-clients only supported in server mode')
 
-        if (not openvpn['remote_host']) and openvpn['redirect_gateway']:
+        if 'replace_default_route' in openvpn and 'remote_host' not in openvpn:
             raise ConfigError('Cannot set "replace-default-route" without "remote-host"')
 
     #
@@ -849,133 +338,132 @@ def verify(openvpn):
     #
 
     # verify specified IP address is present on any interface on this system
-    if openvpn['local_host']:
+    if 'local_host' in openvpn:
         if not is_addr_assigned(openvpn['local_host']):
-            raise ConfigError('No interface on system with specified local-host IP address: {}'.format(openvpn['local_host']))
+            raise ConfigError('local-host IP address "{local_host}" not assigned' \
+                              ' to any interface'.format(**openvpn))
 
     # TCP active
     if openvpn['protocol'] == 'tcp-active':
-        if openvpn['local_port']:
+        if 'local_port' in openvpn:
             raise ConfigError('Cannot specify "local-port" with "tcp-active"')
 
-        if not openvpn['remote_host']:
+        if 'remote_host' in openvpn:
             raise ConfigError('Must specify "remote-host" with "tcp-active"')
 
     # shared secret and TLS
-    if not (openvpn['shared_secret_file'] or openvpn['tls']):
+    if not ('shared_secret_key_file' in openvpn or 'tls' in openvpn):
         raise ConfigError('Must specify one of "shared-secret-key-file" and "tls"')
 
-    if openvpn['shared_secret_file'] and openvpn['tls']:
+    if {'shared_secret_key_file', 'tls'} <= set(openvpn):
         raise ConfigError('Can only specify one of "shared-secret-key-file" and "tls"')
 
     if openvpn['mode'] in ['client', 'server']:
-        if not openvpn['tls']:
-            raise ConfigError('Must specify "tls" in client-server mode')
+        if 'tls' not in openvpn:
+            raise ConfigError('Must specify "tls" for server and client mode')
 
     #
     # TLS/encryption
     #
-    if openvpn['shared_secret_file']:
-        if openvpn['encryption'] in ['aes128gcm', 'aes192gcm', 'aes256gcm']:
-            raise ConfigError('GCM encryption with shared-secret-key-file is not supported')
+    if 'shared_secret_key_file' in openvpn:
+        if dict_search('encryption.cipher', openvpn) in ['aes128gcm', 'aes192gcm', 'aes256gcm']:
+            raise ConfigError('GCM encryption with shared-secret-key-file not supported')
 
-        if not checkCertHeader('-----BEGIN OpenVPN Static key V1-----', openvpn['shared_secret_file']):
-            raise ConfigError('Specified shared-secret-key-file "{}" is not valid'.format(openvpn['shared_secret_file']))
+        file = dict_search('shared_secret_key_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN OpenVPN Static key V1-----', file):
+            raise ConfigError(f'Specified shared-secret-key-file "{file}" is not valid')
 
-    if openvpn['tls']:
-        if not openvpn['tls_ca_cert']:
+    if 'tls' in openvpn:
+        if 'ca_cert_file' not in openvpn['tls']:
             raise ConfigError('Must specify "tls ca-cert-file"')
 
-        if not (openvpn['mode'] == 'client' and openvpn['auth']):
-            if not openvpn['tls_cert']:
-                raise ConfigError('Must specify "tls cert-file"')
+        if not (openvpn['mode'] == 'client' and 'auth_file' in openvpn['tls']):
+            if 'cert_file' not in openvpn['tls']:
+                raise ConfigError('Missing "tls cert-file"')
 
-            if not openvpn['tls_key']:
-                raise ConfigError('Must specify "tls key-file"')
+            if 'key_file' not in openvpn['tls']:
+                raise ConfigError('Missing "tls key-file"')
 
-        if openvpn['tls_auth'] and openvpn['tls_crypt']:
+        if {'auth_file', 'crypt_file'} <= set(openvpn['tls']):
             raise ConfigError('TLS auth and crypt are mutually exclusive')
 
-        if not checkCertHeader('-----BEGIN CERTIFICATE-----', openvpn['tls_ca_cert']):
-            raise ConfigError('Specified ca-cert-file "{}" is invalid'.format(openvpn['tls_ca_cert']))
+        file = dict_search('tls.ca_cert_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN CERTIFICATE-----', file):
+            raise ConfigError(f'Specified ca-cert-file "{file}" is invalid')
 
-        if openvpn['tls_auth']:
-            if not checkCertHeader('-----BEGIN OpenVPN Static key V1-----', openvpn['tls_auth']):
-                raise ConfigError('Specified auth-file "{}" is invalid'.format(openvpn['tls_auth']))
+        file = dict_search('tls.auth_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN OpenVPN Static key V1-----', file):
+            raise ConfigError(f'Specified auth-file "{file}" is invalid')
 
-        if openvpn['tls_cert']:
-            if not checkCertHeader('-----BEGIN CERTIFICATE-----', openvpn['tls_cert']):
-                raise ConfigError('Specified cert-file "{}" is invalid'.format(openvpn['tls_cert']))
+        file = dict_search('tls.cert_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN CERTIFICATE-----', file):
+            raise ConfigError(f'Specified cert-file "{file}" is invalid')
 
-        if openvpn['tls_key']:
-            if not checkCertHeader('-----BEGIN (?:RSA |EC )?PRIVATE KEY-----', openvpn['tls_key']):
-                raise ConfigError('Specified key-file "{}" is not valid'.format(openvpn['tls_key']))
+        file = dict_search('tls.key_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN (?:RSA |EC )?PRIVATE KEY-----', file):
+            raise ConfigError(f'Specified key-file "{file}" is not valid')
 
-        if openvpn['tls_crypt']:
-            if not checkCertHeader('-----BEGIN OpenVPN Static key V1-----', openvpn['tls_crypt']):
-                raise ConfigError('Specified TLS crypt-file "{}" is invalid'.format(openvpn['tls_crypt']))
+        file = dict_search('tls.crypt_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN OpenVPN Static key V1-----', file):
+            raise ConfigError(f'Specified TLS crypt-file "{file}" is invalid')
 
-        if openvpn['tls_crl']:
-            if not checkCertHeader('-----BEGIN X509 CRL-----', openvpn['tls_crl']):
-                raise ConfigError('Specified crl-file "{} not valid'.format(openvpn['tls_crl']))
+        file = dict_search('tls.crl_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN X509 CRL-----', file):
+            raise ConfigError(f'Specified crl-file "{file} not valid')
 
-        if openvpn['tls_dh'] and openvpn['tls_dh'] != 'none':
-            if not checkCertHeader('-----BEGIN DH PARAMETERS-----', openvpn['tls_dh']):
-                raise ConfigError('Specified dh-file "{}" is not valid'.format(openvpn['tls_dh']))
+        file = dict_search('tls.dh_file', openvpn)
+        if file and not checkCertHeader('-----BEGIN DH PARAMETERS-----', file):
+            raise ConfigError(f'Specified dh-file "{file}" is not valid')
 
-        if openvpn['tls_role']:
+        tmp = dict_search('tls.role', openvpn)
+        if tmp:
             if openvpn['mode'] in ['client', 'server']:
-                if not openvpn['tls_auth']:
+                if not dict_search('tls.auth_file', openvpn):
                     raise ConfigError('Cannot specify "tls role" in client-server mode')
 
-            if openvpn['tls_role'] == 'active':
+            if tmp == 'active':
                 if openvpn['protocol'] == 'tcp-passive':
                     raise ConfigError('Cannot specify "tcp-passive" when "tls role" is "active"')
 
-                if openvpn['tls_dh'] and openvpn['tls_dh'] != 'none':
+                if dict_search('tls.dh_file', openvpn):
                     raise ConfigError('Cannot specify "tls dh-file" when "tls role" is "active"')
 
-            elif openvpn['tls_role'] == 'passive':
+            elif tmp == 'passive':
                 if openvpn['protocol'] == 'tcp-active':
                     raise ConfigError('Cannot specify "tcp-active" when "tls role" is "passive"')
 
-                if not openvpn['tls_dh']:
+                if not dict_search('tls.dh_file', openvpn):
                     raise ConfigError('Must specify "tls dh-file" when "tls role" is "passive"')
 
-        if openvpn['tls_key'] and checkCertHeader('-----BEGIN EC PRIVATE KEY-----', openvpn['tls_key']):
-            if openvpn['tls_dh'] and openvpn['tls_dh'] != 'none':
-                print('Warning: using dh-file and EC keys simultaneously will lead to DH ciphers being used instead of ECDH')
-            else:
-                print('Diffie-Hellman prime file is unspecified, assuming ECDH')
+        file = dict_search('tls.key_file', openvpn)
+        if file and checkCertHeader('-----BEGIN EC PRIVATE KEY-----', file):
+            if dict_search('tls.dh_file', openvpn):
+                print('Warning: using dh-file and EC keys simultaneously will ' \
+                      'lead to DH ciphers being used instead of ECDH')
 
-    if openvpn['encryption'] == 'none':
-        print('Warning: "encryption none" was specified. NO encryption will be performed and tunnelled data WILL be transmitted in clear text over the network!')
+    if dict_search('encryption.cipher', openvpn) == 'none':
+        print('Warning: "encryption none" was specified!')
+        print('No encryption will be performed and data is transmitted in ' \
+              'plain text over the network!')
 
     #
     # Auth user/pass
     #
-    if openvpn['auth']:
-        if not openvpn['auth_user']:
-            raise ConfigError('Username for authentication is missing')
-
-        if not openvpn['auth_pass']:
+    if (dict_search('authentication.username', openvpn) and not
+        dict_search('authentication.password', openvpn)):
             raise ConfigError('Password for authentication is missing')
 
-    if openvpn['vrf']:
-        if openvpn['vrf'] not in interfaces():
-            raise ConfigError(f'VRF "{openvpn["vrf"]}" does not exist')
+    if (dict_search('authentication.password', openvpn) and not
+        dict_search('authentication.username', openvpn)):
+            raise ConfigError('Username for authentication is missing')
 
-        if openvpn['is_bridge_member']:
-            raise ConfigError((
-                f'Interface "{openvpn["intf"]}" cannot be member of VRF '
-                f'"{openvpn["vrf"]}" and bridge "{openvpn["is_bridge_member"]}" '
-                f'at the same time!'))
+    verify_vrf(openvpn)
 
     return None
 
 def generate(openvpn):
-    interface = openvpn['intf']
-    directory = os.path.dirname(get_config_name(interface))
+    interface = openvpn['ifname']
+    directory = os.path.dirname(cfg_file.format(**openvpn))
 
     # we can't know in advance which clients have been removed,
     # thus all client configs will be removed and re-added on demand
@@ -983,7 +471,7 @@ def generate(openvpn):
     if os.path.isdir(ccd_dir):
         rmtree(ccd_dir, ignore_errors=True)
 
-    if openvpn['deleted'] or openvpn['disable']:
+    if 'deleted' in openvpn or 'disable' in openvpn:
         return None
 
     # create config directory on demand
@@ -997,11 +485,15 @@ def generate(openvpn):
 
     # Fix file permissons for keys
     fix_permissions = []
-    fix_permissions.append(openvpn['shared_secret_file'])
-    fix_permissions.append(openvpn['tls_key'])
+
+    tmp = dict_search('shared_secret_key_file', openvpn)
+    if tmp: fix_permissions.append(openvpn['shared_secret_key_file'])
+
+    tmp = dict_search('tls.key_file', openvpn)
+    if tmp: fix_permissions.append(tmp)
 
     # Generate User/Password authentication file
-    if openvpn['auth']:
+    if 'auth' in openvpn:
         with open(openvpn['auth_user_pass_file'], 'w') as f:
             f.write('{}\n{}'.format(openvpn['auth_user'], openvpn['auth_pass']))
         # also change permission on auth file
@@ -1013,16 +505,20 @@ def generate(openvpn):
             os.remove(openvpn['auth_user_pass_file'])
 
     # Generate client specific configuration
-    for client in openvpn['client']:
-        client_file = os.path.join(ccd_dir, client['name'])
-        render(client_file, 'openvpn/client.conf.tmpl', client)
-        chown(client_file, user, group)
+    if dict_search('server.client', openvpn):
+        for client, client_config in dict_search('server.client', openvpn).items():
+            client_file = os.path.join(ccd_dir, client)
+
+            # Our client need's to know its subnet mask ...
+            client_config['subnet'] = dict_search('server.subnet_v4', openvpn)
+            render(client_file, 'openvpn/client.conf.tmpl', client_config,
+                   trim_blocks=True, user=user, group=group)
 
     # we need to support quoting of raw parameters from OpenVPN CLI
     # see https://phabricator.vyos.net/T1632
-    render(get_config_name(interface), 'openvpn/server.conf.tmpl', openvpn,
-           formater=lambda _: _.replace("&quot;", '"'))
-    chown(get_config_name(interface), user, group)
+    render(cfg_file.format(**openvpn), 'openvpn/server.conf.tmpl', openvpn,
+           trim_blocks=True, formater=lambda _: _.replace("&quot;", '"'),
+           user=user, group=group)
 
     # Fixup file permissions
     for file in fix_permissions:
@@ -1031,75 +527,34 @@ def generate(openvpn):
     return None
 
 def apply(openvpn):
-    interface = openvpn['intf']
+    interface = openvpn['ifname']
     call(f'systemctl stop openvpn@{interface}.service')
 
-    # On configuration change we need to wait for the 'old' interface to
-    # vanish from the Kernel, if it is not gone, OpenVPN will report:
-    # ERROR: Cannot ioctl TUNSETIFF vtun10: Device or resource busy (errno=16)
-    if interface in interfaces():
-        cmd(f'sudo ip link del {interface}')
-
     # Do some cleanup when OpenVPN is disabled/deleted
-    if openvpn['deleted'] or openvpn['disable']:
+    if 'deleted' in openvpn or 'disable' in openvpn:
         # cleanup old configuration files
         cleanup = []
-        cleanup.append(get_config_name(interface))
+        cleanup.append(cfg_file.format(**openvpn))
         cleanup.append(openvpn['auth_user_pass_file'])
 
         for file in cleanup:
             if os.path.isfile(file):
                 os.unlink(file)
 
+        if interface in interfaces():
+            VTunIf(interface).remove()
+
         return None
 
     # No matching OpenVPN process running - maybe it got killed or none
     # existed - nevertheless, spawn new OpenVPN process
     call(f'systemctl start openvpn@{interface}.service')
 
-    if interface not in interfaces():
-        try:
-            dev_type = openvpn['type']
-            cmd(f'sudo openvpn --mktun --dev-type {dev_type} --dev {interface}')
-        except:
-            pass
-
-    # we need to catch the exception if the interface is not up due to
-    # reason stated above
-    o = VTunIf(interface)
-    # update interface description used e.g. within SNMP
-    o.set_alias(openvpn['description'])
-    # IPv6 accept RA
-    o.set_ipv6_accept_ra(openvpn['ipv6_accept_ra'])
-    # IPv6 address autoconfiguration
-    o.set_ipv6_autoconf(openvpn['ipv6_autoconf'])
-    # IPv6 forwarding
-    o.set_ipv6_forwarding(openvpn['ipv6_forwarding'])
-    # IPv6 Duplicate Address Detection (DAD) tries
-    o.set_ipv6_dad_messages(openvpn['ipv6_dup_addr_detect'])
-
-    # IPv6 EUI-based addresses - only in TAP mode (TUN's have no MAC)
-    # If MAC has changed, old EUI64 addresses won't get deleted,
-    # but this isn't easy to solve, so leave them.
-    # This is even more difficult as openvpn uses a random MAC for the
-    # initial interface creation, unless set by 'lladdr'.
-    # NOTE: right now the interface is always deleted. For future
-    # compatibility when tap's are not deleted, leave the del_ in
-    if openvpn['mode'] == 'tap':
-        for addr in openvpn['ipv6_eui64_prefix_remove']:
-            o.del_ipv6_eui64_address(addr)
-        for addr in openvpn['ipv6_eui64_prefix']:
-            o.add_ipv6_eui64_address(addr)
-
-    # assign/remove VRF (ONLY when not a member of a bridge,
-    # otherwise 'nomaster' removes it from it)
-    if not openvpn['is_bridge_member']:
-        o.set_vrf(openvpn['vrf'])
-
-    # TAP interface needs to be brought up explicitly
-    if openvpn['type'] == 'tap':
-        if not openvpn['disable']:
-            VTunIf(interface).set_admin_state('up')
+    conf = VTunIf.get_config()
+    conf['device_type'] = openvpn['device_type']
+
+    o = VTunIf(interface, **conf)
+    o.update(openvpn)
 
     return None