cisco_node_utils 1.7.0 → 1.8.0

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 n9k-f (only), we cannot remove "area <area> default-cost 1",
+    # on n(3|9)k-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
-      /N9K.*-F/ =~ node.product_id
+      /N(3|9)K.*-F/ =~ node.product_id
     ad.destroy
     assert_empty(RouterOspfArea.areas) unless
-      /N9K.*-F/ =~ node.product_id
+      /N(3|9)K.*-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 n9k-f (only), we cannot configure
+    # on n(3|9)k-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[/N9K-F/]
+    if node.product_id[/N(3|9)K-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[/N9K-F/]
+    if node.product_id[/N(3|9)K-F/]
       refute_equal('aaa', ad.nssa_route_map)
     else
       assert_equal('aaa', ad.nssa_route_map)

data/tests/test_snmpuser.rb

@@ -44,18 +44,26 @@ class TestSnmpUser < CiscoTestCase
 
   def remove_test_users
     SnmpUser.users.values.each do |obj|
-      # Delete users that are in current but also added by these tests.
-      if @@current_users.keys.include?(obj.name) && @test_users.include?(obj.name)
-        obj.destroy
-      # Delete users that are part of test.
-      elsif @test_users.include? obj.name
-        obj.destroy
-      # Do not delete users in current but not in test.
-      elsif @@current_users.keys.include? obj.name
+      begin
+        # Delete users that are in current but also added by these tests.
+        if @@current_users.keys.include?(obj.name) && @test_users.include?(obj.name)
+          obj.destroy
+        # Delete users that are part of test.
+        elsif @test_users.include? obj.name
+          obj.destroy
+        # Do not delete users in current but not in test.
+        elsif @@current_users.keys.include? obj.name
+          next
+        else
+          # Delete if not in current or test.
+          obj.destroy
+        end
+      rescue CliError => e
+        puts e.message
+        puts "retry deleting the user #{obj.name}"
+        config("snmp-server user #{obj.name}")
+        config("no snmp-server user #{obj.name}")
         next
-      else
-        # Delete if not in current or test.
-        obj.destroy
       end
     end
   end

data/tests/test_syslog_server.rb

@@ -53,10 +53,9 @@ class TestSyslogServer < CiscoTestCase
     id = '1.2.3.4'
     refute_includes(Cisco::SyslogServer.syslogservers, id)
 
-    server = Cisco::SyslogServer.new(id, 2, 'default', true)
+    server = Cisco::SyslogServer.new({ 'name' => id, 'vrf' => 'default' }, true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(2, Cisco::SyslogServer.syslogservers[id].level)
 
     server.destroy
     refute_includes(Cisco::SyslogServer.syslogservers, id)
@@ -66,10 +65,9 @@ class TestSyslogServer < CiscoTestCase
     id = '2003::2'
     refute_includes(Cisco::SyslogServer.syslogservers, id)
 
-    server = Cisco::SyslogServer.new(id, 2, 'default', true)
+    server = Cisco::SyslogServer.new({ 'name' => id, 'vrf' => 'default' }, true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(2, Cisco::SyslogServer.syslogservers[id].level)
 
     server.destroy
     refute_includes(Cisco::SyslogServer.syslogservers, id)
@@ -81,14 +79,13 @@ class TestSyslogServer < CiscoTestCase
     refute_includes(Cisco::SyslogServer.syslogservers, id)
     refute_includes(Cisco::SyslogServer.syslogservers, id2)
 
-    server = Cisco::SyslogServer.new(id, 2, 'default', true)
-    server2 = Cisco::SyslogServer.new(id2, 3, 'default', true)
+    server = Cisco::SyslogServer.new({ 'name' => id, 'vrf' => 'default' }, true)
+    server2 = Cisco::SyslogServer.new({ 'name' => id2, 'vrf' => 'default' },
+                                      true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(2, Cisco::SyslogServer.syslogservers[id].level)
     assert_includes(Cisco::SyslogServer.syslogservers, id2)
     assert_equal(server2, Cisco::SyslogServer.syslogservers[id2])
-    assert_equal(3, Cisco::SyslogServer.syslogservers[id2].level)
 
     server.destroy
     server2.destroy
@@ -96,7 +93,7 @@ class TestSyslogServer < CiscoTestCase
     refute_includes(Cisco::SyslogServer.syslogservers, id2)
   end
 
-  def test_create_destroy_single_vrf_ipv4
+  def test_create_options
     if platform == :ios_xr
       config('vrf red')
     else
@@ -104,33 +101,16 @@ class TestSyslogServer < CiscoTestCase
     end
 
     id = '1.2.3.4'
+    options = { 'name' => id, 'level' => '4', 'port' => '2154', 'vrf' => 'red' }
 
     refute_includes(Cisco::SyslogServer.syslogservers, id)
 
-    server = Cisco::SyslogServer.new(id, 4, 'red', true)
+    server = Cisco::SyslogServer.new(options, true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(4, Cisco::SyslogServer.syslogservers[id].level)
-
-    server.destroy
-    refute_includes(Cisco::SyslogServer.syslogservers, id)
-  end
-
-  def test_create_destroy_single_vrf_ipv6
-    if platform == :ios_xr
-      config('vrf red')
-    else
-      config('vrf context red')
-    end
-
-    id = '2003::2'
-
-    refute_includes(Cisco::SyslogServer.syslogservers, id)
-
-    server = Cisco::SyslogServer.new(id, 5, 'red', true)
-    assert_includes(Cisco::SyslogServer.syslogservers, id)
-    assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(5, Cisco::SyslogServer.syslogservers[id].level)
+    assert_equal('4', Cisco::SyslogServer.syslogservers[id].level)
+    assert_equal('2154', Cisco::SyslogServer.syslogservers[id].port)
+    assert_equal('red', Cisco::SyslogServer.syslogservers[id].vrf)
 
     server.destroy
     refute_includes(Cisco::SyslogServer.syslogservers, id)

data/tests/test_syslog_settings.rb

@@ -24,24 +24,27 @@ class TestSyslogSettings < CiscoTestCase
     return if platform != :nexus
     # setup runs at the beginning of each test
     super
-    no_syslogsettings
+    default_syslogsettings
   end
 
   def teardown
     return if platform != :nexus
     # teardown runs at the end of each test
-    no_syslogsettings
+    default_syslogsettings
     super
   end
 
-  def no_syslogsettings
+  def default_syslogsettings
     # Turn the feature off for a clean test.
-    config('no logging timestamp seconds')
+    config('no logging timestamp seconds',
+           'logging console 2',
+           'logging monitor 5',
+           'no logging source-interface')
   end
 
   # TESTS
 
-  def test_create
+  def test_timestamp
     syslog_setting = Cisco::SyslogSettings.new('default')
 
     if platform == :ios_xr
@@ -62,6 +65,44 @@ class TestSyslogSettings < CiscoTestCase
       assert_equal('milliseconds',
                    syslog_setting.timestamp,
                   )
+      syslog_setting.time_stamp_units = 'seconds'
+      assert_equal('seconds',
+                   syslog_setting.time_stamp_units,
+                  )
     end
   end
+
+  def test_console
+    syslog_setting = Cisco::SyslogSettings.new('default')
+
+    # Some systems return the value and othesr get it from yaml - normalize
+    assert_equal(syslog_setting.default_console, syslog_setting.console.to_i)
+    assert_equal(2, syslog_setting.console)
+    syslog_setting.console = '1'
+    assert_equal('1', syslog_setting.console)
+    syslog_setting.console = nil
+    assert_equal('unset', syslog_setting.console)
+  end
+
+  def test_monitor
+    syslog_setting = Cisco::SyslogSettings.new('default')
+
+    # Some systems return the value and othesr get it from yaml - normalize
+    assert_equal(syslog_setting.default_monitor, syslog_setting.monitor.to_i)
+    assert_equal('5', syslog_setting.monitor)
+    syslog_setting.monitor = '7'
+    assert_equal('7', syslog_setting.monitor)
+    syslog_setting.monitor = nil
+    assert_equal('unset', syslog_setting.monitor)
+  end
+
+  def test_source_interface
+    syslog_setting = Cisco::SyslogSettings.new('default')
+
+    assert_nil(syslog_setting.source_interface)
+    syslog_setting.source_interface = 'mgmt0'
+    assert_equal('mgmt0', syslog_setting.source_interface)
+    syslog_setting.source_interface = nil
+    assert_nil(syslog_setting.source_interface)
+  end
 end

data/tests/test_tacacs_global.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for TacacsGlobal class
 #
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 2014-2017 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.
@@ -31,7 +31,7 @@ class TestTacacsGlobal < CiscoTestCase
 
   def teardown
     # teardown runs at the end of each test
-    no_tacacs_global
+    no_tacacs_global if platform == :ios_xr
     config_no_warn('no feature tacacs+') if platform == :nexus
     super
   end
@@ -50,31 +50,55 @@ class TestTacacsGlobal < CiscoTestCase
     assert_includes(Cisco::TacacsGlobal.tacacs_global, id)
     assert_equal(global, Cisco::TacacsGlobal.tacacs_global[id])
 
-    # Default Checking
+    # No timeout when TACACS is not enabled
+    assert_nil(global.timeout)
+
+    # Turn on TACACS and verify default Timeout
+    config_no_warn('feature tacacs+') if platform == :nexus
     assert_equal(global.default_timeout, global.timeout)
 
-    global.timeout = 5
-    assert_equal(5, Cisco::TacacsGlobal.tacacs_global[id].timeout)
-    assert_equal(5, global.timeout)
+    # Timeout update
+    global.timeout = 10
+    assert_equal(10, Cisco::TacacsGlobal.tacacs_global[id].timeout)
+    assert_equal(10, global.timeout)
+
+    # Do not unset timout if TACACS is enabled
+    assert_raises(ArgumentError) do
+      global.timeout = nil
+    end
 
-    # first change
-    key_format = 0
+    # Check there is no default key
+    assert_equal('', global.key)
+
+    # first key change - unencrypted key
     key = 'TEST_NEW'
-    global.encryption_key_set(key_format, key)
-    assert(!global.key.nil?)
-    assert(key_format, global.key_format)
+    global.encryption_key_set(nil, key)
+    # Device encypts key - verify return value
+    assert_equal(7, global.key_format)
+    assert_equal('"WAWY_NZB"', global.key)
 
-    # second change
+    # second key change - modify key to type6
     key_format = 6
-
     # Must use a valid type6 password: CSCvb36266
     key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
     global.encryption_key_set(key_format, key)
-    assert(!global.key.nil?)
-    assert(key_format, global.key_format)
+    assert_equal(key_format, global.key_format)
+    assert_equal("\"#{key}\"", global.key)
 
-    # Setting back to default and re-checking
-    global.timeout = global.default_timeout
-    assert_equal(global.default_timeout, global.timeout)
+    # Remove global key
+    global.encryption_key_set('', '')
+    assert_equal('', global.key)
+
+    # Default source interface
+    assert_nil(global.source_interface)
+
+    # Set source interface
+    interface = 'loopback0'
+    global.source_interface = interface
+    assert_equal(interface, global.source_interface)
+
+    # Remove source interface
+    global.source_interface = nil
+    assert_nil(global.source_interface)
   end
 end

data/tests/test_vpc.rb

@@ -138,6 +138,9 @@ class TestVpc < CiscoTestCase
     assert(vpc.layer3_peer_routing, 'layer3_peer_routing not getting set')
     vpc.layer3_peer_routing = false
     refute(vpc.layer3_peer_routing, 'layer3_peer_routing not getting disabled')
+    # reset peer gateway
+    vpc.peer_gateway = false
+    assert_equal(vpc.default_peer_gateway, vpc.peer_gateway)
   end
 
   def test_peer_keepalive

data/tests/test_vxlan_vtep_vni.rb

@@ -120,7 +120,6 @@ class TestVxlanVtepVni < CiscoTestCase
       return
     end
 
-    skip_incompat_version?('vxlan_vtep_vni', 'ingress_replication')
     # Test non-default values
     vni.ingress_replication = 'static'
     assert_equal('static', vni.ingress_replication)
@@ -158,7 +157,6 @@ class TestVxlanVtepVni < CiscoTestCase
 
     # Test the case where an existing ingress_replication is removed before
     # configuring multicast_group
-    skip_incompat_version?('vxlan_vtep_vni', 'ingress_replication')
     unless validate_property_excluded?('vxlan_vtep_vni', 'ingress_replication')
       vni1.ingress_replication = 'static'
       assert_equal('static', vni1.ingress_replication)
@@ -185,7 +183,6 @@ class TestVxlanVtepVni < CiscoTestCase
       return
     end
 
-    skip_incompat_version?('vxlan_vtep_vni', 'peer_list')
     peer_list = ['1.1.1.1', '2.2.2.2', '3.3.3.3', '4.4.4.4']
 
     # Test: all peers when current is empty

data/tests/yum_package.yaml

@@ -63,6 +63,11 @@
   name:     'nxos.sample-n9k_ALL'
   version:  '1.0.0-7.0.3.I6.1'
 
+7_0_3_I7_1_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I7.1.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I7.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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cisco_node_utils
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Rob Gries
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: net-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +241,7 @@ files:
 - lib/cisco_node_utils/cmd_ref/ntp_auth_key.yaml
 - lib/cisco_node_utils/cmd_ref/ntp_config.yaml
 - lib/cisco_node_utils/cmd_ref/ntp_server.yaml
+- lib/cisco_node_utils/cmd_ref/object_group.yaml
 - lib/cisco_node_utils/cmd_ref/ospf.yaml
 - lib/cisco_node_utils/cmd_ref/ospf_area.yaml
 - lib/cisco_node_utils/cmd_ref/ospf_area_vlink.yaml
@@ -297,6 +312,8 @@ files:
 - lib/cisco_node_utils/ntp_auth_key.rb
 - lib/cisco_node_utils/ntp_config.rb
 - lib/cisco_node_utils/ntp_server.rb
+- lib/cisco_node_utils/object_group.rb
+- lib/cisco_node_utils/object_group_entry.rb
 - lib/cisco_node_utils/overlay_global.rb
 - lib/cisco_node_utils/pim.rb
 - lib/cisco_node_utils/pim_group_list.rb
@@ -412,6 +429,7 @@ files:
 - tests/test_ntp_config.rb
 - tests/test_ntp_server.rb
 - tests/test_nxapi.rb
+- tests/test_object_group.rb
 - tests/test_overlay_global.rb
 - tests/test_pim.rb
 - tests/test_pim_group_list.rb
@@ -475,7 +493,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