cisco_node_utils 1.4.1 → 1.5.0

data/tests/test_node_ext.rb

@@ -141,9 +141,15 @@ class TestNodeExt < CiscoTestCase
   end
 
   def test_get_product_id
+    # N9K Fretta product_id gets a '-F' appended so remove it for this check
+    if Utils.image_version?(/7.0.3.F/)
+      chassis = node.product_id.sub('-F', '')
+    else
+      chassis = node.product_id
+    end
     assert_output_check(command: 'show inventory',
                         pattern: /NAME: \"#{@chassis}\".*\nPID: (\S+)/,
-                        check:   node.product_id,
+                        check:   chassis,
                         msg:     'Error, Product id does not match')
   end
 

data/tests/test_pim.rb

@@ -77,6 +77,8 @@ class TestPim < CiscoTestCase
     p1 = Pim.new(afi, 'default')
     p1.ssm_range = (range)
     assert_equal(p1.ssm_range.split.sort.join(' '), range.split.sort.join(' '))
+    p1.ssm_range = 'none'
+    assert_equal('none', p1.ssm_range)
   end
 
   # Tests single ssm range none under default vrf
@@ -94,6 +96,8 @@ class TestPim < CiscoTestCase
     p1 = Pim.new(afi, 'default')
     p1.ssm_range = (range)
     assert_equal(p1.ssm_range.split.sort.join(' '), range.split.sort.join(' '))
+    p1.ssm_range = 'none'
+    assert_equal('none', p1.ssm_range)
   end
 
   # Tests single ssm range none under default vrf
@@ -119,6 +123,10 @@ class TestPim < CiscoTestCase
     assert_equal(p1.ssm_range.split.sort.join(' '), range1.split.sort.join(' '))
     assert_equal(p2.ssm_range.split.sort.join(' '), range2.split.sort.join(' '))
     assert_equal(p3.ssm_range.split.sort.join(' '), range3.split.sort.join(' '))
+    p1.ssm_range = 'none'
+    assert_equal('none', p1.ssm_range)
+    p2.ssm_range = 'none'
+    assert_equal('none', p2.ssm_range)
   end
 
   # Tests multiple ssm ranges under different vrfs
@@ -144,11 +152,10 @@ class TestPim < CiscoTestCase
     p2.ssm_range = (range3)
     assert_equal(p2.ssm_range.split.sort.join(' '), range3.split.sort.join(' '))
 
+    p1.ssm_range = 'none'
+    assert_equal('none', p1.ssm_range)
     p1.destroy
-    assert('none', p1.ssm_range)
-
     p2.destroy
-    assert('none', p2.ssm_range)
   end
 
   # Tests multiple ssm ranges overwrite under different vrfs
@@ -176,4 +183,21 @@ class TestPim < CiscoTestCase
       create_single_invalid_ssm_range_single_vrf(afi)
     end
   end
+
+  def test_bfd
+    %w(ipv4).each do |afi|
+      p1 = Pim.new(afi, 'default')
+      p2 = Pim.new(afi, 'red')
+      assert_equal(p1.default_bfd, p1.bfd)
+      assert_equal(p2.default_bfd, p1.bfd)
+      p1.bfd = true
+      p2.bfd = true
+      assert_equal(true, p1.bfd)
+      assert_equal(true, p2.bfd)
+      p1.bfd = p1.default_bfd
+      p2.bfd = p2.default_bfd
+      assert_equal(p1.default_bfd, p1.bfd)
+      assert_equal(p2.default_bfd, p1.bfd)
+    end
+  end
 end

data/tests/test_platform.rb

@@ -51,7 +51,7 @@ class TestPlatform < CiscoTestCase
     # [['pack1', 'state1'], ['pack2', 'state2'], ...]
     # 'state' should always be a variant of Active or Inactive
     pkgs = @device.cmd('sh inst patch')
-           .scan(/\n(\S+)\s+(\S*[aA]ctive.*)\n/)
+           .scan(/\n(\S+)\s+(\S*[aA]ctive.*)/)
     # convert to hash with key pkg_name and value pkg_state
     pkg_hsh = {}
     pkgs.each { |p| pkg_hsh[p[0]] = p[1].downcase }

data/tests/test_radius_global.rb

@@ -66,11 +66,10 @@ class TestRadiusGlobal < CiscoTestCase
                  2)
 
     if platform == :nexus
-      global.key_set('44444444', nil)
-      assert_equal(global.key,
-                   '44444444')
-      assert_equal(Cisco::RadiusGlobal.radius_global[id].key,
-                   '44444444')
+      key = '44444444'
+      global.key_set(key, nil)
+      assert_equal(Utils.add_quotes(key), global.key)
+      assert_equal(Utils.add_quotes(key), Cisco::RadiusGlobal.radius_global[id].key)
     elsif platform == :ios_xr
       global.key_set('QsEfThUkO', nil)
       assert(!global.key.nil?)

data/tests/test_radius_server.rb

@@ -96,8 +96,9 @@ class TestRadiusSvr < CiscoTestCase
       server.key_set(nil, nil)
       assert_equal(nil, Cisco::RadiusServer.radiusservers[id].key)
 
-      server.key_set('44444444', nil)
-      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+      key = '44444444'
+      server.key_set(key, nil)
+      assert_equal(Utils.add_quotes(key), Cisco::RadiusServer.radiusservers[id].key)
     else
       assert_nil(server.accounting)
       assert_raises(Cisco::UnsupportedError) do
@@ -159,8 +160,9 @@ class TestRadiusSvr < CiscoTestCase
       server.auth_port = 77
       assert_equal(77, Cisco::RadiusServer.radiusservers[id].auth_port)
 
-      server.key_set('44444444', nil)
-      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+      key = '44444444'
+      server.key_set(key, nil)
+      assert_equal(Utils.add_quotes(key), Cisco::RadiusServer.radiusservers[id].key)
     else
       assert_nil(server.accounting)
       assert_raises(Cisco::UnsupportedError) do
@@ -223,8 +225,9 @@ class TestRadiusSvr < CiscoTestCase
       server.auth_port = 77
       assert_equal(77, Cisco::RadiusServer.radiusservers[id].auth_port)
 
-      server.key_set('44444444', nil)
-      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+      key = '44444444'
+      server.key_set(key, nil)
+      assert_equal(Utils.add_quotes(key), Cisco::RadiusServer.radiusservers[id].key)
     else
       assert_nil(server.accounting)
       assert_raises(Cisco::UnsupportedError) do
@@ -293,9 +296,10 @@ class TestRadiusSvr < CiscoTestCase
       server.auth_port = 77
       assert_equal(77, Cisco::RadiusServer.radiusservers[id].auth_port)
 
-      server.key_set('44444444', nil)
-      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
-      assert_equal('44444444', server.key)
+      key = '44444444'
+      server.key_set(key, nil)
+      assert_equal(Utils.add_quotes(key), Cisco::RadiusServer.radiusservers[id].key)
+      assert_equal(Utils.add_quotes(key), server.key)
     else
       assert_nil(server.accounting)
       assert_raises(Cisco::UnsupportedError) do
@@ -327,8 +331,9 @@ class TestRadiusSvr < CiscoTestCase
       server2.auth_port = 77
       assert_equal(77, Cisco::RadiusServer.radiusservers[id2].auth_port)
 
-      server2.key_set('44444444', nil)
-      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id2].key)
+      key = '44444444'
+      server2.key_set(key, nil)
+      assert_equal(Utils.add_quotes(key), Cisco::RadiusServer.radiusservers[id2].key)
     else
       assert_nil(server.accounting)
       assert_raises(Cisco::UnsupportedError) do

data/tests/test_router_bgp.rb

@@ -61,9 +61,11 @@ def setup_vrf
 end
 
 def newer_image_version?
-  return false if Utils.image_version?(/7.0.3.I2|I3|I4/) ||
-                  Utils.chassis_pid?(/N(5|6|7|8)/)
-  true
+  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
 end
 
 # TestRouterBgp - Minitest for RouterBgp class
@@ -666,7 +668,8 @@ class TestRouterBgp < CiscoTestCase
     bgp.event_history_errors = 'false'
     assert_equal('false', bgp.event_history_errors)
     bgp.event_history_errors = 'size_small'
-    assert_equal('size_small', bgp.event_history_errors)
+    assert_equal('size_small', bgp.event_history_errors) unless
+      Utils.image_version?(/8.0/)
     bgp.event_history_errors = 'size_large'
     assert_equal('size_large', bgp.event_history_errors)
     bgp.event_history_errors = 'size_medium'
@@ -752,7 +755,8 @@ class TestRouterBgp < CiscoTestCase
     assert_equal(bgp.default_event_history_periodic,
                  bgp.event_history_periodic)
     bgp.event_history_periodic = 'false'
-    assert_equal('false', bgp.event_history_periodic)
+    assert_equal('false', bgp.event_history_periodic) unless
+      Utils.image_version?(/8.0/)
     bgp.event_history_periodic = 'size_small'
     assert_equal('size_small', bgp.event_history_periodic)
     bgp.event_history_periodic = 'size_large'
@@ -770,7 +774,8 @@ class TestRouterBgp < CiscoTestCase
     end
     bgp.event_history_periodic = 'true'
     if newer_image_version?
-      assert_equal('true', bgp.event_history_periodic)
+      assert_equal('true', bgp.event_history_periodic) unless
+        Utils.image_version?(/8.0/)
     else
       assert_equal(bgp.default_event_history_periodic,
                    bgp.event_history_periodic)

data/tests/test_router_ospf_area.rb

@@ -52,16 +52,16 @@ class TestRouterOspfArea < CiscoTestCase
     av.stub = true
     assert_equal(2, RouterOspfArea.areas['Wolfpack'].size)
     av.destroy
-    # on n8k (only), we cannot remove "area <area> default-cost 1",
+    # on n9k-f (only), we cannot remove "area <area> default-cost 1",
     # unless the entire ospf router is removed. The default value of
     # default_cost is 1 and so this is just a cosmetic issue but
     # need to skip the below test as the size will be wrong.
     # platform as the size will be wrong. bug ID: CSCva04066
     assert_equal(1, RouterOspfArea.areas['Wolfpack'].size) unless
-      /N8/ =~ node.product_id
+      /N9K.*-F/ =~ node.product_id
     ad.destroy
     assert_empty(RouterOspfArea.areas) unless
-      /N8/ =~ node.product_id
+      /N9K.*-F/ =~ node.product_id
   end
 
   def test_authentication
@@ -237,21 +237,21 @@ class TestRouterOspfArea < CiscoTestCase
     assert_equal(ad.default_nssa_no_redistribution, ad.nssa_no_redistribution)
     assert_equal(ad.default_nssa_no_summary, ad.nssa_no_summary)
     assert_equal(ad.default_nssa_route_map, ad.nssa_route_map)
-    # on n8k (only), we cannot configure
+    # on n9k-f (only), we cannot configure
     # "area <area> nssa default-information-originate",
     # properly if we reset it first. It is only configuring nssa
     # but not the other parameters. bug ID: CSCva11482
     hash[:nssa_route_map] = 'aaa'
     ad.nssa_set(hash)
     assert_equal(true, ad.nssa)
-    if node.product_id[/N8/]
+    if node.product_id[/N9K-F/]
       refute(ad.nssa_default_originate)
     else
       assert(ad.nssa_default_originate)
     end
     assert_equal(ad.default_nssa_no_redistribution, ad.nssa_no_redistribution)
     assert_equal(ad.default_nssa_no_summary, ad.nssa_no_summary)
-    if node.product_id[/N8/]
+    if node.product_id[/N9K-F/]
       refute_equal('aaa', ad.nssa_route_map)
     else
       assert_equal('aaa', ad.nssa_route_map)

data/tests/test_tacacs_server.rb

@@ -140,7 +140,7 @@ class TestTacacsServer < CiscoTestCase
     tacacs = TacacsServer.new
 
     if platform == :nexus
-      assert_equal(sh_run_encryption_password,
+      assert_equal(Utils.add_quotes(sh_run_encryption_password),
                    tacacs.encryption_password,
                    'Error: Tacacs Server, encryption password incorrect')
     elsif platform == :ios_xr
@@ -186,7 +186,7 @@ class TestTacacsServer < CiscoTestCase
     encrypted_type = md.to_s.split(' ').last.to_i
     assert_equal(encrypted_type, tacacs.encryption_type,
                  'Error: Tacacs Server, encryption type incorrect')
-    assert_equal(encrypted_password, tacacs.encryption_password,
+    assert_equal(Utils.add_quotes(encrypted_password), tacacs.encryption_password,
                  'Error: Tacacs Server, encryption password incorrect')
     tacacs.destroy
   end

data/tests/test_tacacs_server_host.rb

@@ -299,7 +299,7 @@ class TestTacacsSvrHost < CiscoTestCase
     host.encryption_key_set(0, pass)
 
     if platform != :ios_xr
-      assert_equal(sh_run_pass, host.encryption_password,
+      assert_equal(Utils.add_quotes(sh_run_pass), host.encryption_password,
                    'Error: Tacacs Host encryption password incorrect')
     else
       # Only do not-nil checking for IOS XR
@@ -339,7 +339,7 @@ class TestTacacsSvrHost < CiscoTestCase
       pass_no_quotes = md.captures[1].gsub(/(?:^\")|(?:\"$)/, '')
       assert_equal(sh_run_pass, pass_no_quotes,
                    'Error: Tacacs Host encryption password mismatch')
-      assert_equal(sh_run_pass, host.encryption_password,
+      assert_equal(Utils.add_quotes(sh_run_pass), host.encryption_password,
                    'Error: Tacacs Host encryption password incorrect')
     else
       # Only do not-nil checking for IOS XR

data/tests/test_vlan.rb

@@ -149,6 +149,20 @@ class TestVlan < CiscoTestCase
     v.destroy
   end
 
+  def test_name_long
+    config 'system vlan long-name'
+    v = Vlan.new(1000)
+    name = 'LONG_NAME' + ('E' * 119)
+    v.vlan_name = name
+    assert_equal(name, v.vlan_name)
+    name = 'LONG_NAME' + ('E' * 120)
+    assert_raises(Cisco::CliError) do
+      v.vlan_name = name
+    end
+    v.destroy
+    config 'no system vlan long-name'
+  end
+
   def test_state_invalid
     v = Vlan.new(1000)
     assert_raises(CliError) do

data/tests/test_yum.rb

@@ -122,10 +122,10 @@ class TestYum < CiscoTestCase
   end
 
   def test_package_does_not_exist_error
-    assert_raises(RuntimeError) do
+    assert_raises(Cisco::CliError) do
       Yum.install('bootflash:this_is_not_real.rpm', 'management')
     end
-    assert_raises(RuntimeError) do
+    assert_raises(Cisco::CliError) do
       Yum.install('also_not_real', 'management')
     end
   end

data/tests/yum_package.yaml

@@ -33,3 +33,7 @@
   name:     'nxos.sample-n9k_ALL'
   version:  '1.0.0-7.0.3.I5.1'
 
+7_0_3_F1_1_:
+  filename: 'nxos.sample-n8k_EOR-1.0.0-7.0.3.F1.1.lib32_nxos.rpm'
+  name:     'nxos.sample-n8k_EOR'
+  version:  '1.0.0-7.0.3.F1.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cisco_node_utils
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Rob Gries
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,9 +209,11 @@ files:
 - lib/cisco_node_utils/cmd_ref/fabricpath.yaml
 - lib/cisco_node_utils/cmd_ref/fabricpath_topology.yaml
 - lib/cisco_node_utils/cmd_ref/feature.yaml
+- lib/cisco_node_utils/cmd_ref/hsrp_global.yaml
 - lib/cisco_node_utils/cmd_ref/images.yaml
 - lib/cisco_node_utils/cmd_ref/interface.yaml
 - lib/cisco_node_utils/cmd_ref/interface_channel_group.yaml
+- lib/cisco_node_utils/cmd_ref/interface_hsrp_group.yaml
 - lib/cisco_node_utils/cmd_ref/interface_ospf.yaml
 - lib/cisco_node_utils/cmd_ref/interface_portchannel.yaml
 - lib/cisco_node_utils/cmd_ref/interface_service_vni.yaml
@@ -270,9 +272,11 @@ files:
 - lib/cisco_node_utils/fabricpath_global.rb
 - lib/cisco_node_utils/fabricpath_topology.rb
 - lib/cisco_node_utils/feature.rb
+- lib/cisco_node_utils/hsrp_global.rb
 - lib/cisco_node_utils/interface.rb
 - lib/cisco_node_utils/interface_DEPRECATED.rb
 - lib/cisco_node_utils/interface_channel_group.rb
+- lib/cisco_node_utils/interface_hsrp_group.rb
 - lib/cisco_node_utils/interface_ospf.rb
 - lib/cisco_node_utils/interface_portchannel.rb
 - lib/cisco_node_utils/interface_service_vni.rb
@@ -372,9 +376,12 @@ files:
 - tests/test_fabricpath_topology.rb
 - tests/test_feature.rb
 - tests/test_grpc.rb
+- tests/test_hsrp_global.rb
 - tests/test_interface.rb
 - tests/test_interface_bdi.rb
 - tests/test_interface_channel_group.rb
+- tests/test_interface_hsrp.rb
+- tests/test_interface_hsrp_group.rb
 - tests/test_interface_ospf.rb
 - tests/test_interface_portchannel.rb
 - tests/test_interface_private_vlan.rb
@@ -451,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Utilities for management of Cisco network nodes