From 44c1ffe8cd24c006118d07a49e4a25558ee08fe9 Mon Sep 17 00:00:00 2001 From: mikewiebe Date: Mon, 4 Feb 2019 12:58:45 -0500 Subject: [PATCH 1/2] Fix dhcp_relay_global getter --- lib/cisco_node_utils/dhcp_relay_global.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/cisco_node_utils/dhcp_relay_global.rb b/lib/cisco_node_utils/dhcp_relay_global.rb index 89017a7c..ec0f91a5 100644 --- a/lib/cisco_node_utils/dhcp_relay_global.rb +++ b/lib/cisco_node_utils/dhcp_relay_global.rb @@ -207,10 +207,7 @@ def default_ipv4_sub_option_circuit_id_custom def ipv4_sub_option_circuit_id_string str = config_get('dhcp_relay_global', 'ipv4_sub_option_circuit_id_string') # Normalize by removing white space and add quotes - if str - str.strip! - str = Utils.add_quotes(str) - end + str.strip! if str.kind_of?(String) str end From a8ff3e03bc55fff163f31a5cf248696bc1feadaa Mon Sep 17 00:00:00 2001 From: Mike Wiebe Date: Mon, 4 Feb 2019 13:47:37 -0500 Subject: [PATCH 2/2] Remove unneeded comment --- lib/cisco_node_utils/dhcp_relay_global.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/cisco_node_utils/dhcp_relay_global.rb b/lib/cisco_node_utils/dhcp_relay_global.rb index ec0f91a5..e5fb8365 100644 --- a/lib/cisco_node_utils/dhcp_relay_global.rb +++ b/lib/cisco_node_utils/dhcp_relay_global.rb @@ -172,7 +172,6 @@ def default_ipv4_src_addr_hsrp def ipv4_src_intf intf = config_get('dhcp_relay_global', 'ipv4_src_intf') - # Normalize by downcasing and removing white space intf = intf.downcase.delete(' ') if intf intf end