cisco_node_utils 1.3.0 → 1.4.0

data/tests/test_itd_device_group.rb

@@ -18,7 +18,7 @@ require_relative '../lib/cisco_node_utils/itd_device_group'
 include Cisco
 # TestInterface - Minitest for general functionality
 # of the ItdDeviceGroup class.
-class TestItdDeviceGroup < CiscoTestCase
+class TestItdDevGrp < CiscoTestCase
   @skip_unless_supported = 'itd_device_group'
   # Tests
 
@@ -32,7 +32,7 @@ class TestItdDeviceGroup < CiscoTestCase
     super
   end
 
-  def test_itd_device_group_create_destroy
+  def test_create_destroy
     skip_nexus_i2_image?
     i1 = ItdDeviceGroup.new('abc')
     i2 = ItdDeviceGroup.new('BCD')

data/tests/test_itd_device_group_node.rb

@@ -18,7 +18,7 @@ require_relative '../lib/cisco_node_utils/itd_device_group_node'
 include Cisco
 # TestInterface - Minitest for general functionality
 # of the ItdDeviceGroup class.
-class TestItdDeviceGroupNode < CiscoTestCase
+class TestItdDevGrpNode < CiscoTestCase
   @skip_unless_supported = 'itd_device_group'
   # Tests
 
@@ -32,7 +32,7 @@ class TestItdDeviceGroupNode < CiscoTestCase
     super
   end
 
-  def test_itd_device_group_node_create_destroy
+  def test_create_destroy
     skip_nexus_i2_image?
     itddg1 = ItdDeviceGroup.new('abc')
     n1 = ItdDeviceGroupNode.new(itddg1.name, '1.1.1.1', 'ip')

data/tests/test_itd_service.rb

@@ -19,7 +19,7 @@ require_relative '../lib/cisco_node_utils/itd_service'
 include Cisco
 # TestInterface - Minitest for general functionality
 # of the ItdService class.
-class TestItdService < CiscoTestCase
+class TestItdSvc < CiscoTestCase
   @skip_unless_supported = 'itd_service'
   # Tests
 

data/tests/test_name_server.rb

@@ -49,7 +49,7 @@ class TestNameServer < CiscoTestCase
 
   # TESTS
 
-  def test_nameserver_create_destroy_single_ipv4
+  def test_ipv4
     id = '7.7.7.7'
     refute_includes(Cisco::NameServer.nameservers, id)
 
@@ -61,7 +61,7 @@ class TestNameServer < CiscoTestCase
     refute_includes(Cisco::NameServer.nameservers, id)
   end
 
-  def test_nameserver_create_destroy_single_ipv6
+  def test_ipv6
     id = '2001:4860:4860::7777'
     refute_includes(Cisco::NameServer.nameservers, id)
 
@@ -73,7 +73,7 @@ class TestNameServer < CiscoTestCase
     refute_includes(Cisco::NameServer.nameservers, id)
   end
 
-  def test_router_create_destroy_multiple
+  def test_multiple
     id1 = '7.7.7.7'
     id2 = '2001:4860:4860::7777'
     refute_includes(Cisco::NameServer.nameservers, id1)

data/tests/test_node_ext.rb

@@ -326,12 +326,9 @@ class TestNodeExt < CiscoTestCase
   def test_get_last_reset_time
     if validate_property_excluded?('show_version', 'last_reset_time')
       assert_nil(node.last_reset_time)
-      return
+    else
+      refute_nil(node.last_reset_time)
     end
-    assert_output_check(command: 'show version',
-                        pattern: /.*\nLast reset at \d+ usecs after  (.*)\n/,
-                        check:   node.last_reset_time,
-                        msg:     'Error, Last reset time does not match')
   end
 
   def test_get_last_reset_reason
@@ -348,16 +345,9 @@ class TestNodeExt < CiscoTestCase
   def test_get_system_cpu_utilization
     if validate_property_excluded?('system', 'resources')
       assert_nil(node.system_cpu_utilization)
-      return
+    else
+      refute_nil(node.system_cpu_utilization)
     end
-    cpu_utilization = node.system_cpu_utilization
-    md = assert_show_match(
-      command: 'show system resources',
-      pattern: /.*CPU states  :   (\d+\.\d+)% user,   (\d+\.\d+)% kernel/)
-    observed_cpu_utilization = md[1].to_f + md[2].to_f
-    delta = cpu_utilization - observed_cpu_utilization
-    assert(delta > -15.0 && delta < 15.0,
-           "Error: delta #{delta}, not +- 15.0")
   end
 
   def test_get_boot
@@ -379,7 +369,7 @@ class TestNodeExt < CiscoTestCase
   end
 
   def test_get_system
-    if validate_property_excluded?('system', 'resources')
+    if validate_property_excluded?('show_version', 'system_image')
       assert_nil(node.system)
       return
     end
@@ -388,9 +378,17 @@ class TestNodeExt < CiscoTestCase
     # system image file is: bootflash:///n7000-s2-kickstart.7.3.0.D1.1.bin
     # /N(3|8|9)/
     # NXOS image file is: bootflash:///nxos.7.0.3.I3.1.bin
+    # /ios_xr/
+    # xrv9k-xr-6.1.1.19I version=6.1.1.19I [Boot image]
 
-    pattern = /(?:system|NXOS) image file is:\s+(.*)$/
-    assert_output_check(command: 'show version',
+    if platform[/ios_xr/]
+      cmd = 'show install active'
+      pattern = /^\s*(\S*)\s*version.*\[Boot image\]$/
+    else
+      cmd = 'show version'
+      pattern = /(?:system|NXOS) image file is:\s+(.*)$/
+    end
+    assert_output_check(command: cmd,
                         pattern: pattern,
                         check:   node.system,
                         msg:     'Error, System Image does not match')

data/tests/test_ntp_config.rb

@@ -37,7 +37,7 @@ class TestNtpConfig < CiscoTestCase
 
   # TESTS
 
-  def test_ntpconfig_create_destroy_single
+  def test_create_destroy
     id = 'default'
 
     ntp = Cisco::NtpConfig.new(id)

data/tests/test_ntp_server.rb

@@ -40,7 +40,7 @@ class TestNtpServer < CiscoTestCase
 
   # TESTS
 
-  def test_ntpserver_create_destroy_single_ipv4
+  def test_ipv4
     id = '130.88.203.12'
     refute_includes(Cisco::NtpServer.ntpservers, id)
 
@@ -52,7 +52,7 @@ class TestNtpServer < CiscoTestCase
     refute_includes(Cisco::NtpServer.ntpservers, id)
   end
 
-  def test_ntpserver_create_destroy_single_ipv6
+  def test_ipv6
     id = '2003::5'
     refute_includes(Cisco::NtpServer.ntpservers, id)
 
@@ -64,7 +64,7 @@ class TestNtpServer < CiscoTestCase
     refute_includes(Cisco::NtpServer.ntpservers, id)
   end
 
-  def test_ntpserver_create_destroy_multiple
+  def test_multiple
     id1 = '130.88.203.12'
     id2 = '2003::5'
     refute_includes(Cisco::NtpServer.ntpservers, id1)

data/tests/test_nxapi.rb

@@ -44,6 +44,7 @@ class TestNxapi < TestCase
   end
 
   def cleanup
+    return if Cisco::Environment.environment[:port]
     config_no_warn('no interface loopback41', 'no interface loopback42')
   end
 

data/tests/test_overlay_global.rb

@@ -25,11 +25,15 @@ class TestOverlayGlobal < CiscoTestCase
 
   def setup
     super
-    vxlan_linecard?
-    vdc_lc_state('f3')
+    vdc_limit_f3_no_intf_needed(:set)
     config_no_warn('no feature fabric forwarding')
     config_no_warn('no nv overlay evpn')
-    config_no_warn('l2rib dup-host-mac-detection default')
+  end
+
+  def teardown
+    config_no_warn('no feature fabric forwarding')
+    config_no_warn('no nv overlay evpn')
+    vdc_limit_f3_no_intf_needed(:clear) if first_or_last_teardown
   end
 
   def test_dup_host_ip_addr_detection
@@ -42,9 +46,10 @@ class TestOverlayGlobal < CiscoTestCase
       return
     end
 
-    # Before enabling 'nv overlay evpn', these properties do not exist
-    assert_nil(o.dup_host_ip_addr_detection_host_moves)
-    assert_nil(o.dup_host_ip_addr_detection_timeout)
+    assert_equal(o.default_dup_host_ip_addr_detection_host_moves,
+                 o.dup_host_ip_addr_detection_host_moves)
+    assert_equal(o.default_dup_host_ip_addr_detection_timeout,
+                 o.dup_host_ip_addr_detection_timeout)
 
     # Set them to the default value and they should now be present
     default = [o.default_dup_host_ip_addr_detection_host_moves,
@@ -64,11 +69,6 @@ class TestOverlayGlobal < CiscoTestCase
 
   def test_dup_host_mac_detection
     o = OverlayGlobal.new
-    # These properties always exist, even without 'nv overlay evpn'
-    default = [o.default_dup_host_mac_detection_host_moves,
-               o.default_dup_host_mac_detection_timeout]
-    assert_equal(default, o.dup_host_mac_detection)
-    refute(Feature.nv_overlay_evpn_enabled?)
 
     # Set to a non-default value
     val = [160, 16]
@@ -76,12 +76,9 @@ class TestOverlayGlobal < CiscoTestCase
     assert_equal(val, o.dup_host_mac_detection)
     refute(Feature.nv_overlay_evpn_enabled?)
 
-    # Use the special defaulter method
-    o.dup_host_mac_detection_default
-    assert_equal(default, o.dup_host_mac_detection)
-    refute(Feature.nv_overlay_evpn_enabled?)
-
-    # Set explicitly to default too
+    # These properties always exist, even without 'nv overlay evpn'
+    default = [o.default_dup_host_mac_detection_host_moves,
+               o.default_dup_host_mac_detection_timeout]
     o.dup_host_mac_detection_set(*default)
     assert_equal(default, o.dup_host_mac_detection)
     refute(Feature.nv_overlay_evpn_enabled?)
@@ -94,8 +91,7 @@ class TestOverlayGlobal < CiscoTestCase
       return
     end
 
-    # Before enabling 'nv overlay evpn', this property does not exist
-    assert_nil(o.anycast_gateway_mac)
+    assert_equal(o.default_anycast_gateway_mac, o.anycast_gateway_mac)
 
     # Explicitly set to default and it should be enabled
     o.anycast_gateway_mac = o.default_anycast_gateway_mac

data/tests/test_pim.rb

@@ -81,7 +81,7 @@ class TestPim < CiscoTestCase
 
   # Tests single ssm range none under default vrf
   #-----------------------------------------------
-  def test_single_ssm_range_single_vrf
+  def test_ssm_range
     %w(ipv4).each do |afi|
       create_single_ssm_range_single_vrf(afi)
     end
@@ -98,7 +98,7 @@ class TestPim < CiscoTestCase
 
   # Tests single ssm range none under default vrf
   #-----------------------------------------------
-  def test_single_ssm_range_none_single_vrf
+  def test_ssm_range_none
     %w(ipv4).each do |afi|
       create_single_ssm_range_none_single_vrf(afi)
     end
@@ -123,7 +123,7 @@ class TestPim < CiscoTestCase
 
   # Tests multiple ssm ranges under different vrfs
   #-----------------------------------------------
-  def test_multiple_ssm_range_multiple_vrfs
+  def test_ssm_range_multiple
     %w(ipv4).each do |afi|
       create_multiple_ssm_range_multiple_vrfs(afi)
     end
@@ -153,7 +153,7 @@ class TestPim < CiscoTestCase
 
   # Tests multiple ssm ranges overwrite under different vrfs
   #-----------------------------------------------
-  def test_multiple_ssm_range_overwrite_multiple_vrfs
+  def test_ssm_range_multiple_overwrite
     %w(ipv4).each do |afi|
       create_multiple_ssm_range_overwrite_multiple_vrfs(afi)
     end
@@ -171,7 +171,7 @@ class TestPim < CiscoTestCase
 
   # Tests single invalid ssm range under vrf default
   #---------------------------------------------------
-  def test_single_invalid_ssm_range_single_vrf
+  def test_ssm_range_inv
     %w(ipv4).each do |afi|
       create_single_invalid_ssm_range_single_vrf(afi)
     end

data/tests/test_pim_group_list.rb

@@ -31,7 +31,7 @@ require_relative '../lib/cisco_node_utils/pim_group_list'
 include Cisco
 
 # TestPim - Minitest for PimGrouplist
-class TestPimGroupList < CiscoTestCase
+class TestPimGrpLst < CiscoTestCase
   @skip_unless_supported = 'pim'
 
   # Enables feature pim
@@ -144,40 +144,4 @@ class TestPimGroupList < CiscoTestCase
       all_group_lists(afi)
     end
   end
-
-  # Creates single invalid rp address single grouplist vrf default
-  #---------------------------------------------------------------
-  def create_single_invalid_rpaddr_single_grouplist_single_vrf(afi)
-    rp_addr = '256.256.256.256'
-    grouplist = '224.0.0.0/8'
-    assert_raises(CliError) do
-      PimGroupList.new(afi, 'default', rp_addr, grouplist)
-    end
-  end
-
-  # Tests single invalid rp address single grouplist vrf default
-  #---------------------------------------------------------------
-  def test_single_invalid_rpaddr_single_grouplist_single_vrf
-    %w(ipv4).each do |afi|
-      create_single_invalid_rpaddr_single_grouplist_single_vrf(afi)
-    end
-  end
-
-  # Creates single rp address single invalid grouplist single vrf
-  #---------------------------------------------------------------
-  def create_single_rpaddr_single_invalid_grouplist_single_vrf(afi)
-    rp_addr = '25.25.25.25'
-    grouplist = '25.0.0.0/8'
-    assert_raises(CliError) do
-      PimGroupList.new(afi, 'red', rp_addr, grouplist)
-    end
-  end
-
-  # Tests single rp address single invalid grouplist single vrf
-  #---------------------------------------------------------------
-  def test_single_rpaddr_single_invalid_grouplist_single_vrf
-    %w(ipv4).each do |afi|
-      create_single_rpaddr_single_invalid_grouplist_single_vrf(afi)
-    end
-  end
 end

data/tests/test_pim_rp_address.rb

@@ -147,7 +147,7 @@ class TestPimRpAddress < CiscoTestCase
 
   # Tests single invalid rp address under vrf default
   #---------------------------------------------------
-  def test_single_invalid_rpaddr_single_vrf
+  def test_rpaddr
     %w(ipv4).each do |afi|
       create_single_invalid_rpaddr_single_vrf(afi)
     end

data/tests/test_platform.rb

@@ -42,7 +42,7 @@ class TestPlatform < CiscoTestCase
     if platform == :ios_xr
       assert_nil(Platform.system_image)
     elsif platform == :nexus
-      s = @device.cmd('show version | i image').scan(/ (\S+)$/).flatten.first
+      s = @device.cmd('show version | inc image | exc kickstart').scan(/ (\S+)$/).flatten.first
       assert_equal(s, Platform.system_image)
     end
   end
@@ -115,16 +115,6 @@ class TestPlatform < CiscoTestCase
     assert_equal(s.gsub(/\d+ sec/, ''), Platform.uptime.gsub(/\d+ sec/, ''))
   end
 
-  def test_last_reset
-    s = @device.cmd('sh ver').scan(/usecs after\s+(.*)/).flatten.first
-    if Utils.nexus_i2_image
-      # Platform issue CSCuy72214, uncertain if this will ever be fixed in I2
-      assert_nil(Platform.last_reset)
-    else
-      assert_equal(s, Platform.last_reset)
-    end
-  end
-
   def test_reset_reason
     s = @device.cmd('sh ver').scan(/Reason: (.*)/).flatten.first
     assert_equal(s, Platform.reset_reason)
@@ -221,6 +211,14 @@ class TestPlatform < CiscoTestCase
   end
 
   def test_virtual_services
+    if validate_property_excluded?('virtual_service', 'services')
+      assert_nil(node.config_get('virtual_service', 'services'))
+      return
+    end
+    # Only run this test if a virtual-service is installed
+    if config('show virtual-service global')[/services installed : 0$/]
+      skip('This test requires a virtual-service to be installed')
+    end
     # this would be beyond ugly to parse from ascii, utilize config_get
     vir_arr = node.config_get('virtual_service', 'services')
     vir_arr = [vir_arr] if vir_arr.is_a? Hash

data/tests/test_portchannel_global.rb

@@ -14,6 +14,7 @@
 
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/portchannel_global'
+require_relative '../lib/cisco_node_utils/platform'
 
 # TestX__CLASS_NAME__X - Minitest for X__CLASS_NAME__X node utility class
 class TestPortchannelGlobal < CiscoTestCase
@@ -37,13 +38,18 @@ class TestPortchannelGlobal < CiscoTestCase
     config_no_warn "no port-channel load-balance #{ethernet}"
   end
 
+  def n3k_is_t2?
+    return unless /N3/ =~ node.product_id
+    Platform.chassis['descr'][/(Nexus3000 C31|Nexus 31)/] ? true : false
+  end
+
   def n3k_in_n3k_mode?
     return unless /N3/ =~ node.product_id
     mode = config('show system switch-mode')
     # note: an n3k in n9k mode displays: 'system switch-mode n9k'
     patterns = ['system switch-mode n3k',
-                'Switch mode configuration is not not applicable']
-    mode[Regexp.union(patterns)] ? true : false
+                'Switch mode configuration is not.*applicable']
+    mode.match("#{patterns[0]}|#{patterns[1]}") ? true : false
   end
 
   def create_portchannel_global(name=DEFAULT_NAME)
@@ -113,11 +119,45 @@ class TestPortchannelGlobal < CiscoTestCase
       global.resilient = global.default_resilient
       assert_equal(global.default_resilient, global.resilient)
     end
+  rescue Cisco::CliError => e
+    check_and_raise_error(e, 'This feature is not supported on this platform')
   end
 
-  def test_load_balance_no_rotate
+  def test_load_balance_no_rotate_no_symmetry
     skip('Test not supported on this platform') unless n3k_in_n3k_mode?
 
+    global = create_portchannel_global
+    global.send(:port_channel_load_balance=,
+                'src-dst', 'ip-only', nil, nil, false, nil, nil)
+    assert_equal('src-dst',
+                 global.bundle_select)
+    assert_equal('ip-only',
+                 global.bundle_hash)
+    assert_equal(false, global.symmetry)
+    global.send(
+      :port_channel_load_balance=,
+      global.default_bundle_select,
+      global.default_bundle_hash,
+      nil,
+      nil,
+      global.default_symmetry,
+      nil,
+      nil)
+    assert_equal(
+      global.default_bundle_select,
+      global.bundle_select)
+    assert_equal(
+      global.default_bundle_hash,
+      global.bundle_hash)
+    assert_equal(
+      global.default_symmetry,
+      global.symmetry)
+  end
+
+  def test_load_balance_no_rotate
+    skip('Test not supported on this platform') unless
+      n3k_is_t2? && n3k_in_n3k_mode?
+
     global = create_portchannel_global
     global.send(:port_channel_load_balance=,
                 'src-dst', 'ip-only', nil, nil, true, nil, nil)