cisco_node_utils 1.3.0 → 1.4.0

data/tests/test_yum.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'yaml'
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/yum'
 require_relative '../lib/cisco_node_utils/platform'
@@ -26,28 +27,27 @@ class TestYum < CiscoTestCase
   @skip_unless_supported = 'yum'
 
   def select_pkg
+    path = File.expand_path('../yum_package.yaml', __FILE__)
+    skip('Cannot find tests/yum_package.yaml') unless File.file?(path)
+    pkginfo = YAML.load(File.read(path))
+
     # rubocop:disable Style/ClassVars
-    @@pv = Platform.image_version
-    case @@pv
-    when /7.0\(3\)I2\(1\)/
-      info 'Testing Patch For Camden Release Image'
-      @@pkg_filename = 'n9000_sample-1.0.0-7.0.3.x86_64.rpm'
-      @@pkg = 'n9000_sample'
-      @@pkg_ver = '1.0.0-7.0.3'
-    when /7.0\(3\)I3\(1\)/
-      info 'Testing Patch For Dublin Release Image'
-      @@pkg_filename = 'CSCuxdublin-1.0.0-7.0.3.I3.1.lib32_n9000.rpm'
-      @@pkg = 'CSCuxdublin'
-      @@pkg_ver = '1.0.0-7.0.3.I3.1'
-    when /7.0\(4\)I4\(1\)/
-      # TBD: Add Dublin Plus RPM when it becomes available.
-      # info 'Testing Patch For Dublin Plus Release Image'
-    else
-      skip "Available patches are not compatible with this image: #{@@pv}"
-    end
+    #
+    # Replace [.,(,)] characters with '_' for yaml key lookup.
+    # Image Version before gsub: 7.0(3)I3(1)
+    # Image Version after  gsub: 7_0_3_I3_1_
+    @@pv = Platform.image_version.gsub(/[.()]/, '_')[/\S+/]
+    info "Image version detected: #{Platform.image_version}"
+    skip("No pkginfo filename found for image version #{@@pv}") if
+      pkginfo[@@pv].nil?
+
+    @@pkg_filename = pkginfo[@@pv]['filename']
+    @@pkg = pkginfo[@@pv]['name']
+    @@pkg_ver = pkginfo[@@pv]['version']
+
     @@incompatible_rpm_msg =
-      ": Sample rpm is compatible with NX-OS release version #{@@pv}."  \
-      'This test may fail with other versions.'
+      ": Sample rpm is compatible with version #{Platform.image_version}."  \
+      'This test will fail with other versions.'
     # rubocop:enable Style/ClassVars
   end
 
@@ -67,7 +67,7 @@ class TestYum < CiscoTestCase
 
       # Remnants of the package my still exist from a previous install attempt.
       info 'Executing test setup... Please be patient, this will take a while.'
-      steps = ["install deactivate #{@@pkg}", "install commit #{@@pkg}",
+      steps = ["install deactivate #{@@pkg}",
                "install remove #{@@pkg} forced",
                "install add bootflash:#{@@pkg_filename}"]
       steps.each do |step|
@@ -85,7 +85,7 @@ class TestYum < CiscoTestCase
       'this file can be found in the cisco_node_utils/tests directory' if @@skip
   end
 
-  def test_install_remove
+  def test_install_query_remove
     skip?
     if @device.cmd("show install package | include #{@@pkg}")[/@patching/]
       @device.cmd("install deactivate #{@@pkg}")
@@ -94,16 +94,24 @@ class TestYum < CiscoTestCase
     end
 
     # On dublin and later images, must specify the full rpm name.
-    package = @@pv[/7.0\(3\)I2\(1\)/] ? @@pkg : @@pkg_filename
+    package = @@pv[/7_0_3_I2_1_/] ? @@pkg : @@pkg_filename
+
+    # INSTALL
     # Specify "management" vrf for install
     Yum.install(package, 'management')
     sleep 20
     assert(Yum.query(@@pkg), "failed to find installed package #{@@pkg}")
 
-    Yum.remove(package)
+    # QUERY INSTALLED
+    assert_equal(@@pkg_ver, Yum.query(@@pkg), @@incompatible_rpm_msg)
+
+    # REMOVE
+    Yum.remove(@@pkg)
     sleep 20
-    refute_show_match(command: "show install package | include #{@@pkg}",
-                      pattern: /@patching/)
+
+    # QUERY REMOVED
+    assert_nil(Yum.query(@@pkg))
+
   rescue RuntimeError => e
     assert(false, e.message + @@incompatible_rpm_msg)
   end
@@ -121,20 +129,4 @@ class TestYum < CiscoTestCase
       Yum.install('also_not_real', 'management')
     end
   end
-
-  def test_query
-    skip?
-    unless @device.cmd("show install package | include #{@@pkg}")[/@patching/]
-      @device.cmd("install activate #{@@pkg}")
-      node.cache_flush
-      sleep 20
-    end
-    ver = Yum.query(@@pkg)
-    assert_equal(ver, @@pkg_ver, @@incompatible_rpm_msg)
-    @device.cmd("install deactivate #{@@pkg}")
-    node.cache_flush
-    sleep 20
-    ver = Yum.query(@@pkg)
-    assert_nil(ver)
-  end
 end

data/tests/yum_package.yaml

@@ -0,0 +1,35 @@
+# Sample Patch RPM's
+#
+
+# N3K and N9K Sample Patches
+
+7_0_3_I2_1_:
+  filename: 'n9000_sample-1.0.0-7.0.3.x86_64.rpm'
+  name:     'n9000_sample'
+  version:  '1.0.0-7.0.3'
+
+7_0_3_I2_2e_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I2.2e.lib32_n9000.rpm'
+  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'
+  name:     'nxos.sample-n9k_EOR'
+  version:  '1.0.0-7.0.3.I3.1'
+
+7_0_3_I4_1_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I4.1.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_EOR'
+  version:  '1.0.0-7.0.3.I4.1'
+
+7_0_3_I4_2_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I4.2.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_EOR'
+  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'
+  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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Rob Gries
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,7 +117,7 @@ dependencies:
 description: |
   Utilities for management of Cisco network nodes.
   Designed to work with Puppet and Chef.
-  Currently supports NX-OS and IOS XR nodes.
+  Currently supports NX-OS nodes.
 email: cisco_agent_gem@cisco.com
 executables: []
 extensions:
@@ -135,6 +135,7 @@ files:
 - README.md
 - Rakefile
 - SUPPORT.md
+- bin/.rubocop.yml
 - bin/check_metric_limits.rb
 - bin/git/hooks/commit-msg/enforce_style
 - bin/git/hooks/hook_lib
@@ -151,11 +152,13 @@ files:
 - bin/git/hooks/pre-push/check-changelog
 - bin/git/hooks/pre-push/rubocop
 - bin/git/update-hooks
+- bin/show_running_yang.rb
 - cisco_node_utils.gemspec
 - docs/README-develop-best-practices.md
 - docs/README-develop-node-utils-APIs.md
 - docs/README-maintainers.md
 - docs/README-test-execution.md
+- docs/README-utilities.md
 - docs/agent_files.png
 - docs/cisco_node_utils.yaml.example
 - docs/template-router.rb
@@ -168,6 +171,7 @@ files:
 - lib/cisco_node_utils/aaa_authorization_service.rb
 - lib/cisco_node_utils/ace.rb
 - lib/cisco_node_utils/acl.rb
+- lib/cisco_node_utils/bfd_global.rb
 - lib/cisco_node_utils/bgp.rb
 - lib/cisco_node_utils/bgp_af.rb
 - lib/cisco_node_utils/bgp_neighbor.rb
@@ -185,17 +189,20 @@ files:
 - lib/cisco_node_utils/client/nxapi.rb
 - lib/cisco_node_utils/client/nxapi/client.rb
 - lib/cisco_node_utils/client/utils.rb
+- lib/cisco_node_utils/cmd_ref/DEPRECATED.yaml
 - lib/cisco_node_utils/cmd_ref/README_YAML.md
 - lib/cisco_node_utils/cmd_ref/aaa_auth_login_service.yaml
 - lib/cisco_node_utils/cmd_ref/aaa_authentication_login.yaml
 - lib/cisco_node_utils/cmd_ref/aaa_authorization_service.yaml
 - lib/cisco_node_utils/cmd_ref/acl.yaml
+- lib/cisco_node_utils/cmd_ref/bfd_global.yaml
 - lib/cisco_node_utils/cmd_ref/bgp.yaml
 - lib/cisco_node_utils/cmd_ref/bgp_af.yaml
 - lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
 - lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
 - lib/cisco_node_utils/cmd_ref/bridge_domain.yaml
 - lib/cisco_node_utils/cmd_ref/bridge_domain_vni.yaml
+- lib/cisco_node_utils/cmd_ref/dhcp_relay_global.yaml
 - lib/cisco_node_utils/cmd_ref/dnsclient.yaml
 - lib/cisco_node_utils/cmd_ref/encapsulation.yaml
 - lib/cisco_node_utils/cmd_ref/evpn_vni.yaml
@@ -215,6 +222,8 @@ files:
 - lib/cisco_node_utils/cmd_ref/ntp_config.yaml
 - lib/cisco_node_utils/cmd_ref/ntp_server.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
 - lib/cisco_node_utils/cmd_ref/overlay_global.yaml
 - lib/cisco_node_utils/cmd_ref/pim.yaml
 - lib/cisco_node_utils/cmd_ref/portchannel_global.yaml
@@ -233,6 +242,7 @@ files:
 - lib/cisco_node_utils/cmd_ref/syslog_server.yaml
 - lib/cisco_node_utils/cmd_ref/syslog_settings.yaml
 - lib/cisco_node_utils/cmd_ref/system.yaml
+- lib/cisco_node_utils/cmd_ref/tacacs_global.yaml
 - 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
@@ -245,10 +255,12 @@ files:
 - lib/cisco_node_utils/cmd_ref/vtp.yaml
 - lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml
 - lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml
+- lib/cisco_node_utils/cmd_ref/yang.yaml
 - lib/cisco_node_utils/cmd_ref/yum.yaml
 - lib/cisco_node_utils/command_reference.rb
 - lib/cisco_node_utils/configparser_lib.rb
 - lib/cisco_node_utils/constants.rb
+- lib/cisco_node_utils/dhcp_relay_global.rb
 - lib/cisco_node_utils/dns_domain.rb
 - lib/cisco_node_utils/domain_name.rb
 - lib/cisco_node_utils/encapsulation.rb
@@ -259,6 +271,7 @@ files:
 - lib/cisco_node_utils/fabricpath_topology.rb
 - lib/cisco_node_utils/feature.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_ospf.rb
 - lib/cisco_node_utils/interface_portchannel.rb
@@ -282,6 +295,8 @@ files:
 - lib/cisco_node_utils/radius_server.rb
 - lib/cisco_node_utils/radius_server_group.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
 - lib/cisco_node_utils/router_ospf_vrf.rb
 - lib/cisco_node_utils/snmp_notification_receiver.rb
 - lib/cisco_node_utils/snmpcommunity.rb
@@ -292,18 +307,21 @@ files:
 - lib/cisco_node_utils/stp_global.rb
 - lib/cisco_node_utils/syslog_server.rb
 - lib/cisco_node_utils/syslog_settings.rb
+- lib/cisco_node_utils/tacacs_global.rb
 - 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/vdc.rb
 - lib/cisco_node_utils/version.rb
 - lib/cisco_node_utils/vlan.rb
+- lib/cisco_node_utils/vlan_DEPRECATED.rb
 - lib/cisco_node_utils/vpc.rb
 - lib/cisco_node_utils/vrf.rb
 - lib/cisco_node_utils/vrf_af.rb
 - lib/cisco_node_utils/vtp.rb
 - lib/cisco_node_utils/vxlan_vtep.rb
 - lib/cisco_node_utils/vxlan_vtep_vni.rb
+- lib/cisco_node_utils/yang.rb
 - lib/cisco_node_utils/yum.rb
 - lib/minitest/environment_plugin.rb
 - lib/minitest/log_level_plugin.rb
@@ -327,20 +345,25 @@ files:
 - tests/cmd_config.yaml
 - tests/cmd_config_invalid.yaml
 - tests/n9000_sample-1.0.0-7.0.3.x86_64.rpm
+- tests/noop.rb
 - tests/platform_info.rb
+- tests/tacacs_server.yaml.example
 - tests/test_aaa_authentication_login.rb
 - tests/test_aaa_authentication_login_service.rb
 - tests/test_aaa_authorization_service.rb
 - tests/test_ace.rb
 - tests/test_acl.rb
+- tests/test_bfd_global.rb
 - tests/test_bgp_af.rb
 - tests/test_bgp_neighbor.rb
 - tests/test_bgp_neighbor_af.rb
 - tests/test_bridge_domain.rb
 - tests/test_bridge_domain_vni.rb
 - tests/test_client_utils.rb
+- tests/test_cmn_utils.rb
 - tests/test_command_config.rb
 - tests/test_command_reference.rb
+- tests/test_dhcp_relay_global.rb
 - tests/test_dns_domain.rb
 - tests/test_domain_name.rb
 - tests/test_encapsulation.rb
@@ -380,6 +403,8 @@ files:
 - tests/test_radius_server_group.rb
 - tests/test_router_bgp.rb
 - tests/test_router_ospf.rb
+- tests/test_router_ospf_area.rb
+- tests/test_router_ospf_area_vlink.rb
 - tests/test_router_ospf_vrf.rb
 - tests/test_snmp_notification_receiver.rb
 - tests/test_snmpcommunity.rb
@@ -390,12 +415,12 @@ files:
 - tests/test_stp_global.rb
 - tests/test_syslog_server.rb
 - tests/test_syslog_settings.rb
+- tests/test_tacacs_global.rb
 - tests/test_tacacs_server.rb
 - tests/test_tacacs_server_group.rb
 - tests/test_tacacs_server_host.rb
 - tests/test_vdc.rb
 - tests/test_vlan.rb
-- tests/test_vlan_mt_full.rb
 - tests/test_vlan_private.rb
 - tests/test_vpc.rb
 - tests/test_vrf.rb
@@ -403,7 +428,9 @@ files:
 - tests/test_vtp.rb
 - tests/test_vxlan_vtep.rb
 - tests/test_vxlan_vtep_vni.rb
+- tests/test_yang.rb
 - tests/test_yum.rb
+- tests/yum_package.yaml
 homepage: https://github.com/cisco/cisco-network-node-utils
 licenses:
 - Apache-2.0

data/tests/test_vlan_mt_full.rb

@@ -1,85 +0,0 @@
-# Copyright (c) 2016 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/vlan'
-require_relative '../lib/cisco_node_utils/interface'
-require_relative '../lib/cisco_node_utils/vdc'
-require_relative '../lib/cisco_node_utils/vxlan_vtep'
-
-include Cisco
-
-# TestVlanMtFull - Minitest for Vlan node utility (MT-Full testing only)
-#
-# This test requires specific platform & linecard support:
-#   - vdc support with 'limit-resource module-type' set to 'f3'
-#
-class TestVlanMtFull < CiscoTestCase
-  @@cleaned = false # rubocop:disable Style/ClassVars
-  def cleanup
-    Vlan.vlans.each do |vlan, obj|
-      # skip reserved vlans
-      next if vlan == '1'
-      next if node.product_id[/N5K|N6K|N7K/] && (1002..1005).include?(vlan.to_i)
-      obj.destroy
-    end
-    interface_ethernet_default(interfaces[0])
-  end
-
-  def setup
-    super
-    return if @@cleaned
-    cleanup
-    remove_all_bridge_domains # BDs may conflict with our test vlans
-    @@cleaned = true # rubocop:disable Style/ClassVars
-  end
-
-  def teardown
-    cleanup
-  end
-
-  def interface_ethernet_default(ethernet_id)
-    config("default interface #{ethernet_id}")
-  end
-
-  def mt_full_env_setup
-    skip('Platform does not support MT-full') unless VxlanVtep.mt_full_support
-    mt_full_interface?
-    v = Vdc.new('default')
-    v.limit_resource_module_type = 'f3' unless
-      v.limit_resource_module_type == 'f3'
-  end
-
-  def test_vlan_mode_fabricpath
-    mt_full_env_setup
-
-    # Test for valid mode
-    v = Vlan.new(2000)
-    default = v.default_mode
-    assert_equal(default, v.mode,
-                 'Mode should have been default value: #{default}')
-    v.mode = 'fabricpath'
-    assert_equal(:enabled, v.fabricpath_feature,
-                 'Fabricpath feature should have been enabled')
-    assert_equal('fabricpath', v.mode,
-                 'Mode should have been set to fabricpath')
-
-    # Test for invalid mode
-    v = Vlan.new(100)
-    assert_equal(default, v.mode,
-                 'Mode should have been default value: #{default}')
-
-    assert_raises(CliError) { v.mode = 'junk' }
-  end
-end