cisco_node_utils 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e72699d560ddb617cfe0a637565d0313ba7ba9f6
-  data.tar.gz: a25d1820c2a7bc3bf28ef1fdc79c2124bbb51b49
+  metadata.gz: 564e7f738b94277341aac0cd79f9969311c1e7cd
+  data.tar.gz: 93ae60e8ff3348f14d1f7ad98125ad06bd535a1a
 SHA512:
-  metadata.gz: a5a0cbafbb485e2c47fa4ab9bab300c713ecaba4609fc23f8f8bcf940019d74c5cd054e7e637fd50ab381bdb1cf2a7d27eb7326ca236ccab6537f66a2e6494aa
-  data.tar.gz: 7ed873f928991caf6088cf48753af8bb0ec9afc5e1c005aa5da49f82cea8c3cfea52843fb7673173ffac940eb1c846b09100018a8f12a5bcd8bcdf59e3da2635
+  metadata.gz: 8cde277306e924d1f0edce1549b6f3e835fb389098005770258ab3e4dd7c2b0301b22291516b174d44f270dd9d0041fd81356f8aed8c9ed91e88287eb5b89328
+  data.tar.gz: dcc9931ea33f770f3864a07c3b9e1859df09a7aa52e5003f97a0bd956fa0379e29d8970949732a8ece42eb92b82eb1f1e599cf6e2878e7339b15e502e91ebb6e

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+## [v1.4.1]
+
+### Added
+
+* Extend bgp with attributes:
+   * `event_history_errors`
+   * `event_history_objstore`
+* Added support for Cisco NX-OS software release `7.3(0)I5(1)`
+
 ## [v1.4.0]
 
 ### New feature support
@@ -359,6 +368,7 @@ Changelog
 [git-flow]: https://github.com/petervanderdoes/gitflow-avh
 [SimpleCov]: https://github.com/colszowka/simplecov
 
+[v1.4.1]: https://github.com/cisco/cisco-network-node-utils/compare/v1.4.0...v1.4.1
 [v1.4.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.3.0...v1.4.0
 [v1.3.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.2.0...v1.3.0
 [v1.2.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.1.0...v1.2.0

data/lib/cisco_node_utils/bgp.rb

@@ -416,13 +416,16 @@ module Cisco
       match = config_get('bgp', 'event_history_cli', @get_args)
       if match.is_a?(Array)
         return 'false' if match[0] == 'no '
-        return 'size_' + match[1] if match[1]
+        if match[1]
+          return match[1] if match[1][/\A\d+\z/]
+          return 'size_' + match[1]
+        end
       end
       default_event_history_cli
     end
 
     def event_history_cli=(val)
-      size = val[/small|medium|large|disable/]
+      size = val[/small|medium|large|disable|\A\d+\z/]
       @set_args[:size] = size.nil? ? '' : "size #{size}"
       @set_args[:state] = val[/false/] ? 'no' : ''
       config_set('bgp', 'event_history_cli', @set_args)
@@ -437,16 +440,19 @@ module Cisco
     # Nvgen as True With optional 'size <size>
     def event_history_detail
       match = config_get('bgp', 'event_history_detail', @get_args)
-      # This property requires auto_default=false
       if match.is_a?(Array)
         return 'false' if match[0] == 'no '
-        return 'size_' + match[1] if match[1]
+        if match[1]
+          return match[1] if match[1][/\A\d+\z/]
+          return 'size_' + match[1]
+        end
+        return 'true'
       end
       default_event_history_detail
     end
 
     def event_history_detail=(val)
-      size = val[/small|medium|large|disable/]
+      size = val[/small|medium|large|disable|\A\d+\z/]
       @set_args[:size] = size.nil? ? '' : "size #{size}"
       @set_args[:state] = val[/false/] ? 'no' : ''
       config_set('bgp', 'event_history_detail', @set_args)
@@ -457,19 +463,48 @@ module Cisco
       config_get_default('bgp', 'event_history_detail')
     end
 
+    # event-history errors [ size <size> ]
+    # Nvgen as True With optional 'size <size>
+    def event_history_errors
+      match = config_get('bgp', 'event_history_errors', @get_args)
+      if match.is_a?(Array)
+        return 'false' if match[0] == 'no '
+        if match[1]
+          return match[1] if match[1][/\A\d+\z/]
+          return 'size_' + match[1]
+        end
+      end
+      default_event_history_errors
+    end
+
+    def event_history_errors=(val)
+      size = val[/small|medium|large|disable|\A\d+\z/]
+      @set_args[:size] = size.nil? ? '' : "size #{size}"
+      @set_args[:state] = val[/false/] ? 'no' : ''
+      config_set('bgp', 'event_history_errors', @set_args)
+      set_args_keys_default
+    end
+
+    def default_event_history_errors
+      config_get_default('bgp', 'event_history_errors')
+    end
+
     # event-history events [ size <size> ]
     # Nvgen as True With optional 'size <size>
     def event_history_events
       match = config_get('bgp', 'event_history_events', @get_args)
       if match.is_a?(Array)
-        return 'size_disable' if match[0] == 'no '
-        return 'size_' + match[1] if match[1]
+        return 'false' if match[0] == 'no '
+        if match[1]
+          return match[1] if match[1][/\A\d+\z/]
+          return 'size_' + match[1]
+        end
       end
       default_event_history_events
     end
 
     def event_history_events=(val)
-      size = val[/small|medium|large|disable/]
+      size = val[/small|medium|large|disable|\A\d+\z/]
       @set_args[:size] = size.nil? ? '' : "size #{size}"
       @set_args[:state] = val[/false/] ? 'no' : ''
       config_set('bgp', 'event_history_events', @set_args)
@@ -477,7 +512,39 @@ module Cisco
     end
 
     def default_event_history_events
-      config_get_default('bgp', 'event_history_events')
+      if Utils.image_version?(/7.0.3.I2|I3|I4/) ||
+         Utils.chassis_pid?(/N(5|6|7|8)/)
+        config_get_default('bgp', 'event_history_events')
+      else
+        config_get('bgp', 'event_history_events_bytes', @get_args)
+      end
+    end
+
+    # event-history objstore [ size <size> ]
+    # Nvgen as True With optional 'size <size>
+    def event_history_objstore
+      match = config_get('bgp', 'event_history_objstore', @get_args)
+      if match.is_a?(Array)
+        return 'false' if match[0] == 'no '
+        if match[1]
+          return match[1] if match[1][/\A\d+\z/]
+          return 'size_' + match[1]
+        end
+        return 'true'
+      end
+      default_event_history_objstore
+    end
+
+    def event_history_objstore=(val)
+      size = val[/small|medium|large|disable|\A\d+\z/]
+      @set_args[:size] = size.nil? ? '' : "size #{size}"
+      @set_args[:state] = val[/false/] ? 'no' : ''
+      config_set('bgp', 'event_history_objstore', @set_args)
+      set_args_keys_default
+    end
+
+    def default_event_history_objstore
+      config_get_default('bgp', 'event_history_objstore')
     end
 
     # event-history periodic [ size <size> ]
@@ -486,13 +553,19 @@ module Cisco
       match = config_get('bgp', 'event_history_periodic', @get_args)
       if match.is_a?(Array)
         return 'false' if match[0] == 'no '
-        return 'size_' + match[1] if match[1]
+        if match[1]
+          return match[1] if match[1][/\A\d+\z/]
+          return 'size_' + match[1]
+        end
+      else
+        return default_event_history_periodic
       end
+      return 'true' unless default_event_history_periodic[/size/]
       default_event_history_periodic
     end
 
     def event_history_periodic=(val)
-      size = val[/small|medium|large|disable/]
+      size = val[/small|medium|large|disable|\A\d+\z/] unless val[/false|true/]
       @set_args[:size] = size.nil? ? '' : "size #{size}"
       @set_args[:state] = val[/false/] ? 'no' : ''
       config_set('bgp', 'event_history_periodic', @set_args)
@@ -500,7 +573,12 @@ module Cisco
     end
 
     def default_event_history_periodic
-      config_get_default('bgp', 'event_history_periodic')
+      if Utils.image_version?(/7.0.3.I2|I3|I4/) ||
+         Utils.chassis_pid?(/N(5|6|7|8)/)
+        config_get_default('bgp', 'event_history_periodic')
+      else
+        config_get('bgp', 'event_history_periodic_bytes', @get_args)
+      end
     end
 
     # Fast External fallover (Getter/Setter/Default)

data/lib/cisco_node_utils/bgp_neighbor_af.rb

@@ -565,7 +565,7 @@ module Cisco
     # sense to split up the individual methods to support them
     def send_community
       val = config_get('bgp_neighbor_af', 'send_community', @get_args)
-      return default_send_community if val.nil?
+      return default_send_community if val.nil? || val.empty?
       platform == :nexus ? send_community_nexus(val) : send_community_xr(val)
     end
 
@@ -573,7 +573,9 @@ module Cisco
     #  NOTE: 'standard' is default but does not nvgen on some platforms
     #  Returns: none, both, extended, or standard
     def send_community_nexus(val)
-      val = val.split.last
+      reg = 'send-community extended|send-community standard|send-community'
+      return 'both' if val.grep(/#{reg}/).size == 2
+      val = val[0].split.last
       return 'standard' if val[/send-community/] # Workaround
       val
     end

data/lib/cisco_node_utils/cisco_cmn_utils.rb

@@ -103,6 +103,16 @@ module Cisco
       true if Platform.image_version[/7.0.3.I2/]
     end
 
+    def self.image_version?(ver_regexp)
+      require_relative 'platform'
+      return true if Platform.image_version[ver_regexp]
+    end
+
+    def self.chassis_pid?(ver_regexp)
+      require_relative 'platform'
+      return true if Platform.chassis['pid'][ver_regexp]
+    end
+
     # Helper utility method for ip/prefix format networks.
     # For ip/prefix format '1.1.1.1/24' or '2000:123:38::34/64',
     # we need to mask the address using the prefix length so that they

data/lib/cisco_node_utils/cmd_ref/bgp.yaml

@@ -156,8 +156,13 @@ event_history_detail:
   _exclude: [ios_xr]
   get_value: '/^(no )?event-history detail(?: size (\S+))?$/'
   set_value: '<state> event-history detail <size>'
-  auto_default: false
-  default_value: 'size_disable'
+  default_value: 'false'
+
+event_history_errors:
+  _exclude: [ios_xr]
+  get_value: '/^(no )?event-history errors(?: size (\S+))?$/'
+  set_value: '<state> event-history errors <size>'
+  default_value: 'size_medium'
 
 event_history_events:
   _exclude: [ios_xr]
@@ -165,12 +170,24 @@ event_history_events:
   set_value: '<state> event-history events <size>'
   default_value: 'size_small'
 
+event_history_events_bytes:
+  default_only: 'size_large'
+
+event_history_objstore:
+  _exclude: [ios_xr]
+  get_value: '/^(no )?event-history objstore(?: size (\S+))?$/'
+  set_value: '<state> event-history objstore <size>'
+  default_value: 'false'
+
 event_history_periodic:
   _exclude: [ios_xr]
   get_value: '/^(no )?event-history periodic(?: size (\S+))?$/'
   set_value: '<state> event-history periodic <size>'
   default_value: 'size_small'
 
+event_history_periodic_bytes:
+  default_only: 'false'
+
 fast_external_fallover:
   kind: boolean
   default_value: true

data/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml

@@ -168,13 +168,13 @@ route_reflector_client:
   default_value: false
 
 send_community:
+  multiple:
   auto_default: false
   default_value: 'none'
   nexus:
     get_value: '/^send-community(?: .*)?/'
     set_value: '<state> send-community <attr>'
   ios_xr:
-    multiple:
     # XR three seperate commands: send-community-ebgp  send-community-gshut-ebgp
     # and send-extended-community-ebgp
     # send-community-ebgp' and 'send-extended-community-ebgp' are the equivalents

data/lib/cisco_node_utils/cmd_ref/interface_portchannel.yaml

@@ -49,10 +49,22 @@ lacp_min_links:
 
 lacp_suspend_individual:
   kind: boolean
-  auto_default: false
   get_value: '/^lacp suspend.individual$/'
   set_value: "%s lacp suspend-individual"
-  default_value: true
+  N3k:
+    default_value: false
+  else:
+    auto_default: false
+    default_value: true
+
+lacp_suspend_shut_needed:
+  # This is used to determine if the port-channel interface
+  # must be shutdown before setting lacp_suspend_individual
+  kind: boolean
+  N9k:
+    default_only: true
+  else:
+    default_only: false
 
 port_hash_distribution:
   _exclude: [N6k, N5k]

data/lib/cisco_node_utils/configparser_lib.rb

@@ -125,12 +125,6 @@ module Cisco
             existing << submode.compare_with(config_submode)
             next
           end # if
-
-          prefix, base = base_commands(command)
-          if prefix != '' && !config.include_command?(base)
-            existing << config_line
-            next
-          end
         end
         existing
       end # compare_with

data/lib/cisco_node_utils/interface_portchannel.rb

@@ -115,14 +115,29 @@ module Cisco
       config_get_default('interface_portchannel', 'lacp_min_links')
     end
 
+    def lacp_suspend_shut_needed?
+      config_get('interface_portchannel', 'lacp_suspend_shut_needed')
+    end
+
     def lacp_suspend_individual
       config_get('interface_portchannel', 'lacp_suspend_individual', @name)
     end
 
     def lacp_suspend_individual=(state)
       no_cmd = (state ? '' : 'no')
+      # This property can only be set if the port-channel is shutdown on
+      # some platforms.
+      # This setter will:
+      # 1) Query the current state of the port-channel interface.
+      # 2) Shutdown the port-channel interface if needed.
+      # 3) Set the lacp_suspend_individual property.
+      # 4) Restore the original state of the port-channel interface if needed.
+      int = Interface.new(@name, false)
+      current_state = int.shutdown
+      int.shutdown = true if lacp_suspend_shut_needed? && !current_state
       config_set('interface_portchannel',
                  'lacp_suspend_individual', @name, no_cmd)
+      int.shutdown = current_state unless current_state == int.shutdown
     end
 
     def default_lacp_suspend_individual

data/lib/cisco_node_utils/version.rb

@@ -14,7 +14,7 @@
 
 # Container module for version number only.
 module CiscoNodeUtils
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
   gem_version = Gem::Version.new(Gem::VERSION)
   min_gem_version = Gem::Version.new('2.1.0')
   fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version

data/tests/cmd_config.yaml

@@ -28,6 +28,7 @@ nexus:
             no feature lacp
             no feature dhcp
             no feature vtp
+    nvgen: false
 
   feature-snmp-comm-acl-ro:
     command: |
@@ -40,14 +41,19 @@ nexus:
              snmp-server community admincom use-acl SNMP_RW
 
   feature-int-loopback:
-    command: >
+    command: |
             interface loopback0
               description testloopback
 
   feature-int-portchannel:
-    command: >
+    setup: |
+          interface port-channel100
+            no switchport
+    command: |
+            feature bfd
             interface port-channel100
               description test-portchannel
+              no bfd echo
 
 ios_xr:
   name-server:

data/tests/test_ace.rb

@@ -219,13 +219,21 @@ class TestAce < CiscoTestCase
     end
   end
 
-  def test_ttl
+  def test_ttl_ipv4
     val = '3'
-    %w(ipv4 ipv6).each do |afi|
-      a = ace_helper(afi, ttl: val)
-      skip("This property has a known defect on the platform itself -\n"\
-           'CSCuy47463: access-list ttl does not nvgen') if a.ttl.nil?
-      assert_equal(val, a.ttl)
-    end
+    afi = 'ipv4'
+    a = ace_helper(afi, ttl: val)
+    skip("This property has a known defect on the platform itself -\n"\
+         'CSCuy47463: access-list ttl does not nvgen') if a.ttl.nil?
+    assert_equal(val, a.ttl)
+  end
+
+  def test_ttl_ipv6
+    val = '3'
+    afi = 'ipv6'
+    a = ace_helper(afi, ttl: val)
+    skip("This property has a known defect on the platform itself -\n"\
+         'CSCuy47463: access-list ttl does not nvgen') if a.ttl.nil?
+    assert_equal(val, a.ttl)
   end
 end

data/tests/test_command_config.rb

@@ -44,7 +44,7 @@ class TestCommandConfig < CiscoTestCase
     commands.gsub(/^\s*$\n/, '')
   end # remove_whitespace
 
-  def compare_with_results(desired_config_str, current_key)
+  def compare_with_results(desired_config_str, _current_key, nvgen)
     retrieve_command = 'show running all'
     running_config_str = node.get(command: retrieve_command)
 
@@ -58,14 +58,20 @@ class TestCommandConfig < CiscoTestCase
       puts e.what
     end
     # puts "Existing command block:\n#{existing}"
-    assert_equal(existing.empty?, false,
-                 "Error: Expected configuration \n'#{desired_config_str}'\n " \
-                 "does not exist.\nHash Key: #{current_key}")
+    if nvgen == false
+      msg = "The following configuration should be removed: #{desired_config_str}"
+      assert_equal(existing.empty?, true, msg)
+    else
+      msg = "The following configuration should exist but doesn't: #{desired_config_str}"
+      assert_equal(existing.empty?, false, msg)
+    end
   end
 
   def send_device_config(config_cmd_hash)
     config_cmd_hash.each do |k, v|
-      v.each_value do |v1|
+      v.each do |k1, v1|
+        next if k1 == 'nvgen'
+        config(v1) if k1 == 'setup'
         # Send commands
         cfg_cmd_str = "#{v1.gsub(/^/, '  ')}"
         cfg_string = remove_whitespace(cfg_cmd_str)
@@ -73,7 +79,7 @@ class TestCommandConfig < CiscoTestCase
         begin
           node.set(values: cfg_string)
           # make sure config is present in success case
-          compare_with_results(v1, k)
+          compare_with_results(v1, k, config_cmd_hash[k]['nvgen'])
         rescue CliError => e
           known_failure = e.message[/ERROR:.*port channel not present/]
           refute(known_failure, 'ERROR: port channel not present')
@@ -113,10 +119,10 @@ class TestCommandConfig < CiscoTestCase
   def test_valid_scale
     show_int_count = "show int brief | i '^\S+\s+--' | count"
     pre = @device.cmd(show_int_count)[/^(\d+)$/]
-
     # Add 1024 loopback interfaces
     cfg_hash_add = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
     cfg_hash_add ['loopback-int-add']['command'] = "#{build_int_scale_config}"
+    cfg_hash_add ['loopback-int-add']['nvgen'] = true
     begin
       send_device_config(cfg_hash_add)
     rescue Timeout::Error
@@ -131,6 +137,7 @@ class TestCommandConfig < CiscoTestCase
     cfg_hash_remove = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
     cfg_hash_remove['loopback-int-add']['command'] = \
       "#{build_int_scale_config(false)}"
+    cfg_hash_remove ['loopback-int-add']['nvgen'] = false
     begin
       send_device_config(cfg_hash_remove)
     rescue Timeout::Error

data/tests/test_interface.rb

@@ -566,6 +566,7 @@ class TestInterface < CiscoTestCase
       assert_raises(Cisco::UnsupportedError) { interface.bfd_echo = false }
       return
     end
+    interface.switchport_mode = :disabled
     assert_equal(interface.default_bfd_echo,
                  interface.bfd_echo)
     interface.bfd_echo = false

data/tests/test_interface_portchannel.rb

@@ -94,12 +94,32 @@ class TestInterfacePortChannel < CiscoTestCase
 
   def test_lacp_suspend_individual
     interface = create_port_channel
-    interface.lacp_suspend_individual = false
-    assert_equal(false, interface.lacp_suspend_individual)
-    interface.lacp_suspend_individual =
-      interface.default_lacp_suspend_individual
-    assert_equal(interface.default_lacp_suspend_individual,
-                 interface.lacp_suspend_individual)
+
+    # Run this test with the portchannel in both a 'shutdown'
+    # and 'no shutdown' state.
+    int_obj = Interface.new(interface.name)
+    [true, false].each do |state|
+      int_obj.shutdown = state
+
+      # Test initial default case
+      assert_equal(interface.default_lacp_suspend_individual,
+                   interface.lacp_suspend_individual)
+
+      # Test non-default value
+      val = !interface.default_lacp_suspend_individual
+      interface.lacp_suspend_individual = val
+      assert_equal(val, interface.lacp_suspend_individual)
+
+      # Set back to default
+      interface.lacp_suspend_individual =
+        interface.default_lacp_suspend_individual
+      assert_equal(interface.default_lacp_suspend_individual,
+                   interface.lacp_suspend_individual)
+
+      # Make sure interface ends up in the same state.
+      assert_equal(state, int_obj.shutdown,
+                   "Interface #{int_obj.name} incorrect state after setting property")
+    end
   end
 
   def test_port_load_defer

data/tests/test_router_bgp.rb

@@ -60,6 +60,12 @@ def setup_vrf
   create_bgp_vrf(@asnum, @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
+end
+
 # TestRouterBgp - Minitest for RouterBgp class
 class TestRouterBgp < CiscoTestCase
   @@pre_clean_needed = true # rubocop:disable Style/ClassVars
@@ -580,54 +586,198 @@ class TestRouterBgp < CiscoTestCase
     bgp.destroy
   end
 
-  def test_event_history
+  def test_event_history_cli
     bgp = setup_default
+    if validate_property_excluded?('bgp', 'event_history_cli')
+      assert_nil(bgp.event_history_cli)
+      assert_raises(Cisco::UnsupportedError) do
+        bgp.event_history_cli = 'true'
+      end
+      return
+    end
+    assert_equal(bgp.default_event_history_cli, bgp.event_history_cli)
+    bgp.event_history_cli = 'true'
+    assert_equal(bgp.default_event_history_cli, bgp.event_history_cli)
+    bgp.event_history_cli = 'false'
+    assert_equal('false', bgp.event_history_cli)
+    bgp.event_history_cli = 'size_small'
+    assert_equal('size_small', bgp.event_history_cli)
+    bgp.event_history_cli = 'size_large'
+    assert_equal('size_large', bgp.event_history_cli)
+    bgp.event_history_cli = 'size_medium'
+    assert_equal('size_medium', bgp.event_history_cli)
+    bgp.event_history_cli = 'size_disable'
+    if newer_image_version?
+      assert_equal('false', bgp.event_history_cli)
+    else
+      assert_equal('size_disable', bgp.event_history_cli)
+    end
+    bgp.event_history_cli = '100000'
+    assert_equal('100000', bgp.event_history_cli)
+    bgp.event_history_cli = bgp.default_event_history_cli
+    assert_equal(bgp.default_event_history_cli, bgp.event_history_cli)
+  end
 
-    opts = [:cli, :detail, :events, :periodic]
-    opts.each do |opt|
-      if platform == :ios_xr # unsupported on XR
-        assert_equal(nil, bgp.send("event_history_#{opt}"))
-        assert_equal(nil, bgp.send("default_event_history_#{opt}"))
-        assert_raises(Cisco::UnsupportedError) do
-          bgp.send("event_history_#{opt}=", 'true')
-        end
-        next
+  def test_event_history_detail
+    bgp = setup_default
+    if validate_property_excluded?('bgp', 'event_history_detail')
+      assert_nil(bgp.event_history_detail)
+      assert_raises(Cisco::UnsupportedError) do
+        bgp.event_history_detail = 'true'
+      end
+      return
+    end
+    assert_equal(bgp.default_event_history_detail, bgp.event_history_detail)
+    bgp.event_history_detail = 'true'
+    assert_equal('true', bgp.event_history_detail)
+    bgp.event_history_detail = 'false'
+    assert_equal(bgp.default_event_history_detail, bgp.event_history_detail)
+    bgp.event_history_detail = 'size_small'
+    assert_equal('size_small', bgp.event_history_detail)
+    bgp.event_history_detail = 'size_large'
+    assert_equal('size_large', bgp.event_history_detail)
+    bgp.event_history_detail = 'size_medium'
+    assert_equal('size_medium', bgp.event_history_detail)
+    bgp.event_history_detail = 'size_disable'
+    if newer_image_version?
+      assert_equal('false', bgp.event_history_detail)
+    else
+      assert_equal('size_disable', bgp.event_history_detail)
+    end
+    bgp.event_history_detail = '100000'
+    assert_equal('100000', bgp.event_history_detail)
+    bgp.event_history_detail = bgp.default_event_history_detail
+    assert_equal(bgp.default_event_history_detail, bgp.event_history_detail)
+  end
+
+  def test_event_history_errors
+    bgp = setup_default
+    if validate_property_excluded?('bgp', 'event_history_errors')
+      assert_nil(bgp.event_history_errors)
+      assert_raises(Cisco::UnsupportedError) do
+        bgp.event_history_errors = 'true'
+      end
+      return
+    end
+    skip('platform not supported for this test') unless newer_image_version?
+    assert_equal(bgp.default_event_history_errors, bgp.event_history_errors)
+    bgp.event_history_errors = 'true'
+    assert_equal(bgp.default_event_history_errors, bgp.event_history_errors)
+    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)
+    bgp.event_history_errors = 'size_large'
+    assert_equal('size_large', bgp.event_history_errors)
+    bgp.event_history_errors = 'size_medium'
+    assert_equal('size_medium', bgp.event_history_errors)
+    bgp.event_history_errors = 'size_disable'
+    assert_equal('false', bgp.event_history_errors)
+    bgp.event_history_errors = '100000'
+    assert_equal('100000', bgp.event_history_errors)
+    bgp.event_history_errors = bgp.default_event_history_errors
+    assert_equal(bgp.default_event_history_errors, bgp.event_history_errors)
+  end
+
+  def test_event_history_events
+    bgp = setup_default
+    if validate_property_excluded?('bgp', 'event_history_events')
+      assert_nil(bgp.event_history_events)
+      assert_raises(Cisco::UnsupportedError) do
+        bgp.event_history_events = 'true'
       end
-      # Test basic true
-      bgp.send("event_history_#{opt}=", 'true')
-      set = bgp.send("default_event_history_#{opt}")
-      result = bgp.send("event_history_#{opt}")
-      assert_equal(set, result,
-                   "event_history_#{opt}: Failed to set to default state")
-
-      # Test true with size
-      bgp.send("event_history_#{opt}=", 'size_large')
-      result = bgp.send("event_history_#{opt}")
-      assert_equal('size_large', result,
-                   "event_history_#{opt}: Failed to set True with Size large")
-
-      # Test false with size
-      bgp.send("event_history_#{opt}=", 'false')
-      result = bgp.send("event_history_#{opt}")
-      expected = (opt == :detail) ? bgp.default_event_history_detail : 'false'
-      expected = 'size_disable' if opt == :events
-      assert_equal(expected, result,
-                   "event_history_#{opt}: Failed to set state to False")
-
-      # Test true with size, from false
-      bgp.send("event_history_#{opt}=", 'size_small')
-      result = bgp.send("event_history_#{opt}")
-      assert_equal('size_small', result,
-                   "event_history_#{opt}: Failed to set True with "\
-                   'Size from false state')
-
-      # Test default_state
-      set = bgp.send("default_event_history_#{opt}")
-      bgp.send("event_history_#{opt}=", set)
-      result = bgp.send("event_history_#{opt}")
-      assert_equal(set, result,
-                   "event_history_#{opt}: Failed to set state to default")
+      return
+    end
+    assert_equal(bgp.default_event_history_events, bgp.event_history_events)
+    bgp.event_history_events = 'true'
+    assert_equal(bgp.default_event_history_events, bgp.event_history_events)
+    bgp.event_history_events = 'false'
+    assert_equal('false', bgp.event_history_events)
+    bgp.event_history_events = 'size_small'
+    assert_equal('size_small', bgp.event_history_events)
+    bgp.event_history_events = 'size_large'
+    assert_equal('size_large', bgp.event_history_events)
+    bgp.event_history_events = 'size_medium'
+    assert_equal('size_medium', bgp.event_history_events)
+    bgp.event_history_events = 'size_disable'
+    if newer_image_version?
+      assert_equal('false', bgp.event_history_events)
+    else
+      assert_equal('size_disable', bgp.event_history_events)
+    end
+    bgp.event_history_events = '100000'
+    assert_equal('100000', bgp.event_history_events)
+    bgp.event_history_events = bgp.default_event_history_events
+    assert_equal(bgp.default_event_history_events, bgp.event_history_events)
+  end
+
+  def test_event_history_objstore
+    bgp = setup_default
+    if validate_property_excluded?('bgp', 'event_history_objstore')
+      assert_nil(bgp.event_history_objstore)
+      assert_raises(Cisco::UnsupportedError) do
+        bgp.event_history_objstore = 'true'
+      end
+      return
+    end
+    skip('platform not supported for this test') unless newer_image_version?
+    assert_equal(bgp.default_event_history_objstore, bgp.event_history_objstore)
+    bgp.event_history_objstore = 'true'
+    assert_equal('true', bgp.event_history_objstore)
+    bgp.event_history_objstore = 'false'
+    assert_equal(bgp.default_event_history_objstore, bgp.event_history_objstore)
+    bgp.event_history_objstore = 'size_small'
+    assert_equal('size_small', bgp.event_history_objstore)
+    bgp.event_history_objstore = 'size_large'
+    assert_equal('size_large', bgp.event_history_objstore)
+    bgp.event_history_objstore = 'size_medium'
+    assert_equal('size_medium', bgp.event_history_objstore)
+    bgp.event_history_objstore = 'size_disable'
+    assert_equal('false', bgp.event_history_objstore)
+    bgp.event_history_objstore = '100000'
+    assert_equal('100000', bgp.event_history_objstore)
+    bgp.event_history_objstore = bgp.default_event_history_objstore
+    assert_equal(bgp.default_event_history_objstore, bgp.event_history_objstore)
+  end
+
+  def test_event_history_periodic
+    bgp = setup_default
+    if validate_property_excluded?('bgp', 'event_history_periodic')
+      assert_nil(bgp.event_history_periodic)
+      assert_raises(Cisco::UnsupportedError) do
+        bgp.event_history_periodic = 'true'
+      end
+      return
+    end
+    assert_equal(bgp.default_event_history_periodic,
+                 bgp.event_history_periodic)
+    bgp.event_history_periodic = 'false'
+    assert_equal('false', bgp.event_history_periodic)
+    bgp.event_history_periodic = 'size_small'
+    assert_equal('size_small', bgp.event_history_periodic)
+    bgp.event_history_periodic = 'size_large'
+    assert_equal('size_large', bgp.event_history_periodic)
+    bgp.event_history_periodic = 'size_medium'
+    assert_equal('size_medium', bgp.event_history_periodic)
+    bgp.event_history_periodic = '100000'
+    assert_equal('100000', bgp.event_history_periodic)
+    bgp.event_history_periodic = 'size_disable'
+    if newer_image_version?
+      assert_equal(bgp.default_event_history_periodic,
+                   bgp.event_history_periodic)
+    else
+      assert_equal('size_disable', bgp.event_history_periodic)
+    end
+    bgp.event_history_periodic = 'true'
+    if newer_image_version?
+      assert_equal('true', bgp.event_history_periodic)
+    else
+      assert_equal(bgp.default_event_history_periodic,
+                   bgp.event_history_periodic)
     end
+    bgp.event_history_periodic = bgp.default_event_history_periodic
+    assert_equal(bgp.default_event_history_periodic,
+                 bgp.event_history_periodic)
   end
 
   def test_fast_external_fallover

data/tests/test_snmpuser.rb

@@ -14,7 +14,6 @@
 
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/snmpuser'
-require 'pry'
 
 DEFAULT_SNMP_USER_AUTH_PASSWORD = ''
 DEFAULT_SNMP_USER_PRIV_PASSWORD = ''

data/tests/test_yum.rb

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

data/tests/yum_package.yaml

@@ -29,7 +29,7 @@
   version:  '1.0.0-7.0.3.I4.2'
 
 7_0_3_I5_1_:
-  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I5.1.lib32_n9000.rpm'
-  name:     'nxos.sample-n9k_EOR'
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I5.1.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
   version:  '1.0.0-7.0.3.I5.1'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cisco_node_utils
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Rob Gries
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler