cisco_node_utils 1.5.0 → 1.6.0

data/tests/test_router_bgp.rb

@@ -1315,6 +1315,8 @@ class TestRouterBgp < CiscoTestCase
   end
 
   def test_suppress_fib_pending
+    skip_legacy_defect?('7.0.3.I4.5',
+                        'CSCvd41536: Unable to remove  suppress-fib-pending')
     bgp = setup_default
     if validate_property_excluded?('bgp', 'suppress_fib_pending')
       assert_raises(Cisco::UnsupportedError) do

data/tests/test_snmpcommunity.rb

@@ -191,6 +191,18 @@ class TestSnmpCommunity < CiscoTestCase
     cleanup_snmpcommunity(snmpcommunity)
   end
 
+  def test_get_group_complex_name
+    skip("Test not supported on #{product_tag} due to CSCva63814") if product_tag[/n5|6|7k/]
+    names = ['C0mplex()Community!', 'C#', 'C$', 'C%', 'C^', 'C&', 'C*',
+             'C-', 'C=', 'C<', 'C,', 'C.', 'C/', 'C|', 'C{}[]']
+    group = 'network-admin'
+    names.each do |name|
+      sc = SnmpCommunity.new(name, group)
+      assert_equal(group, sc.group)
+      cleanup_snmpcommunity(sc)
+    end
+  end
+
   def test_group_set_zero_length
     name = 'ciscogroupsetcom'
     group = 'network-operator'

data/tests/test_snmpserver.rb

@@ -155,7 +155,7 @@ class TestSnmpServer < CiscoTestCase
   end
 
   def test_packet_size
-    skip_legacy_defect?('7.0.3.I2.2e|7.0.3.I3.1',
+    skip_legacy_defect?('7.0.3.I2.2e|7.0.3.I2.5|7.0.3.I3.1',
                         'CSCuz14217: CLI shows default snmp packet-size incorrectly as 0')
 
     if validate_property_excluded?('snmp_server', 'packet_size')

data/tests/test_snmpuser.rb

@@ -564,16 +564,15 @@ class TestSnmpUser < CiscoTestCase
   end
 
   def test_privpassword
-    name = 'test_privpassword'
     priv_password = '0x123456'
-    snmpuser = SnmpUser.new(name, [''], :md5, priv_password,
+    snmpuser = SnmpUser.new('test_pp1', [''], :md5, priv_password,
                             :des, priv_password, true, '')
 
     pw = snmpuser.priv_password
     assert_equal(priv_password, pw)
     snmpuser.destroy
 
-    snmpuser = SnmpUser.new(name, [''], :md5, priv_password,
+    snmpuser = SnmpUser.new('test_pp2', [''], :md5, priv_password,
                             :aes128, priv_password, true, '')
     pw = snmpuser.priv_password
     assert_equal(priv_password, pw)
@@ -581,16 +580,15 @@ class TestSnmpUser < CiscoTestCase
   end
 
   def test_privpassword_with_engineid
-    name = 'test_privpassword2'
     priv_password = '0x123456'
     engine_id = '128:12:12:12:12'
-    snmpuser = SnmpUser.new(name, [''], :md5, priv_password,
+    snmpuser = SnmpUser.new('test_pp3', [''], :md5, priv_password,
                             :des, priv_password, true, engine_id)
     pw = snmpuser.priv_password
     assert_equal(priv_password, pw)
     snmpuser.destroy
 
-    snmpuser = SnmpUser.new(name, [''], :md5, priv_password,
+    snmpuser = SnmpUser.new('test_pp4', [''], :md5, priv_password,
                             :aes128, priv_password, true, '')
     pw = snmpuser.priv_password
     assert_equal(priv_password, pw)
@@ -612,17 +610,16 @@ class TestSnmpUser < CiscoTestCase
   end
 
   def test_priv_password_equal_with_engineid
-    name = 'test_privpass_equal'
     priv_pass = 'XXWWPass0wrf'
     engine_id = '128:12:12:12:12'
 
-    snmpuser = SnmpUser.new(name, [''], :md5, priv_pass, :des, priv_pass, false,
+    snmpuser = SnmpUser.new('test_pp5', [''], :md5, priv_pass, :des, priv_pass, false,
                             engine_id)
     assert(snmpuser.priv_password_equal?(priv_pass, false))
     refute(snmpuser.priv_password_equal?('tWWXXpass0wrf', false))
     snmpuser.destroy
 
-    snmpuser = SnmpUser.new(name, [''], :md5, priv_pass,
+    snmpuser = SnmpUser.new('test_pp6', [''], :md5, priv_pass,
                             :aes128, priv_pass, false, engine_id)
     assert(snmpuser.priv_password_equal?(priv_pass, false))
     refute(snmpuser.priv_password_equal?('tWWXXpass0wrf', false))

data/tests/test_tacacs_server.rb

@@ -140,7 +140,7 @@ class TestTacacsServer < CiscoTestCase
     tacacs = TacacsServer.new
 
     if platform == :nexus
-      assert_equal(Utils.add_quotes(sh_run_encryption_password),
+      assert_match(/#{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(Utils.add_quotes(encrypted_password), tacacs.encryption_password,
+    assert_match(/#{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(Utils.add_quotes(sh_run_pass), host.encryption_password,
+      assert_match(/#{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(Utils.add_quotes(sh_run_pass), host.encryption_password,
+      assert_match(/#{sh_run_pass}/, host.encryption_password,
                    'Error: Tacacs Host encryption password incorrect')
     else
       # Only do not-nil checking for IOS XR

data/tests/test_upgrade.rb

@@ -0,0 +1,106 @@
+# Copyright (c) 2016-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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/upgrade'
+
+include Cisco
+
+# TestUpgrade - Minitest for router Upgrade node Utility class
+class TestUpgrade < CiscoTestCase
+  @skip_unless_supported = 'upgrade'
+
+  def preconfig_upgrade_info
+    path = File.expand_path('../upgrade_info.yaml', __FILE__)
+    skip('Cannot find tests/upgrade_info.yaml') unless File.file?(path)
+    info = YAML.load(File.read(path))
+    valid_info?(info)
+    info
+  end
+
+  def valid_info?(info)
+    skip('tests/upgrade_info.yaml file is empty') unless info
+    msg = 'Missing key in tests/upgrade_info.yaml'
+    %w(install_image install_uri).each do |key|
+      skip("#{msg}: #{key}") if info[key].nil?
+    end
+  end
+
+  ###################
+  # Upgrade tests   #
+  ###################
+
+  def test_clear_status
+    Upgrade.clear_status
+    refute(Upgrade.upgraded?)
+  end
+
+  def test_delete
+    config('show version > bootflash:foobar')
+    Upgrade.delete('foobar')
+    assert_raises(CliError) do
+      Upgrade.delete('foobar')
+    end
+  end
+
+  def test_delete_negative
+    assert_raises(CliError) do
+      # Delete a file that doesn't exist
+      Upgrade.delete('foobar')
+    end
+    assert_raises(CliError) do
+      # Delete a file that doesn't exist
+      Upgrade.delete('foobar', 'logflash:')
+    end
+  end
+
+  # def test_delete_boot
+  #   Upgrade.delete_boot
+  # end
+
+  def test_image_version
+    version = Upgrade.image_version
+    assert_match(/^\d.\d\(\d\)\S+\(\S+\)$/, version)
+  end
+
+  def test_box_online
+    assert(Upgrade.box_online?)
+  end
+
+  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'])
+    # Wait 15 seconds for device to start rebooting
+    # TODO : Consider getting the sleep value dynamically
+    sleep 15
+    begin
+      assert(Upgrade.upgraded?)
+    rescue
+      tries ||= 1
+      retry unless (tries += 1) > 5
+      raise
+    end
+  end
+
+  def test_upgrade_boot_image
+    preconfig_upgrade_info
+    image_uri = node.config_get('show_version', 'system_image')
+    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)
+    assert(Upgrade.upgraded?)
+  end
+end

data/tests/test_vlan.rb

@@ -127,6 +127,8 @@ class TestVlan < CiscoTestCase
   end
 
   def test_name_zero_length
+    skip_legacy_defect?('7.0.3.I5.2',
+                        'CSCvd09257: Configuration of vlan name via nxapi should be noop')
     v = Vlan.new(1000)
     v.vlan_name = ''
     assert('', v.vlan_name)
@@ -155,10 +157,6 @@ class TestVlan < CiscoTestCase
     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

data/tests/upgrade_info.yaml.example

@@ -0,0 +1,3 @@
+# Upgrade info for test_upgrade.rb
+install_image : 'nxos.7.0.3.I2.1.bin'
+install_uri : 'bootflash:'

data/tests/yum_package.yaml

@@ -13,10 +13,10 @@
   name:     'nxos.sample-n9k_EOR'
   version:  '1.0.0-7.0.3.I2.2e'
 
-7_0_3_I3_1_:
-  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I3.1.lib32_n9000.rpm'
+7_0_3_I2_5_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I2.5.lib32_n9000.rpm'
   name:     'nxos.sample-n9k_EOR'
-  version:  '1.0.0-7.0.3.I3.1'
+  version:  '1.0.0-7.0.3.I2.5'
 
 7_0_3_I4_1_:
   filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I4.1.lib32_n9000.rpm'
@@ -28,11 +28,21 @@
   name:     'nxos.sample-n9k_EOR'
   version:  '1.0.0-7.0.3.I4.2'
 
+7_0_3_I4_5_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I4.5.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_EOR'
+  version:  '1.0.0-7.0.3.I4.5'
+
 7_0_3_I5_1_:
   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'
 
+7_0_3_I5_2_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I5.2.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I5.2'
+
 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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Rob Gries
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,6 +232,7 @@ files:
 - lib/cisco_node_utils/cmd_ref/radius_global.yaml
 - lib/cisco_node_utils/cmd_ref/radius_server.yaml
 - lib/cisco_node_utils/cmd_ref/radius_server_group.yaml
+- lib/cisco_node_utils/cmd_ref/route_map.yaml
 - lib/cisco_node_utils/cmd_ref/show_system.yaml
 - lib/cisco_node_utils/cmd_ref/show_version.yaml
 - lib/cisco_node_utils/cmd_ref/snmp_community.yaml
@@ -248,6 +249,7 @@ files:
 - lib/cisco_node_utils/cmd_ref/tacacs_server.yaml
 - lib/cisco_node_utils/cmd_ref/tacacs_server_group.yaml
 - lib/cisco_node_utils/cmd_ref/tacacs_server_host.yaml
+- lib/cisco_node_utils/cmd_ref/upgrade.yaml
 - lib/cisco_node_utils/cmd_ref/vdc.yaml
 - lib/cisco_node_utils/cmd_ref/virtual_service.yaml
 - lib/cisco_node_utils/cmd_ref/vlan.yaml
@@ -298,6 +300,7 @@ files:
 - lib/cisco_node_utils/radius_global.rb
 - lib/cisco_node_utils/radius_server.rb
 - lib/cisco_node_utils/radius_server_group.rb
+- lib/cisco_node_utils/route_map.rb
 - lib/cisco_node_utils/router_ospf.rb
 - lib/cisco_node_utils/router_ospf_area.rb
 - lib/cisco_node_utils/router_ospf_area_vlink.rb
@@ -315,6 +318,7 @@ files:
 - lib/cisco_node_utils/tacacs_server.rb
 - lib/cisco_node_utils/tacacs_server_group.rb
 - lib/cisco_node_utils/tacacs_server_host.rb
+- lib/cisco_node_utils/upgrade.rb
 - lib/cisco_node_utils/vdc.rb
 - lib/cisco_node_utils/version.rb
 - lib/cisco_node_utils/vlan.rb
@@ -408,6 +412,7 @@ files:
 - tests/test_radius_global.rb
 - tests/test_radius_server.rb
 - tests/test_radius_server_group.rb
+- tests/test_route_map.rb
 - tests/test_router_bgp.rb
 - tests/test_router_ospf.rb
 - tests/test_router_ospf_area.rb
@@ -426,6 +431,7 @@ files:
 - tests/test_tacacs_server.rb
 - tests/test_tacacs_server_group.rb
 - tests/test_tacacs_server_host.rb
+- tests/test_upgrade.rb
 - tests/test_vdc.rb
 - tests/test_vlan.rb
 - tests/test_vlan_private.rb
@@ -437,6 +443,7 @@ files:
 - tests/test_vxlan_vtep_vni.rb
 - tests/test_yang.rb
 - tests/test_yum.rb
+- tests/upgrade_info.yaml.example
 - tests/yum_package.yaml
 homepage: https://github.com/cisco/cisco-network-node-utils
 licenses: