T2755: convert jmespath.search() to vyos_dict_search() for performance

1 files changed, 17 insertions, 16 deletions

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 537c4bc2d..67ba973c4 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -34,6 +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.validate import is_ipv4
 from vyos.validate import is_ipv6
 from vyos.validate import is_intf_addr_assigned
@@ -824,7 +825,7 @@ class Interface(Control):
         lease_file = f'{config_base}_{ifname}.leases'
 
         if enable and 'disable' not in self._config:
-            if jmespath.search('dhcp_options.host_name', self._config) == None:
+            if vyos_dict_search('dhcp_options.host_name', self._config) == None:
                 # read configured system hostname.
                 # maybe change to vyos hostd client ???
                 hostname = 'vyos'
@@ -907,7 +908,7 @@ class Interface(Control):
 
         # always ensure DHCPv6 client is stopped (when not configured as client
         # for IPv6 address or prefix delegation
-        dhcpv6pd = jmespath.search('dhcpv6_options.pd', config)
+        dhcpv6pd = vyos_dict_search('dhcpv6_options.pd', config)
         if 'dhcpv6' not in new_addr or dhcpv6pd == None:
             self.del_addr('dhcpv6')
 
@@ -935,59 +936,59 @@ class Interface(Control):
             self.set_vrf(config.get('vrf', ''))
 
         # Configure ARP cache timeout in milliseconds - has default value
-        tmp = jmespath.search('ip.arp_cache_timeout', config)
+        tmp = vyos_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 = jmespath.search('ip.disable_arp_filter', config)
+        tmp = vyos_dict_search('ip.disable_arp_filter', config)
         value = '0' if (tmp != None) else '1'
         self.set_arp_filter(value)
 
         # Configure ARP accept
-        tmp = jmespath.search('ip.enable_arp_accept', config)
+        tmp = vyos_dict_search('ip.enable_arp_accept', config)
         value = '1' if (tmp != None) else '0'
         self.set_arp_accept(value)
 
         # Configure ARP announce
-        tmp = jmespath.search('ip.enable_arp_announce', config)
+        tmp = vyos_dict_search('ip.enable_arp_announce', config)
         value = '1' if (tmp != None) else '0'
         self.set_arp_announce(value)
 
         # Configure ARP ignore
-        tmp = jmespath.search('ip.enable_arp_ignore', config)
+        tmp = vyos_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 = jmespath.search('ip.enable_proxy_arp', config)
+        tmp = vyos_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 = jmespath.search('ip.proxy_arp_pvlan', config)
+        tmp = vyos_dict_search('ip.proxy_arp_pvlan', config)
         value = '1' if (tmp != None) else '0'
         self.set_proxy_arp_pvlan(value)
 
         # IPv6 forwarding
-        tmp = jmespath.search('ipv6.disable_forwarding', config)
+        tmp = vyos_dict_search('ipv6.disable_forwarding', config)
         value = '0' if (tmp != None) else '1'
         self.set_ipv6_forwarding(value)
 
         # IPv6 router advertisements
-        tmp = jmespath.search('ipv6.address.autoconf', config)
+        tmp = vyos_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 = jmespath.search('ipv6.address.autoconf', config)
+        tmp = vyos_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 = jmespath.search('ipv6.dup_addr_detect_transmits', config)
+        tmp = vyos_dict_search('ipv6.dup_addr_detect_transmits', config)
         value = tmp if (tmp != None) else '1'
         self.set_ipv6_dad_messages(value)
 
@@ -996,7 +997,7 @@ class Interface(Control):
             self.set_mtu(config.get('mtu'))
 
         # Delete old IPv6 EUI64 addresses before changing MAC
-        tmp = jmespath.search('ipv6.address.eui64_old', config)
+        tmp = vyos_dict_search('ipv6.address.eui64_old', config)
         if tmp:
             for addr in tmp:
                 self.del_ipv6_eui64_address(addr)
@@ -1011,7 +1012,7 @@ class Interface(Control):
                 self.set_mac(mac)
 
         # Manage IPv6 link-local addresses
-        tmp = jmespath.search('ipv6.address.no_default_link_local', config)
+        tmp = vyos_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:
@@ -1020,7 +1021,7 @@ class Interface(Control):
             self.add_ipv6_eui64_address('fe80::/64')
 
         # Add IPv6 EUI-based addresses
-        tmp = jmespath.search('ipv6.address.eui64', config)
+        tmp = vyos_dict_search('ipv6.address.eui64', config)
         if tmp:
             # XXX: T2636 workaround: convert string to a list with one element
             if isinstance(tmp, str):