Skip to content

Fix dhcp_relay_global getter #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2019
Merged

Fix dhcp_relay_global getter #613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44c1ffe
Fix dhcp_relay_global getter
mikewiebe Feb 4, 2019
a8ff3e0
Remove unneeded comment
mikewiebe Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lib/cisco_node_utils/dhcp_relay_global.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -207,10 +206,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

Expand Down