vyos.util: T2995: rename vyos_dict_search() -> dict_search()

Renamed using snippet below:
----------------------------

  for file in $(find . -name "*.py")
  do
    sed -i "s/vyos_dict_search/dict_search/" $file
  done

4 files changed, 32 insertions, 32 deletions

diff --git a/python/vyos/ifconfig/bond.py b/python/vyos/ifconfig/bond.py
index 9108fc180..709222b09 100644
--- a/python/vyos/ifconfig/bond.py
+++ b/python/vyos/ifconfig/bond.py
@@ -17,7 +17,7 @@ import os
 
 from vyos.ifconfig.interface import Interface
 from vyos.util import cmd
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos.validate import assert_list
 from vyos.validate import assert_positive
 
@@ -360,7 +360,7 @@ class BondIf(Interface):
             self.set_arp_ip_target('-' + addr)
 
         # Add configured ARP target addresses
-        value = vyos_dict_search('arp_monitor.target', config)
+        value = dict_search('arp_monitor.target', config)
         if isinstance(value, str):
             value = [value]
         if value:
@@ -384,7 +384,7 @@ class BondIf(Interface):
                 # Removing an interface from a bond will always place the underlaying
                 # physical interface in admin-down state! If physical interface is
                 # not disabled, re-enable it.
-                if not vyos_dict_search(f'member.interface_remove.{interface}.disable', config):
+                if not dict_search(f'member.interface_remove.{interface}.disable', config):
                     Interface(interface).set_admin_state('up')
 
             # Bonding policy/mode
@@ -392,7 +392,7 @@ class BondIf(Interface):
             if value: self.set_mode(value)
 
             # Add (enslave) interfaces to bond
-            value = vyos_dict_search('member.interface', config)
+            value = dict_search('member.interface', config)
             for interface in (value or []):
                 # if we've come here we already verified the interface
                 # does not have an addresses configured so just flush
diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py
index bf78f8972..f7388b298 100644
--- a/python/vyos/ifconfig/bridge.py
+++ b/python/vyos/ifconfig/bridge.py
@@ -19,7 +19,7 @@ from vyos.ifconfig.interface import Interface
 from vyos.validate import assert_boolean
 from vyos.validate import assert_positive
 from vyos.util import cmd
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 
 @Interface.register
 class BridgeIf(Interface):
@@ -223,17 +223,17 @@ class BridgeIf(Interface):
         self.set_stp(value)
 
         # enable or disable IGMP querier
-        tmp = vyos_dict_search('igmp.querier', config)
+        tmp = dict_search('igmp.querier', config)
         value = '1' if (tmp != None) else '0'
         self.set_multicast_querier(value)
 
         # remove interface from bridge
-        tmp = vyos_dict_search('member.interface_remove', config)
+        tmp = dict_search('member.interface_remove', config)
         for member in (tmp or []):
             if member in interfaces():
                 self.del_port(member)
 
-        tmp = vyos_dict_search('member.interface', config)
+        tmp = dict_search('member.interface', config)
         if tmp:
             for interface, interface_config in tmp.items():
                 # if interface does yet not exist bail out early and
diff --git a/python/vyos/ifconfig/ethernet.py b/python/vyos/ifconfig/ethernet.py
index 1d48941f9..12d1ec265 100644
--- a/python/vyos/ifconfig/ethernet.py
+++ b/python/vyos/ifconfig/ethernet.py
@@ -19,7 +19,7 @@ import re
 from vyos.ifconfig.interface import Interface
 from vyos.validate import assert_list
 from vyos.util import run
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 
 @Interface.register
 class EthernetIf(Interface):
@@ -282,27 +282,27 @@ class EthernetIf(Interface):
         self.set_flow_control(value)
 
         # GRO (generic receive offload)
-        tmp = vyos_dict_search('offload_options.generic_receive', config)
+        tmp = dict_search('offload_options.generic_receive', config)
         value = tmp if (tmp != None) else 'off'
         self.set_gro(value)
 
         # GSO (generic segmentation offload)
-        tmp = vyos_dict_search('offload_options.generic_segmentation', config)
+        tmp = dict_search('offload_options.generic_segmentation', config)
         value = tmp if (tmp != None) else 'off'
         self.set_gso(value)
 
         # scatter-gather option
-        tmp = vyos_dict_search('offload_options.scatter_gather', config)
+        tmp = dict_search('offload_options.scatter_gather', config)
         value = tmp if (tmp != None) else 'off'
         self.set_sg(value)
 
         # TSO (TCP segmentation offloading)
-        tmp = vyos_dict_search('offload_options.udp_fragmentation', config)
+        tmp = dict_search('offload_options.udp_fragmentation', config)
         value = tmp if (tmp != None) else 'off'
         self.set_tso(value)
 
         # UDP fragmentation offloading
-        tmp = vyos_dict_search('offload_options.udp_fragmentation', config)
+        tmp = dict_search('offload_options.udp_fragmentation', config)
         value = tmp if (tmp != None) else 'off'
         self.set_ufo(value)
 
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index ae747e87c..894410871 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -34,7 +34,7 @@ from vyos.configdict import list_diff
 from vyos.configdict import dict_merge
 from vyos.template import render
 from vyos.util import mac2eui64
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos.validate import is_ipv4
 from vyos.validate import is_ipv6
 from vyos.validate import is_intf_addr_assigned
@@ -880,7 +880,7 @@ class Interface(Control):
         lease_file = f'{config_base}_{ifname}.leases'
 
         if enable and 'disable' not in self._config:
-            if vyos_dict_search('dhcp_options.host_name', self._config) == None:
+            if dict_search('dhcp_options.host_name', self._config) == None:
                 # read configured system hostname.
                 # maybe change to vyos hostd client ???
                 hostname = 'vyos'
@@ -959,7 +959,7 @@ class Interface(Control):
 
         # always ensure DHCPv6 client is stopped (when not configured as client
         # for IPv6 address or prefix delegation
-        dhcpv6pd = vyos_dict_search('dhcpv6_options.pd', config)
+        dhcpv6pd = dict_search('dhcpv6_options.pd', config)
         if 'dhcpv6' not in new_addr or dhcpv6pd == None:
             self.del_addr('dhcpv6')
 
@@ -987,64 +987,64 @@ class Interface(Control):
             self.set_vrf(config.get('vrf', ''))
 
         # Configure ARP cache timeout in milliseconds - has default value
-        tmp = vyos_dict_search('ip.arp_cache_timeout', config)
+        tmp = dict_search('ip.arp_cache_timeout', config)
         value = tmp if (tmp != None) else '30'
         self.set_arp_cache_tmo(value)
 
         # Configure ARP filter configuration
-        tmp = vyos_dict_search('ip.disable_arp_filter', config)
+        tmp = dict_search('ip.disable_arp_filter', config)
         value = '0' if (tmp != None) else '1'
         self.set_arp_filter(value)
 
         # Configure ARP accept
-        tmp = vyos_dict_search('ip.enable_arp_accept', config)
+        tmp = dict_search('ip.enable_arp_accept', config)
         value = '1' if (tmp != None) else '0'
         self.set_arp_accept(value)
 
         # Configure ARP announce
-        tmp = vyos_dict_search('ip.enable_arp_announce', config)
+        tmp = dict_search('ip.enable_arp_announce', config)
         value = '1' if (tmp != None) else '0'
         self.set_arp_announce(value)
 
         # Configure ARP ignore
-        tmp = vyos_dict_search('ip.enable_arp_ignore', config)
+        tmp = dict_search('ip.enable_arp_ignore', config)
         value = '1' if (tmp != None) else '0'
         self.set_arp_ignore(value)
 
         # Enable proxy-arp on this interface
-        tmp = vyos_dict_search('ip.enable_proxy_arp', config)
+        tmp = dict_search('ip.enable_proxy_arp', config)
         value = '1' if (tmp != None) else '0'
         self.set_proxy_arp(value)
 
         # Enable private VLAN proxy ARP on this interface
-        tmp = vyos_dict_search('ip.proxy_arp_pvlan', config)
+        tmp = dict_search('ip.proxy_arp_pvlan', config)
         value = '1' if (tmp != None) else '0'
         self.set_proxy_arp_pvlan(value)
 
         # IPv4 forwarding
-        tmp = vyos_dict_search('ip.disable_forwarding', config)
+        tmp = dict_search('ip.disable_forwarding', config)
         value = '0' if (tmp != None) else '1'
         self.set_ipv4_forwarding(value)
 
         # IPv6 forwarding
-        tmp = vyos_dict_search('ipv6.disable_forwarding', config)
+        tmp = dict_search('ipv6.disable_forwarding', config)
         value = '0' if (tmp != None) else '1'
         self.set_ipv6_forwarding(value)
 
         # IPv6 router advertisements
-        tmp = vyos_dict_search('ipv6.address.autoconf', config)
+        tmp = dict_search('ipv6.address.autoconf', config)
         value = '2' if (tmp != None) else '1'
         if 'dhcpv6' in new_addr:
             value = '2'
         self.set_ipv6_accept_ra(value)
 
         # IPv6 address autoconfiguration
-        tmp = vyos_dict_search('ipv6.address.autoconf', config)
+        tmp = dict_search('ipv6.address.autoconf', config)
         value = '1' if (tmp != None) else '0'
         self.set_ipv6_autoconf(value)
 
         # IPv6 Duplicate Address Detection (DAD) tries
-        tmp = vyos_dict_search('ipv6.dup_addr_detect_transmits', config)
+        tmp = dict_search('ipv6.dup_addr_detect_transmits', config)
         value = tmp if (tmp != None) else '1'
         self.set_ipv6_dad_messages(value)
 
@@ -1053,7 +1053,7 @@ class Interface(Control):
             self.set_mtu(config.get('mtu'))
 
         # Delete old IPv6 EUI64 addresses before changing MAC
-        tmp = vyos_dict_search('ipv6.address.eui64_old', config)
+        tmp = dict_search('ipv6.address.eui64_old', config)
         if tmp:
             for addr in tmp:
                 self.del_ipv6_eui64_address(addr)
@@ -1068,7 +1068,7 @@ class Interface(Control):
                 self.set_mac(mac)
 
         # Manage IPv6 link-local addresses
-        tmp = vyos_dict_search('ipv6.address.no_default_link_local', config)
+        tmp = dict_search('ipv6.address.no_default_link_local', config)
         # we must check explicitly for None type as if the key is set we will
         # get an empty dict (<class 'dict'>)
         if tmp is not None:
@@ -1077,7 +1077,7 @@ class Interface(Control):
             self.add_ipv6_eui64_address('fe80::/64')
 
         # Add IPv6 EUI-based addresses
-        tmp = vyos_dict_search('ipv6.address.eui64', config)
+        tmp = dict_search('ipv6.address.eui64', config)
         if tmp:
             for addr in tmp:
                 self.add_ipv6_eui64_address(addr)