cisco_node_utils 1.10.0 → 2.0.0

data/tests/test_route_map.rb

@@ -152,11 +152,9 @@ class TestRouteMap < CiscoTestCase
   def test_match_src_proto
     rm = create_route_map
     assert_equal(rm.default_match_src_proto, rm.match_src_proto)
-    array = %w(tcp udp igmp)
+    array = %w(tcp udp igmp).sort
     rm.match_src_proto = array
-    # Protocol order not maintained in running config starting Greensboro.
-    # Sorting arrays to check equality.
-    assert_equal(array.sort, rm.match_src_proto.sort)
+    assert_equal(array, rm.match_src_proto)
     rm.match_src_proto = rm.default_match_src_proto
     assert_equal(rm.default_match_src_proto, rm.match_src_proto)
   end

data/tests/test_router_bgp.rb

@@ -55,7 +55,8 @@ def setup_default
 end
 
 def setup_vrf
-  @asnum = 99
+  # nexus does not support multiple BGP instances; VRF AS must be same as default AS
+  @asnum = platform == :nexus ? 55 : 99
   @vrf = 'yamllll'
   create_bgp_vrf(@asnum, @vrf)
 end
@@ -256,24 +257,18 @@ class TestRouterBgp < CiscoTestCase
   end
 
   def test_nsr
+    skip_if_UnsupportedCmdRef('bgp', 'nsr')
     nsr(setup_default)
     nsr(setup_vrf)
   end
 
   def nsr(bgp)
-    if (platform == :nexus) || (platform == :ios_xr && !@vrf[/default/])
-      if platform == :nexus
-        assert_nil(bgp.default_nsr,
-                   'default bgp nsr should be nil on Nexus')
-        assert_nil(bgp.nsr,
-                   'bgp nsr should be nil on Nexus')
-      else
-        assert_nil(bgp.default_nsr,
-                   'default bgp nsr should return nil on XR with non-default' \
-                   ' vrf')
-        assert_nil(bgp.nsr,
-                   'bgp nsr should return nil on XR with non-default vrf')
-      end
+    if platform == :ios_xr && !@vrf[/default/]
+      assert_nil(bgp.default_nsr,
+                 'default bgp nsr should return nil on XR with non-default' \
+                 ' vrf')
+      assert_nil(bgp.nsr,
+                 'bgp nsr should return nil on XR with non-default vrf')
       assert_raises(Cisco::UnsupportedError) do
         bgp.nsr = true
       end
@@ -1100,6 +1095,7 @@ class TestRouterBgp < CiscoTestCase
       assert_nil(bgp.reconnect_interval,
                  'reconnect_interval should return nil on XR')
     else
+      skip_if_UnsupportedCmdRef('bgp', 'reconnect_interval')
       skip_incompat_version?('bgp', 'reconnect_interval')
       assert_equal(bgp.default_reconnect_interval, bgp.reconnect_interval,
                    "reconnect_interval should be set to default value of '60'")

data/tests/test_router_ospf_vrf.rb

@@ -32,6 +32,67 @@ class TestRouterOspfVrf < CiscoTestCase
     super
   end
 
+  def test_redistribute
+    routers = %w(alpha beta)
+    vrfs = %w(default zed)
+    routers.each do |rtr|
+      vrfs.each do |vrf|
+        dbg = sprintf('[RTR %s VRF %s]', rtr, vrf)
+        af = RouterOspfVrf.new(rtr, vrf)
+        redistribute_cmd(af, dbg)
+      end
+    end
+  end
+
+  def redistribute_cmd(af, dbg)
+    # rubocop:disable Style/WordArray
+    # Initial 'should' state
+    master = [['direct',  'rm_direct'],
+              ['lisp',    'rm_lisp'],
+              ['static',  'rm_static'],
+              ['eigrp 1', 'rm_eigrp'],
+              ['isis 2',  'rm_isis'],
+              ['ospf 3',   'rm_ospf'],
+              ['rip 4',   'rm_rip'],
+              ['bgp 5',   'rm_bgp']]
+    # rubocop:enable Style/WordArray
+
+    # Test: Add all protocols w/route-maps when no cmds are present
+    should = master.clone
+    af.redistribute = should
+    result = af.redistribute
+    assert_equal(should.sort, result.sort,
+                 "#{dbg} Test 1. From empty, to all protocols")
+
+    # Test: remove half of the protocols
+    should.shift(4)
+    af.redistribute = should
+    result = af.redistribute
+    assert_equal(should.sort, result.sort,
+                 "#{dbg} Test 2. Remove half of the protocols")
+
+    # Test: restore the removed protocols
+    should = master.clone
+    af.redistribute = should
+    result = af.redistribute
+    assert_equal(should.sort, result.sort,
+                 "#{dbg} Test 3. Restore the removed protocols")
+
+    # Test: Change route-maps on existing commands
+    should = master.map { |prot_only, rm| [prot_only, "#{rm}_2"] }
+    af.redistribute = should
+    result = af.redistribute
+    assert_equal(should.sort, result.sort,
+                 "#{dbg} Test 4. Change route-maps on existing commands")
+
+    # Test: 'default'
+    should = af.default_redistribute
+    af.redistribute = should
+    result = af.redistribute
+    assert_equal(should.sort, result.sort,
+                 "#{dbg} Test 5. 'Default'")
+  end
+
   def assert_match_vrf_line(routername, vrfname, cmd=nil)
     match_vrf_line(routername, vrfname, cmd, true)
   end

data/tests/test_snmpserver.rb

@@ -155,7 +155,7 @@ class TestSnmpServer < CiscoTestCase
   end
 
   def test_packet_size
-    skip_legacy_defect?('7.0.3.I2.2e|7.0.3.I2.5|7.0.3.I3.1',
+    skip_legacy_defect?('7.0.3.I2.2e|7.0.3.I2.5|7.0.3.I3.1|7.3.2.D',
                         'CSCuz14217: CLI shows default snmp packet-size incorrectly as 0')
 
     if validate_property_excluded?('snmp_server', 'packet_size')

data/tests/test_tacacs_global.rb

@@ -75,7 +75,8 @@ class TestTacacsGlobal < CiscoTestCase
     global.encryption_key_set(nil, key)
     # Device encypts key - verify return value
     assert_equal(7, global.key_format)
-    assert_equal('"WAWY_NZB"', global.key)
+    key = 'WAWY_NZB'
+    assert_equal(key, global.key)
 
     skip_versions = ['7.0.3.(I2|I3)', '7.0.3.I4.[1-7]']
     if step_unless_legacy_defect(skip_versions, 'CSCvh72911: Cannot configure tacacs-server key 6')
@@ -85,7 +86,8 @@ class TestTacacsGlobal < CiscoTestCase
       key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
       global.encryption_key_set(key_format, key)
       assert_equal(key_format, global.key_format)
-      assert_equal("\"#{key}\"", global.key)
+
+      assert_equal(key, global.key)
     end
 
     # Remove global key

data/tests/test_upgrade.rb

@@ -71,7 +71,7 @@ class TestUpgrade < CiscoTestCase
 
   def test_image_version
     version = Upgrade.image_version
-    assert_match(/^\d.\d\(\d\)\S+\(\S+\)$/, version)
+    assert_match(/^\d.\d\(\d(?:.\d+)?\)(?:\S+\(\S+\))?$/, version)
   end
 
   def test_box_online

data/tests/test_vrf.rb

@@ -222,6 +222,8 @@ class TestVrf < CiscoTestCase
     assert_empty(v.route_distinguisher,
                  'v route_distinguisher should *NOT* be configured')
     v.destroy
+  rescue RuntimeError => e
+    hardware_supports_feature?(e.message)
   end
 
   def test_vpn_id

data/tests/test_vrf_af.rb

@@ -210,6 +210,8 @@ class TestVrfAf < CiscoTestCase
     should = v.default_route_target_import
     route_target_tester(v, af, opts, should, 'Test 4')
     v.destroy
+  rescue RuntimeError => e
+    hardware_supports_feature?(e.message)
   end
 
   def route_target_tester(v, af, opts, should, test_id)

data/tests/test_vtp.rb

@@ -175,14 +175,16 @@ class TestVtp < CiscoTestCase
   end
 
   # this fails on n7k running 7.3(0)D1.1 image but it
-  # is fixed in later releases. The bugID is CSCuy87970
+  # is fixed in some later releases. The bugID is CSCuy87970
   # which is already verified.
   def test_password_special_characters
-    skip_legacy_defect?('7.3.0.(N1|D1).1.bin',
+    skip_legacy_defect?('7.3.[012].(N1|D1)',
                         'CSCuy87970: NXAPI incorrect backslash escape')
+    # N6k output may triple-escape forward slashes. For now simplify pattern.
+    test_pass = node.product_id[/N[56]/] ? 'hello!//#%$x' : 'hello!//\\#%$x'
     vtp = vtp_domain('password')
-    vtp.password = 'hello!//\\#%$x'
-    assert_equal('hello!//\\#%$x', vtp.password)
+    vtp.password = test_pass
+    assert_equal(test_pass, vtp.password)
   end
 
   def test_filename_valid

data/tests/test_vxlan_vtep.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2016 Cisco and/or its affiliates.
+# Copyright (c) 2013-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.
@@ -24,9 +24,11 @@ include Cisco
 class TestVxlanVtep < CiscoTestCase
   @skip_unless_supported = 'vxlan_vtep'
   @@pre_clean_needed = true # rubocop:disable Style/ClassVars
+  @@feature_unsupported = false # rubocop:disable Style/ClassVars
 
   def setup
     super
+    skip('setup: Feature is unsupported on this device') if @@feature_unsupported
     skip('Platform does not support MT-full or MT-lite') unless
       VxlanVtep.mt_full_support || VxlanVtep.mt_lite_support
     Interface.interfaces(:nve).each { |_nve, obj| obj.destroy }
@@ -34,6 +36,10 @@ class TestVxlanVtep < CiscoTestCase
     feature_cleanup if @@pre_clean_needed
     Feature.nv_overlay_enable
     @@pre_clean_needed = false # rubocop:disable Style/ClassVars
+  rescue RuntimeError => e
+    # Skip locally to shortcut the dependencies above for the next test
+    @@feature_unsupported = hardware_supports_feature?(e.message, status_only: true) # rubocop:disable Style/ClassVars
+    @@feature_unsupported ? skip(e.message) : raise(e.message)
   end
 
   def teardown
@@ -232,4 +238,90 @@ class TestVxlanVtep < CiscoTestCase
     vtep.source_interface_hold_down_time = val
     assert_equal(val, vtep.source_interface_hold_down_time)
   end
+
+  def test_global_ingress_replication_bgp
+    skip_incompat_version?('vxlan_vtep', 'global_ingress_replication_bgp')
+
+    vtep = VxlanVtep.new('nve1')
+    vtep.host_reachability = 'evpn'
+    if validate_property_excluded?('vxlan_vtep', 'global_ingress_replication_bgp')
+      assert_raises(Cisco::UnsupportedError) { vtep.global_ingress_replication_bgp = true }
+      return
+    end
+
+    # Test: Check global_ingress_replication_bgp is not configured.
+    refute(vtep.global_ingress_replication_bgp, 'global_ingress_replication_bgp should be disabled')
+
+    # Test: Enable global_ingress_replication_bgp
+    vtep.global_ingress_replication_bgp = true
+    assert(vtep.global_ingress_replication_bgp, 'global_ingress_replication_bgp should be enabled')
+    # Test: Default
+    vtep.global_ingress_replication_bgp = vtep.default_global_ingress_replication_bgp
+    refute(vtep.global_ingress_replication_bgp, 'global_ingress_replication_bgp should be disabled')
+  end
+
+  def test_global_suppress_arp
+    skip_incompat_version?('vxlan_vtep', 'global_suppress_arp')
+
+    vtep = VxlanVtep.new('nve1')
+    vtep.host_reachability = 'evpn'
+    if validate_property_excluded?('vxlan_vtep', 'global_suppress_arp')
+      assert_raises(Cisco::UnsupportedError) { vtep.global_suppress_arp = true }
+      return
+    end
+
+    # Test: Check global_suppress_arp is not configured.
+    refute(vtep.global_suppress_arp, 'global_suppress_arp should be disabled')
+
+    # Test: Enable global_suppress_arp
+    begin
+      vtep.global_suppress_arp = true
+    rescue CliError => e
+      skip(e.to_s) if /ERROR: Please configure TCAM/.match(e.to_s)
+    end
+    assert(vtep.global_suppress_arp, 'global_suppress_arp should be enabled')
+    # Test: Default
+    vtep.global_suppress_arp = vtep.default_global_suppress_arp
+    refute(vtep.global_suppress_arp, 'global_suppress_arp should be disabled')
+  end
+
+  def test_global_mcast_group_l2
+    vtep = VxlanVtep.new('nve1')
+    if validate_property_excluded?('vxlan_vtep', 'global_mcast_group_l2')
+      assert_raises(Cisco::UnsupportedError) do
+        vtep.global_mcast_group_l2 = '225.1.1.1'
+      end
+      return
+    end
+    skip_incompat_version?('vxlan_vtep', 'global_mcast_group_l2')
+
+    assert_equal(vtep.global_mcast_group_l2, vtep.default_global_mcast_group_l2)
+    vtep.global_mcast_group_l2 = '225.1.1.1'
+    assert_equal('225.1.1.1', vtep.global_mcast_group_l2)
+    vtep.global_mcast_group_l2 = vtep.default_global_mcast_group_l2
+    assert_equal(vtep.global_mcast_group_l2, vtep.default_global_mcast_group_l2)
+  end
+
+  def test_global_mcast_group_l3
+    vtep = VxlanVtep.new('nve1')
+    if validate_property_excluded?('vxlan_vtep', 'global_mcast_group_l3')
+      assert_raises(Cisco::UnsupportedError) do
+        vtep.global_mcast_group_l3 = '225.1.1.1'
+      end
+      return
+    end
+    skip_incompat_version?('vxlan_vtep', 'global_mcast_group_l3')
+
+    assert_equal(vtep.global_mcast_group_l3, vtep.default_global_mcast_group_l3)
+
+    begin
+      # global_mcast_group_l3 is only supported on certain vxlan capable N9ks
+      vtep.global_mcast_group_l3 = '225.1.1.1'
+    rescue CliError => e
+      skip(e.to_s) if /TRM not supported on this platform/.match(e.to_s)
+    end
+    assert_equal('225.1.1.1', vtep.global_mcast_group_l3)
+    vtep.global_mcast_group_l3 = vtep.default_global_mcast_group_l3
+    assert_equal(vtep.global_mcast_group_l3, vtep.default_global_mcast_group_l3)
+  end
 end

data/tests/test_vxlan_vtep_vni.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2016 Cisco and/or its affiliates.
+# Copyright (c) 2013-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.
@@ -23,15 +23,21 @@ include Cisco
 class TestVxlanVtepVni < CiscoTestCase
   @skip_unless_supported = 'vxlan_vtep_vni'
   @@pre_clean_needed = true # rubocop:disable Style/ClassVars
+  @@feature_unsupported = false # rubocop:disable Style/ClassVars
 
   def setup
     super
+    skip('setup: Feature is unsupported on this device') if @@feature_unsupported
     vdc_limit_f3_no_intf_needed(:set) if VxlanVtep.mt_full_support
     Interface.interfaces(:nve).each { |_nve, obj| obj.destroy }
     feature_cleanup if @@pre_clean_needed
     Feature.nv_overlay_enable
     config_no_warn('feature vn-segment-vlan-based') if VxlanVtep.mt_lite_support
     @@pre_clean_needed = false # rubocop:disable Style/ClassVars
+  rescue RuntimeError => e
+    # Skip locally to shortcut the dependencies above for the next test
+    @@feature_unsupported = hardware_supports_feature?(e.message, status_only: true) # rubocop:disable Style/ClassVars
+    @@feature_unsupported ? skip(e.message) : raise(e.message)
   end
 
   def teardown
@@ -237,6 +243,34 @@ class TestVxlanVtepVni < CiscoTestCase
     refute(vni.suppress_arp, 'suppress_arp should be disabled')
   end
 
+  def test_suppress_arp_disable
+    skip_incompat_version?('vxlan_vtep_vni', 'suppress_arp_disable')
+    vni = VxlanVtepVni.new('nve1', '6000')
+    VxlanVtep.new('nve1').host_reachability = 'evpn'
+
+    if validate_property_excluded?('vxlan_vtep_vni', 'suppress_arp_disable')
+      assert_raises(Cisco::UnsupportedError) { vni.suppress_arp_disable = true }
+      return
+    end
+
+    # Test: Check suppress_arp_disable is not configured.
+    refute(vni.suppress_arp_disable, 'suppress_arp_disable should be disabled')
+
+    begin
+      # Test: Enable suppress_arp_disable
+      vni.suppress_arp_disable = true
+      assert(vni.suppress_arp_disable, 'suppress_arp_disable should be enabled')
+    rescue CliError => e
+      msg = 'TCAM reconfiguration required followed by reload' \
+        " Skipping test case.\n#{e}"
+      skip(msg) if /ERROR: Please configure TCAM/.match(e.to_s)
+    end
+
+    # Test: Default
+    vni.suppress_arp_disable = vni.default_suppress_arp_disable
+    refute(vni.suppress_arp_disable, 'suppress_arp_disable should be disabled')
+  end
+
   def test_suppress_uuc
     vni = VxlanVtepVni.new('nve1', '6000')
     VxlanVtep.new('nve1').host_reachability = 'evpn'

data/tests/yum_package.yaml

@@ -43,6 +43,11 @@
   name:     'nxos.sample-n9k_EOR'
   version:  '1.0.0-7.0.3.I4.6'
 
+7_0_3_I4_8_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I4.8.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_EOR'
+  version:  '1.0.0-7.0.3.I4.8'
+
 7_0_3_I5_1_:
   filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I5.1.lib32_n9000.rpm'
   name:     'nxos.sample-n9k_ALL'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cisco_node_utils
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Rob Gries
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -517,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Utilities for management of Cisco network nodes