Skip to content

CISCO-72: Fix cisco_ace #591

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
Aug 29, 2018
Merged

CISCO-72: Fix cisco_ace #591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
468a26f
fix cisco-72
Aug 24, 2018
81c9db2
copyright
Aug 24, 2018
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
16 changes: 13 additions & 3 deletions lib/cisco_node_utils/ace.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2015-2016 Cisco and/or its affiliates.
# Copyright (c) 2015-2018 Cisco and/or its affiliates.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

require 'ipaddr'
require_relative 'node_util'

module Cisco
Expand Down Expand Up @@ -139,6 +140,15 @@ def ace_set(attrs)
config_set('acl', cmd, @set_args)
end

def valid_ipv6?(addr)
begin
ret = IPAddr.new(addr.split[0]).ipv6?
rescue
ret = false
end
ret
end

# PROPERTIES
# ----------
def seqno
Expand Down Expand Up @@ -182,7 +192,7 @@ def src_addr
return nil if match.nil? || !match.names.include?('src_addr')
addr = match[:src_addr]
# Normalize addr. Some platforms zero_pad ipv6 addrs.
addr.gsub!(/^0*/, '').gsub!(/:0*/, ':')
addr.gsub!(/^0*/, '').gsub!(/:0*/, ':') if valid_ipv6?(addr)
addr
end

Expand All @@ -205,7 +215,7 @@ def dst_addr
return nil if match.nil? || !match.names.include?('dst_addr')
addr = match[:dst_addr]
# Normalize addr. Some platforms zero_pad ipv6 addrs.
addr.gsub!(/^0*/, '').gsub!(/:0*/, ':')
addr.gsub!(/^0*/, '').gsub!(/:0*/, ':') if valid_ipv6?(addr)
addr
end

Expand Down