6 files changed, 27 insertions, 27 deletions

diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index 2187b3c73..d0c2dd252 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -23,7 +23,7 @@ from vyos.configdict import dict_merge
 from vyos.hostsd_client import Client as hostsd_client
 from vyos.util import call
 from vyos.util import chown
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos.template import render
 from vyos.xml import defaults
 from vyos.validate import is_ipv6
@@ -94,7 +94,7 @@ def verify(dns):
     if 'allow_from' not in dns:
         raise ConfigError('DNS forwarding requires an allow-from network')
 
-    # we can not use vyos_dict_search() when testing for domain servers
+    # we can not use dict_search() when testing for domain servers
     # as a domain will contains dot's which is out dictionary delimiter.
     if 'domain' in dns:
         for domain in dns['domain']:
diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index ea9bd54d4..1a549f27d 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -33,7 +33,7 @@ from vyos.configverify import verify_vlan_config
 from vyos.configverify import verify_vrf
 from vyos.ifconfig import BondIf
 from vyos.ifconfig import Section
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos.validate import has_address_configured
 from vyos import ConfigError
 from vyos import airbag
@@ -101,7 +101,7 @@ def get_config(config=None):
         # also present the interfaces to be removed from the bond as dictionary
         bond['member'].update({'interface_remove': tmp})
 
-    if vyos_dict_search('member.interface', bond):
+    if dict_search('member.interface', bond):
         for interface, interface_config in bond['member']['interface'].items():
             # Check if member interface is already member of another bridge
             tmp = is_member(conf, interface, 'bridge')
@@ -151,7 +151,7 @@ def verify(bond):
     verify_vlan_config(bond)
 
     bond_name = bond['ifname']
-    if vyos_dict_search('member.interface', bond):
+    if dict_search('member.interface', bond):
         for interface, interface_config in bond['member']['interface'].items():
             error_msg = f'Can not add interface "{interface}" to bond, '
 
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 4aeb8fc67..258f9ec79 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -32,7 +32,7 @@ from vyos.validate import has_address_configured
 from vyos.xml import defaults
 
 from vyos.util import cmd
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos import ConfigError
 
 from vyos import airbag
@@ -58,7 +58,7 @@ def get_config(config=None):
         else:
             bridge.update({'member': {'interface_remove': tmp }})
 
-    if vyos_dict_search('member.interface', bridge):
+    if dict_search('member.interface', bridge):
         # XXX: T2665: we need a copy of the dict keys for iteration, else we will get:
         # RuntimeError: dictionary changed size during iteration
         for interface in list(bridge['member']['interface']):
@@ -100,7 +100,7 @@ def verify(bridge):
     verify_dhcpv6(bridge)
     verify_vrf(bridge)
 
-    if vyos_dict_search('member.interface', bridge):
+    if dict_search('member.interface', bridge):
         for interface, interface_config in bridge['member']['interface'].items():
             error_msg = f'Can not add interface "{interface}" to bridge, '
 
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index c1770771e..a18a21b83 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -32,7 +32,7 @@ from vyos.configverify import verify_vrf
 from vyos.ifconfig import WiFiIf
 from vyos.template import render
 from vyos.util import call
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -80,13 +80,13 @@ def get_config(config=None):
     # Cleanup "delete" default values when required user selectable values are
     # not defined at all
     tmp = conf.get_config_dict([], key_mangling=('-', '_'), get_first_key=True)
-    if not (vyos_dict_search('security.wpa.passphrase', tmp) or
-            vyos_dict_search('security.wpa.radius', tmp)):
+    if not (dict_search('security.wpa.passphrase', tmp) or
+            dict_search('security.wpa.radius', tmp)):
         del wifi['security']['wpa']
 
     # defaults include RADIUS server specifics per TAG node which need to be
     # added to individual RADIUS servers instead - so we can simply delete them
-    if vyos_dict_search('security.wpa.radius.server.port', wifi):
+    if dict_search('security.wpa.radius.server.port', wifi):
         del wifi['security']['wpa']['radius']['server']['port']
         if not len(wifi['security']['wpa']['radius']['server']):
             del wifi['security']['wpa']['radius']
@@ -119,10 +119,10 @@ def get_config(config=None):
     if tmp: wifi['station_interfaces'] = tmp
 
     # Add individual RADIUS server default values
-    if vyos_dict_search('security.wpa.radius.server', wifi):
+    if dict_search('security.wpa.radius.server', wifi):
         default_values = defaults(base + ['security', 'wpa', 'radius', 'server'])
 
-        for server in vyos_dict_search('security.wpa.radius.server', wifi):
+        for server in dict_search('security.wpa.radius.server', wifi):
             wifi['security']['wpa']['radius']['server'][server] = dict_merge(
                 default_values, wifi['security']['wpa']['radius']['server'][server])
 
@@ -241,7 +241,7 @@ def generate(wifi):
             wifi['mac'] = str(mac)
 
     # XXX: Jinja2 can not operate on a dictionary key when it starts of with a number
-    if '40mhz_incapable' in (vyos_dict_search('capabilities.ht', wifi) or []):
+    if '40mhz_incapable' in (dict_search('capabilities.ht', wifi) or []):
         wifi['capabilities']['ht']['fourtymhz_incapable'] = wifi['capabilities']['ht']['40mhz_incapable']
         del wifi['capabilities']['ht']['40mhz_incapable']
 
diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index a520120f8..2260b3fe1 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -23,7 +23,7 @@ from vyos.configdict import get_accel_dict
 from vyos.configverify import verify_accel_ppp_base_service
 from vyos.template import render
 from vyos.util import call
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -57,13 +57,13 @@ def verify(pppoe):
         raise ConfigError('At least one listen interface must be defined!')
 
     # local ippool and gateway settings config checks
-    if not (vyos_dict_search('client_ip_pool.subnet', pppoe) or
-           (vyos_dict_search('client_ip_pool.start', pppoe) and
-            vyos_dict_search('client_ip_pool.stop', pppoe))):
+    if not (dict_search('client_ip_pool.subnet', pppoe) or
+           (dict_search('client_ip_pool.start', pppoe) and
+            dict_search('client_ip_pool.stop', pppoe))):
         print('Warning: No PPPoE client pool defined')
 
-    if vyos_dict_search('authentication.radius.dynamic_author.server', pppoe):
-        if not vyos_dict_search('authentication.radius.dynamic_author.key', pppoe):
+    if dict_search('authentication.radius.dynamic_author.server', pppoe):
+        if not dict_search('authentication.radius.dynamic_author.key', pppoe):
             raise ConfigError('DA/CoE server key required!')
 
     return None
@@ -75,7 +75,7 @@ def generate(pppoe):
 
     render(pppoe_conf, 'accel-ppp/pppoe.config.tmpl', pppoe, trim_blocks=True)
 
-    if vyos_dict_search('authentication.mode', pppoe) == 'local':
+    if dict_search('authentication.mode', pppoe) == 'local':
         render(pppoe_chap_secrets, 'accel-ppp/chap-secrets.config_dict.tmpl',
                pppoe, trim_blocks=True, permission=0o640)
     else:
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index 2597ba42f..1b2b80ce5 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -23,7 +23,7 @@ from vyos.configdict import get_accel_dict
 from vyos.configverify import verify_accel_ppp_base_service
 from vyos.template import render
 from vyos.util import call
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -56,21 +56,21 @@ def verify(sstp):
     #
     # SSL certificate checks
     #
-    tmp = vyos_dict_search('ssl.ca_cert_file', sstp)
+    tmp = dict_search('ssl.ca_cert_file', sstp)
     if not tmp:
         raise ConfigError(f'SSL CA certificate file required!')
     else:
         if not os.path.isfile(tmp):
             raise ConfigError(f'SSL CA certificate "{tmp}" does not exist!')
 
-    tmp = vyos_dict_search('ssl.cert_file', sstp)
+    tmp = dict_search('ssl.cert_file', sstp)
     if not tmp:
         raise ConfigError(f'SSL public key file required!')
     else:
         if not os.path.isfile(tmp):
             raise ConfigError(f'SSL public key "{tmp}" does not exist!')
 
-    tmp = vyos_dict_search('ssl.key_file', sstp)
+    tmp = dict_search('ssl.key_file', sstp)
     if not tmp:
         raise ConfigError(f'SSL private key file required!')
     else:
@@ -84,7 +84,7 @@ def generate(sstp):
     # accel-cmd reload doesn't work so any change results in a restart of the daemon
     render(sstp_conf, 'accel-ppp/sstp.config.tmpl', sstp, trim_blocks=True)
 
-    if vyos_dict_search('authentication.mode', sstp) == 'local':
+    if dict_search('authentication.mode', sstp) == 'local':
         render(sstp_chap_secrets, 'accel-ppp/chap-secrets.config_dict.tmpl',
                sstp, trim_blocks=True, permission=0o640)
     else: