cisco_node_utils 1.6.0 → 1.7.0

data/tests/test_overlay_global.rb

@@ -70,6 +70,7 @@ class TestOverlayGlobal < CiscoTestCase
   def test_dup_host_mac_detection
     o = OverlayGlobal.new
 
+    skip_incompat_version?('overlay_global', 'dup_host_mac_detection')
     # Set to a non-default value
     val = [160, 16]
     o.dup_host_mac_detection_set(*val)

data/tests/test_route_map.rb

@@ -20,12 +20,6 @@ def evergreen_or_later?
   true
 end
 
-def older_n9k?
-  return true if Utils.image_version?(/7.0.3.I2|I3|I4/) &&
-                 node.product_id[/N9K/]
-  false
-end
-
 def dplus_n9k?
   return true if Utils.image_version?(/7.0.3.I4/) &&
                  node.product_id[/N9K/]
@@ -340,9 +334,9 @@ class TestRouteMap < CiscoTestCase
   end
 
   def test_match_metric
-    # bug CSCvc82934 on fretta and n9k running dplus
-    skip('platform not supported for this test') if node.product_id[/N9.*-F/] ||
-                                                    dplus_n9k?
+    # bug CSCvc82934 on n9k running dplus
+    skip('platform not supported for this test') if dplus_n9k?
+    skip_incompat_version?('route_map', 'match_metric')
     rm = create_route_map
     assert_equal(rm.default_match_metric, rm.match_metric)
     metric = [%w(1 0), %w(8 0), %w(224 9), %w(23 0), %w(5 8), %w(6 0)]
@@ -430,7 +424,6 @@ class TestRouteMap < CiscoTestCase
   end
 
   def test_match_ospf_area
-    skip('platform not supported for this test') unless evergreen_or_later?
     rm = create_route_map
     if validate_property_excluded?('route_map', 'match_ospf_area')
       assert_nil(rm.match_ospf_area)
@@ -439,6 +432,7 @@ class TestRouteMap < CiscoTestCase
       end
       return
     end
+    skip_incompat_version?('route_map', 'match_ospf_area')
     assert_equal(rm.default_match_ospf_area, rm.match_ospf_area)
     array = %w(10 7 222)
     rm.match_ospf_area = array
@@ -678,7 +672,7 @@ class TestRouteMap < CiscoTestCase
   end
 
   def test_set_ipv4_next_hop_redist
-    skip('platform not supported for this test') unless evergreen_or_later?
+    skip_incompat_version?('route_map', 'set_ipv4_next_hop_redist')
     rm = lset_ip_next_hop_helper(v4red: true)
     assert(rm.set_ipv4_next_hop_redist)
     hash = {}
@@ -1001,9 +995,8 @@ class TestRouteMap < CiscoTestCase
 
   def test_set_ipv4_next_hop_load_share
     # bug on fretta
-    skip('platform not supported for this test') if node.product_id[/(N5|N6|N9.*-F)/]
-    # bug on old n9k
-    skip('platform not supported for this test') if older_n9k?
+    skip('platform not supported for this test') if node.product_id[/(N5|N6)/]
+    skip_incompat_version?('route_map', 'set_ipv4_next_hop_load_share')
     arr = %w(1.1.1.1 2.2.2.2 3.3.3.3)
     rm = lset_ip_next_hop_helper(v4nh: arr)
     assert_equal(arr, rm.set_ipv4_next_hop)
@@ -1034,7 +1027,7 @@ class TestRouteMap < CiscoTestCase
   end
 
   def test_set_ipv6_next_hop_redist
-    skip('platform not supported for this test') unless evergreen_or_later?
+    skip_incompat_version?('route_map', 'set_ipv6_next_hop_redist')
     rm = lset_ip_next_hop_helper(v6red: true)
     assert(rm.set_ipv6_next_hop_redist)
     hash = {}
@@ -1102,9 +1095,8 @@ class TestRouteMap < CiscoTestCase
 
   def test_set_ipv6_next_hop_load_share
     # bug on fretta
-    skip('platform not supported for this test') if node.product_id[/(N5|N6|N9.*-F)/]
-    # bug on old n9k
-    skip('platform not supported for this test') if older_n9k?
+    skip('platform not supported for this test') if node.product_id[/(N5|N6)/]
+    skip_incompat_version?('route_map', 'set_ipv6_next_hop_load_share')
     arr = %w(2000::1 2000::11 2000::22)
     rm = lset_ip_next_hop_helper(v6nh: arr)
     assert_equal(arr, rm.set_ipv6_next_hop)
@@ -1128,8 +1120,7 @@ class TestRouteMap < CiscoTestCase
   def test_set_community_no_asn
     # bug on n5/6k
     skip('platform not supported for this test') if node.product_id[/(N5|N6)/]
-    # bug on old n9k
-    skip('platform not supported for this test') if older_n9k?
+    skip_incompat_version?('route_map', 'set_community')
     rm = create_route_map
     assert_equal(rm.default_set_community_additive,
                  rm.set_community_additive)
@@ -1228,8 +1219,7 @@ class TestRouteMap < CiscoTestCase
   end
 
   def test_set_community_asn
-    # bug on old n9k
-    skip('platform not supported for this test') if older_n9k?
+    skip_incompat_version?('route_map', 'set_community')
     rm = create_route_map
     none = false
     noadv = true
@@ -1285,8 +1275,7 @@ class TestRouteMap < CiscoTestCase
   end
 
   def test_extcommunity_4bytes
-    # bug on fretta
-    skip('platform not supported for this test') if node.product_id[/N9.*-F/]
+    skip_incompat_version?('route_map', 'set_extcommunity_4bytes')
     rm = create_route_map
     assert_equal(rm.default_set_extcommunity_4bytes_transitive,
                  rm.set_extcommunity_4bytes_transitive)

data/tests/test_router_bgp.rb

@@ -64,7 +64,7 @@ def newer_image_version?
   new = true
   new = false if Utils.image_version?(/7.0.3.I2|I3|I4/) ||
                  node.product_id[/(N5|N6|N7|N9.*-F)/]
-  new = true if Utils.image_version?(/8.0/)
+  new = true if Utils.image_version?(/8.0|8.1/)
   new
 end
 
@@ -503,7 +503,7 @@ class TestRouterBgp < CiscoTestCase
   end
 
   def test_disable_policy_batching_ipv4
-    if platform == :ios_xr || node.product_id[/N(5|6|7)/]
+    if platform == :ios_xr || node.product_id[/N(5|6)/]
       b = RouterBgp.new(1)
       assert_nil(b.disable_policy_batching_ipv4)
       assert_nil(b.default_disable_policy_batching_ipv4)
@@ -512,6 +512,7 @@ class TestRouterBgp < CiscoTestCase
       end
       return
     end
+    skip_incompat_version?('bgp', 'disable_policy_batching_ipv4')
     bgp = setup_default
     default = bgp.default_disable_policy_batching_ipv4
     assert_equal(default, bgp.disable_policy_batching_ipv4,
@@ -532,7 +533,7 @@ class TestRouterBgp < CiscoTestCase
   end
 
   def test_disable_policy_batching_ipv6
-    if platform == :ios_xr || node.product_id[/N(5|6|7)/]
+    if platform == :ios_xr || node.product_id[/N(5|6)/]
       b = RouterBgp.new(1)
       assert_nil(b.disable_policy_batching_ipv6)
       assert_nil(b.default_disable_policy_batching_ipv6)
@@ -541,6 +542,7 @@ class TestRouterBgp < CiscoTestCase
       end
       return
     end
+    skip_incompat_version?('bgp', 'disable_policy_batching_ipv6')
     bgp = setup_default
     default = bgp.default_disable_policy_batching_ipv6
     assert_equal(default, bgp.disable_policy_batching_ipv6,
@@ -669,7 +671,7 @@ class TestRouterBgp < CiscoTestCase
     assert_equal('false', bgp.event_history_errors)
     bgp.event_history_errors = 'size_small'
     assert_equal('size_small', bgp.event_history_errors) unless
-      Utils.image_version?(/8.0/)
+      Utils.image_version?(/8.0|8.1/)
     bgp.event_history_errors = 'size_large'
     assert_equal('size_large', bgp.event_history_errors)
     bgp.event_history_errors = 'size_medium'
@@ -756,7 +758,7 @@ class TestRouterBgp < CiscoTestCase
                  bgp.event_history_periodic)
     bgp.event_history_periodic = 'false'
     assert_equal('false', bgp.event_history_periodic) unless
-      Utils.image_version?(/8.0/)
+      Utils.image_version?(/8.0|8.1/)
     bgp.event_history_periodic = 'size_small'
     assert_equal('size_small', bgp.event_history_periodic)
     bgp.event_history_periodic = 'size_large'
@@ -775,7 +777,7 @@ class TestRouterBgp < CiscoTestCase
     bgp.event_history_periodic = 'true'
     if newer_image_version?
       assert_equal('true', bgp.event_history_periodic) unless
-        Utils.image_version?(/8.0/)
+        Utils.image_version?(/8.0|8.1/)
     else
       assert_equal(bgp.default_event_history_periodic,
                    bgp.event_history_periodic)
@@ -1148,7 +1150,7 @@ class TestRouterBgp < CiscoTestCase
   end
 
   def test_neighbor_down_fib_accelerate
-    if platform == :ios_xr || node.product_id[/N(5|6|7)/]
+    if platform == :ios_xr || node.product_id[/N(5|6)/]
       b = RouterBgp.new(1)
       assert_nil(b.neighbor_down_fib_accelerate)
       assert_nil(b.default_neighbor_down_fib_accelerate)
@@ -1157,6 +1159,7 @@ class TestRouterBgp < CiscoTestCase
       end
       return
     end
+    skip_incompat_version?('bgp', 'neighbor_down_fib_accelerate')
     %w(test_default test_vrf).each do |t|
       if t == 'test_default'
         bgp = setup_default
@@ -1184,7 +1187,7 @@ class TestRouterBgp < CiscoTestCase
   end
 
   def test_reconnect_interval
-    if platform == :ios_xr || node.product_id[/N(5|6|7)/]
+    if platform == :ios_xr || node.product_id[/N(5|6)/]
       b = RouterBgp.new(1)
       assert_nil(b.reconnect_interval)
       assert_nil(b.default_reconnect_interval)
@@ -1193,6 +1196,7 @@ class TestRouterBgp < CiscoTestCase
       end
       return
     end
+    skip_incompat_version?('bgp', 'reconnect_interval')
     %w(test_default test_vrf).each do |t|
       if t == 'test_default'
         bgp = setup_default
@@ -1221,6 +1225,7 @@ class TestRouterBgp < CiscoTestCase
       assert_nil(bgp.reconnect_interval,
                  'reconnect_interval should return nil on XR')
     else
+      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'")
       bgp.destroy
@@ -1315,7 +1320,7 @@ class TestRouterBgp < CiscoTestCase
   end
 
   def test_suppress_fib_pending
-    skip_legacy_defect?('7.0.3.I4.5',
+    skip_legacy_defect?('7.0.3.I4',
                         'CSCvd41536: Unable to remove  suppress-fib-pending')
     bgp = setup_default
     if validate_property_excluded?('bgp', 'suppress_fib_pending')

data/tests/test_span_session.rb

@@ -0,0 +1,155 @@
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/span_session'
+require_relative '../lib/cisco_node_utils/interface'
+require_relative '../lib/cisco_node_utils/vlan'
+require_relative '../lib/cisco_node_utils/cisco_cmn_utils'
+
+include Cisco
+
+# TestSpanSession - Minitest for SPAN session node utility
+class TestSpanSession < CiscoTestCase
+  @skip_unless_supported = 'span_session'
+  @@cleaned = false # rubocop:disable Style/ClassVars
+
+  def setup
+    super
+    cleanup unless @@cleaned
+    @@cleaned = true # rubocop:disable Style/ClassVars
+  end
+
+  def teardown
+    cleanup
+  end
+
+  def cleanup
+    SpanSession.sessions.each do |_session, obj|
+      obj.destroy
+    end
+  end
+
+  def test_create_new_session
+    span = SpanSession.new(1)
+
+    assert_equal(span.session_id, 1)
+    assert_equal(span.type, 'local') # default session type
+    assert(span.shutdown)
+  end
+
+  def test_remove_session
+    span = SpanSession.new(1)
+    span.destroy
+    refute(span.session_id, 'Session was not cleaned up correctly...')
+  end
+
+  def test_create_session_invalid_id
+    e = assert_raises(CliError) { SpanSession.new(33) }
+    assert_match(/Invalid value.range/, e.message)
+  end
+
+  def test_session_type
+    span = SpanSession.new(2)
+    erspan_type = 'erspan-source'
+    span.type = erspan_type
+    assert_equal(span.type, erspan_type)
+  end
+
+  def test_session_description
+    span = SpanSession.new(3)
+    desc = 'SPAN session 1'
+    span.description = desc
+    assert_equal(span.description, desc)
+  end
+
+  def test_session_source_interfaces
+    span = SpanSession.new(4)
+    po_int = Interface.new('port-channel1')
+    int1 = interfaces[0]
+    int2 = interfaces[1]
+    int3 = interfaces[2]
+
+    # Test default case
+    assert_equal(span.default_source_interfaces, span.source_interfaces)
+
+    # Non-default case
+    intla = { int1            => 'rx',
+              int2            => 'tx',
+              'port-channel1' => 'both',
+              'sup-eth0'      => 'rx' }
+
+    span.source_interfaces = intla
+    assert_equal(intla.to_a.sort, span.source_interfaces.sort)
+
+    # intla and intlb are identical
+    intlb = { int1            => 'rx',
+              int2            => 'tx',
+              'port-channel1' => 'both',
+              'sup-eth0'      => 'rx' }
+
+    span.source_interfaces = intlb
+    assert_equal(intlb.to_a.sort, span.source_interfaces.sort)
+
+    # intla/c same size but 1 element different
+    intlc = { int2            => 'both',
+              int1            => 'rx',
+              'port-channel1' => 'both',
+              'sup-eth0'      => 'rx' }
+
+    span.source_interfaces = intlc
+    assert_equal(intlc.to_a.sort, span.source_interfaces.sort)
+
+    # intla/d different sizes and diff/same elements
+    intld = { int2            => 'tx',
+              int1            => 'both',
+              'port-channel1' => 'both' }
+
+    span.source_interfaces = intld
+    assert_equal(intld.to_a.sort, span.source_interfaces.sort)
+
+    # Empty list
+    intle = {}
+
+    span.source_interfaces = intle
+    assert_equal(intle.to_a.sort, span.source_interfaces.sort)
+
+    # intlf is larger then intla
+    intlf = { int3            => 'both',
+              int1            => 'rx',
+              int2            => 'tx',
+              'port-channel1' => 'both',
+              'sup-eth0'      => 'rx' }
+
+    span.source_interfaces = intlf
+    assert_equal(intlf.to_a.sort, span.source_interfaces.sort)
+
+    po_int.destroy
+  end
+
+  def test_session_source_vlans
+    span = SpanSession.new(5)
+
+    # Default case
+    assert_equal(span.source_vlans, span.default_source_vlans)
+
+    # Non-default case
+    vlans = %w(1 2-5 6)
+    span.source_vlans = { vlans: vlans, direction: 'rx' }
+    assert_equal(%w(1-6), span.source_vlans[0])
+    assert_equal('rx', span.source_vlans[1])
+
+    vlans = %w(1 3-4 6)
+    span.source_vlans = { vlans: vlans, direction: 'rx' }
+    assert_equal(%w(1 3-4 6), span.source_vlans[0])
+    assert_equal('rx', span.source_vlans[1])
+
+    # Set back to default
+    span.source_vlans = { vlans: [], direction: '' }
+    assert_equal(span.source_vlans, span.default_source_vlans)
+  end
+
+  def test_session_destination_int
+    span = SpanSession.new(6)
+    dest_int = interfaces[2]
+    span.destination = dest_int
+    assert_equal(span.destination, dest_int)
+  end
+end

data/tests/test_stp_global.rb

@@ -185,6 +185,7 @@ class TestStpGlobal < CiscoTestCase
         global.domain = 200
       end
     else
+      skip_incompat_version?('stp_global', 'domain')
       global.domain = 100
       assert_equal(100, global.domain)
       global.domain =

data/tests/test_upgrade.rb

@@ -80,8 +80,7 @@ class TestUpgrade < CiscoTestCase
 
   def test_upgrade
     image_info = preconfig_upgrade_info
-    version = Upgrade.image_version(image_info['install_image'], image_info['install_uri'])
-    Upgrade.upgrade(version, image_info['install_image'], image_info['install_uri'])
+    Upgrade.upgrade(image_info['install_image'], image_info['install_uri'])
     # Wait 15 seconds for device to start rebooting
     # TODO : Consider getting the sleep value dynamically
     sleep 15
@@ -100,7 +99,7 @@ class TestUpgrade < CiscoTestCase
     image = image_uri.split('/')[-1]
     uri = image_uri.split('/')[0]
     skip('Boot image not on bootflash:') unless uri == 'bootflash:'
-    Upgrade.upgrade(Upgrade.image_version, image, uri)
+    Upgrade.upgrade(image, uri)
     assert(Upgrade.upgraded?)
   end
 end

data/tests/test_vlan.rb

@@ -127,7 +127,7 @@ class TestVlan < CiscoTestCase
   end
 
   def test_name_zero_length
-    skip_legacy_defect?('7.0.3.I5.2',
+    skip_legacy_defect?('7.0.3.I5.2|7.0.3.I5.3',
                         'CSCvd09257: Configuration of vlan name via nxapi should be noop')
     v = Vlan.new(1000)
     v.vlan_name = ''
@@ -161,6 +161,27 @@ class TestVlan < CiscoTestCase
     config 'no system vlan long-name'
   end
 
+  def test_id_similar
+    config 'system vlan long-name'
+    v2 = Vlan.new(2)
+    v102 = Vlan.new(102)
+    v222 = Vlan.new(222)
+
+    v2.vlan_name = 'NEW_YORK_OFFICE'
+    v102.vlan_name = 'RALEIGH_OFFICE'
+    long_name = 'LONG_NAME' + ('E' * 119)
+    v222.vlan_name = long_name
+
+    assert_equal('NEW_YORK_OFFICE', v2.vlan_name)
+    assert_equal('RALEIGH_OFFICE', v102.vlan_name)
+    assert_equal(long_name, v222.vlan_name)
+
+    v2.destroy
+    v102.destroy
+    v222.destroy
+    config 'no system vlan long-name'
+  end
+
   def test_state_invalid
     v = Vlan.new(1000)
     assert_raises(CliError) do
@@ -186,7 +207,7 @@ class TestVlan < CiscoTestCase
 
   def test_shutdown_extended
     v = Vlan.new(2000)
-    assert_raises(RuntimeError, 'vlan misconfig did not raise RuntimeError') do
+    assert_raises(CliError, 'vlan misconfig did not raise CliError') do
       v.shutdown = 'shutdown'
     end
     v.destroy
@@ -317,7 +338,7 @@ class TestVlan < CiscoTestCase
     assert(vlan.fabric_control)
     another_vlan = Vlan.new(101)
 
-    assert_raises(RuntimeError,
+    assert_raises(CliError,
                   'VLAN misconfig did not raise CliError') do
       another_vlan.fabric_control = true
     end