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

2 files changed, 12 insertions, 12 deletions

diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index c6bb5bd1a..7dc92feb5 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -22,7 +22,7 @@ from vyos.configsession import ConfigSession
 from vyos.ifconfig import Interface
 from vyos.util import read_file
 from vyos.util import cmd
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 from vyos.validate import is_intf_addr_assigned, is_ipv6_link_local
 
 class BasicInterfaceTest:
@@ -219,7 +219,7 @@ class BasicInterfaceTest:
             for interface in self._interfaces:
                 for vif_s in self._qinq_range:
                     tmp = json.loads(cmd(f'ip -d -j link show dev {interface}.{vif_s}'))[0]
-                    self.assertEqual(vyos_dict_search('linkinfo.info_data.protocol', tmp), '802.1ad')
+                    self.assertEqual(dict_search('linkinfo.info_data.protocol', tmp), '802.1ad')
 
                     for vif_c in self._vlan_range:
                         vif = f'{interface}.{vif_s}.{vif_c}'
diff --git a/smoketest/scripts/cli/test_nat.py b/smoketest/scripts/cli/test_nat.py
index b5bde743b..43392bde3 100755
--- a/smoketest/scripts/cli/test_nat.py
+++ b/smoketest/scripts/cli/test_nat.py
@@ -22,7 +22,7 @@ import unittest
 from vyos.configsession import ConfigSession
 from vyos.configsession import ConfigSessionError
 from vyos.util import cmd
-from vyos.util import vyos_dict_search
+from vyos.util import dict_search
 
 base_path = ['nat']
 src_path = base_path + ['source']
@@ -73,10 +73,10 @@ class TestNAT(unittest.TestCase):
             self.assertEqual(data['family'], 'ip')
             self.assertEqual(data['table'], 'nat')
 
-            iface = vyos_dict_search('match.right', data['expr'][0])
-            direction = vyos_dict_search('match.left.payload.field', data['expr'][1])
-            address = vyos_dict_search('match.right.prefix.addr', data['expr'][1])
-            mask = vyos_dict_search('match.right.prefix.len', data['expr'][1])
+            iface = dict_search('match.right', data['expr'][0])
+            direction = dict_search('match.left.payload.field', data['expr'][1])
+            address = dict_search('match.right.prefix.addr', data['expr'][1])
+            mask = dict_search('match.right.prefix.len', data['expr'][1])
 
             if int(rule) < 200:
                 self.assertEqual(direction, 'saddr')
@@ -127,11 +127,11 @@ class TestNAT(unittest.TestCase):
             self.assertEqual(data['family'], 'ip')
             self.assertEqual(data['table'], 'nat')
 
-            iface = vyos_dict_search('match.right', data['expr'][0])
-            direction = vyos_dict_search('match.left.payload.field', data['expr'][1])
-            protocol = vyos_dict_search('match.left.payload.protocol', data['expr'][1])
-            dnat_addr = vyos_dict_search('dnat.addr', data['expr'][3])
-            dnat_port = vyos_dict_search('dnat.port', data['expr'][3])
+            iface = dict_search('match.right', data['expr'][0])
+            direction = dict_search('match.left.payload.field', data['expr'][1])
+            protocol = dict_search('match.left.payload.protocol', data['expr'][1])
+            dnat_addr = dict_search('dnat.addr', data['expr'][3])
+            dnat_port = dict_search('dnat.port', data['expr'][3])
 
             self.assertEqual(direction, 'sport')
             self.assertEqual(dnat_addr, '192.0.2.1')