cisco_node_utils 1.2.0 → 1.3.0

data/tests/test_yum.rb

@@ -14,25 +14,49 @@
 
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/yum'
+require_relative '../lib/cisco_node_utils/platform'
 
 # TestYum - Minitest for Yum node utility class
 class TestYum < CiscoTestCase
   # rubocop:disable Style/ClassVars
   @@skip = false
   @@run_setup = true
-  @@pkg = 'n9000_sample'
-  @@pkg_ver = '1.0.0-7.0.3'
-  @@pkg_filename = 'n9000_sample-1.0.0-7.0.3.x86_64.rpm'
-  @@incompatible_rpm_msg =
-    ': The sample rpm is compatible with NX-OS release version 7.0(3)I2(1). ' \
-    'This test may fail with other versions.'
   # rubocop:enable Style/ClassVars
 
+  @skip_unless_supported = 'yum'
+
+  def select_pkg
+    # 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
+    @@incompatible_rpm_msg =
+      ": Sample rpm is compatible with NX-OS release version #{@@pv}."  \
+      'This test may fail with other versions.'
+    # rubocop:enable Style/ClassVars
+  end
+
   def setup
     super
     # only run check once (can't use initialize because @device isn't ready)
     return unless @@run_setup
 
+    select_pkg
     s = @device.cmd("show file bootflash:#{@@pkg_filename} cksum")
     if s[/No such file/]
       @@skip = true # rubocop:disable Style/ClassVars
@@ -40,10 +64,17 @@ class TestYum < CiscoTestCase
       # add pkg to the repo
       # normally this could be accomplished by first installing via full path
       # but that would make these tests order dependent
-      unless @device.cmd("show install package | include #{@@pkg}")[/@patching/]
-        @device.cmd("install add bootflash:#{@@pkg_filename}")
-        # Wait for install to complete
-        sleep 30
+
+      # 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}",
+               "install remove #{@@pkg} forced",
+               "install add bootflash:#{@@pkg_filename}"]
+      steps.each do |step|
+        info "Executing setup step: #{step}..."
+        s = @device.cmd(step)
+        sleep 20
+        debug "Step Complete.\n\n#{s}\n"
       end
     end
     @@run_setup = false # rubocop:disable Style/ClassVars
@@ -54,7 +85,7 @@ class TestYum < CiscoTestCase
       'this file can be found in the cisco_node_utils/tests directory' if @@skip
   end
 
-  def test_install
+  def test_install_remove
     skip?
     if @device.cmd("show install package | include #{@@pkg}")[/@patching/]
       @device.cmd("install deactivate #{@@pkg}")
@@ -62,26 +93,19 @@ class TestYum < CiscoTestCase
       sleep 20
     end
 
+    # On dublin and later images, must specify the full rpm name.
+    package = @@pv[/7.0\(3\)I2\(1\)/] ? @@pkg : @@pkg_filename
     # Specify "management" vrf for install
-    Yum.install(@@pkg, 'management')
+    Yum.install(package, 'management')
     sleep 20
-    s = @device.cmd("show install package | include #{@@pkg}")[/@patching/]
-    assert(s, "failed to find installed package #{@@pkg}")
-  rescue RuntimeError => e
-    assert(false, e.message + @@incompatible_rpm_msg)
-  end
+    assert(Yum.query(@@pkg), "failed to find installed package #{@@pkg}")
 
-  def test_remove
-    skip?
-    unless @device.cmd("show install package | include #{@@pkg}")[/@patching/]
-      @device.cmd("install add #{@@pkg} activate")
-      node.cache_flush
-      sleep 20
-    end
-    Yum.remove(@@pkg)
+    Yum.remove(package)
     sleep 20
     refute_show_match(command: "show install package | include #{@@pkg}",
                       pattern: /@patching/)
+  rescue RuntimeError => e
+    assert(false, e.message + @@incompatible_rpm_msg)
   end
 
   def test_ambiguous_package_error

metadata

@@ -1,48 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: cisco_node_utils
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
+- Rob Gries
 - Alex Hunsberger
 - Glenn Matthews
 - Chris Van Heuveln
+- Rich Wellum
 - Mike Wiebe
 - Jie Yang
-- Rob Gries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: kwalify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,63 +73,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.35.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.35.1
 - !ruby/object:Gem::Dependency
-  name: cisco_nxapi
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
+        version: '0.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.9'
 description: |
   Utilities for management of Cisco network nodes.
   Designed to work with Puppet and Chef.
-  Currently supports NX-OS nodes.
+  Currently supports NX-OS and IOS XR nodes.
 email: cisco_agent_gem@cisco.com
 executables: []
-extensions: []
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
@@ -133,8 +144,10 @@ files:
 - bin/git/hooks/post-flow-release-start/update-version
 - bin/git/hooks/post-merge/update-hooks
 - bin/git/hooks/post-rewrite/update-hooks
+- bin/git/hooks/pre-commit/check_unstaged_changes
 - bin/git/hooks/pre-commit/rubocop
 - bin/git/hooks/pre-commit/validate-diffs
+- bin/git/hooks/pre-commit/validate-yaml
 - bin/git/hooks/pre-push/check-changelog
 - bin/git/hooks/pre-push/rubocop
 - bin/git/update-hooks
@@ -142,9 +155,12 @@ files:
 - docs/README-develop-best-practices.md
 - docs/README-develop-node-utils-APIs.md
 - docs/README-maintainers.md
+- docs/README-test-execution.md
 - docs/agent_files.png
+- docs/cisco_node_utils.yaml.example
 - docs/template-router.rb
 - docs/template-test_router.rb
+- ext/mkrf_conf.rb
 - lib/.rubocop.yml
 - lib/cisco_node_utils.rb
 - lib/cisco_node_utils/aaa_authentication_login.rb
@@ -156,7 +172,19 @@ files:
 - lib/cisco_node_utils/bgp_af.rb
 - lib/cisco_node_utils/bgp_neighbor.rb
 - lib/cisco_node_utils/bgp_neighbor_af.rb
+- lib/cisco_node_utils/bridge_domain.rb
+- lib/cisco_node_utils/bridge_domain_vni.rb
 - lib/cisco_node_utils/cisco_cmn_utils.rb
+- lib/cisco_node_utils/client.rb
+- lib/cisco_node_utils/client/client.rb
+- lib/cisco_node_utils/client/grpc.rb
+- lib/cisco_node_utils/client/grpc/client.rb
+- lib/cisco_node_utils/client/grpc/ems.proto
+- lib/cisco_node_utils/client/grpc/ems.rb
+- lib/cisco_node_utils/client/grpc/ems_services.rb
+- 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/README_YAML.md
 - lib/cisco_node_utils/cmd_ref/aaa_auth_login_service.yaml
 - lib/cisco_node_utils/cmd_ref/aaa_authentication_login.yaml
@@ -166,12 +194,14 @@ files:
 - 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/dnsclient.yaml
+- lib/cisco_node_utils/cmd_ref/encapsulation.yaml
 - lib/cisco_node_utils/cmd_ref/evpn_vni.yaml
 - 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/fex.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
@@ -179,6 +209,8 @@ files:
 - lib/cisco_node_utils/cmd_ref/interface_portchannel.yaml
 - lib/cisco_node_utils/cmd_ref/interface_service_vni.yaml
 - lib/cisco_node_utils/cmd_ref/inventory.yaml
+- lib/cisco_node_utils/cmd_ref/itd_device_group.yaml
+- lib/cisco_node_utils/cmd_ref/itd_service.yaml
 - lib/cisco_node_utils/cmd_ref/memory.yaml
 - lib/cisco_node_utils/cmd_ref/ntp_config.yaml
 - lib/cisco_node_utils/cmd_ref/ntp_server.yaml
@@ -197,6 +229,7 @@ files:
 - lib/cisco_node_utils/cmd_ref/snmp_server.yaml
 - lib/cisco_node_utils/cmd_ref/snmp_user.yaml
 - lib/cisco_node_utils/cmd_ref/snmpnotification.yaml
+- lib/cisco_node_utils/cmd_ref/stp_global.yaml
 - 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
@@ -206,18 +239,22 @@ files:
 - 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
-- lib/cisco_node_utils/cmd_ref/vni.yaml
 - lib/cisco_node_utils/cmd_ref/vpc.yaml
 - lib/cisco_node_utils/cmd_ref/vrf.yaml
+- lib/cisco_node_utils/cmd_ref/vrf_af.yaml
 - 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/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/dns_domain.rb
 - lib/cisco_node_utils/domain_name.rb
+- lib/cisco_node_utils/encapsulation.rb
+- lib/cisco_node_utils/environment.rb
 - lib/cisco_node_utils/evpn_vni.rb
+- lib/cisco_node_utils/exceptions.rb
 - lib/cisco_node_utils/fabricpath_global.rb
 - lib/cisco_node_utils/fabricpath_topology.rb
 - lib/cisco_node_utils/feature.rb
@@ -226,6 +263,10 @@ files:
 - lib/cisco_node_utils/interface_ospf.rb
 - lib/cisco_node_utils/interface_portchannel.rb
 - lib/cisco_node_utils/interface_service_vni.rb
+- lib/cisco_node_utils/itd_device_group.rb
+- lib/cisco_node_utils/itd_device_group_node.rb
+- lib/cisco_node_utils/itd_service.rb
+- lib/cisco_node_utils/logger.rb
 - lib/cisco_node_utils/name_server.rb
 - lib/cisco_node_utils/node.rb
 - lib/cisco_node_utils/node_util.rb
@@ -248,6 +289,7 @@ files:
 - lib/cisco_node_utils/snmpnotification.rb
 - lib/cisco_node_utils/snmpserver.rb
 - lib/cisco_node_utils/snmpuser.rb
+- 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_server.rb
@@ -256,7 +298,6 @@ files:
 - lib/cisco_node_utils/vdc.rb
 - lib/cisco_node_utils/version.rb
 - lib/cisco_node_utils/vlan.rb
-- lib/cisco_node_utils/vni.rb
 - lib/cisco_node_utils/vpc.rb
 - lib/cisco_node_utils/vrf.rb
 - lib/cisco_node_utils/vrf_af.rb
@@ -264,7 +305,23 @@ files:
 - lib/cisco_node_utils/vxlan_vtep.rb
 - lib/cisco_node_utils/vxlan_vtep_vni.rb
 - lib/cisco_node_utils/yum.rb
+- lib/minitest/environment_plugin.rb
+- lib/minitest/log_level_plugin.rb
+- spec/client_spec.rb
+- spec/environment_spec.rb
+- spec/grpc_client_spec.rb
+- spec/isolate/all_clients_spec.rb
+- spec/isolate/grpc_only_spec.rb
+- spec/isolate/no_clients_spec.rb
+- spec/isolate/nxapi_only_spec.rb
+- spec/nxapi_client_spec.rb
+- spec/schema.yaml
+- spec/shared_examples_for_clients.rb
+- spec/spec_helper.rb
+- spec/whitespace_spec.rb
+- spec/yaml_spec.rb
 - tests/.rubocop.yml
+- tests/CSCuxdublin-1.0.0-7.0.3.I3.1.lib32_n9000.rpm
 - tests/basetest.rb
 - tests/ciscotest.rb
 - tests/cmd_config.yaml
@@ -279,25 +336,39 @@ files:
 - 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_command_config.rb
 - tests/test_command_reference.rb
 - tests/test_dns_domain.rb
 - tests/test_domain_name.rb
+- tests/test_encapsulation.rb
 - tests/test_evpn_vni.rb
 - tests/test_fabricpath_global.rb
 - tests/test_fabricpath_topology.rb
+- tests/test_feature.rb
+- tests/test_grpc.rb
 - tests/test_interface.rb
+- tests/test_interface_bdi.rb
 - tests/test_interface_channel_group.rb
 - tests/test_interface_ospf.rb
 - tests/test_interface_portchannel.rb
+- tests/test_interface_private_vlan.rb
 - tests/test_interface_service_vni.rb
 - tests/test_interface_svi.rb
 - tests/test_interface_switchport.rb
+- tests/test_itd_device_group.rb
+- tests/test_itd_device_group_node.rb
+- tests/test_itd_service.rb
+- tests/test_logger.rb
 - tests/test_name_server.rb
 - tests/test_node.rb
 - tests/test_node_ext.rb
+- tests/test_node_util.rb
 - tests/test_ntp_config.rb
 - tests/test_ntp_server.rb
+- tests/test_nxapi.rb
 - tests/test_overlay_global.rb
 - tests/test_pim.rb
 - tests/test_pim_group_list.rb
@@ -316,6 +387,7 @@ files:
 - tests/test_snmpnotification.rb
 - tests/test_snmpserver.rb
 - tests/test_snmpuser.rb
+- tests/test_stp_global.rb
 - tests/test_syslog_server.rb
 - tests/test_syslog_settings.rb
 - tests/test_tacacs_server.rb
@@ -324,9 +396,10 @@ files:
 - tests/test_vdc.rb
 - tests/test_vlan.rb
 - tests/test_vlan_mt_full.rb
-- tests/test_vni.rb
+- tests/test_vlan_private.rb
 - tests/test_vpc.rb
 - tests/test_vrf.rb
+- tests/test_vrf_af.rb
 - tests/test_vtp.rb
 - tests/test_vxlan_vtep.rb
 - tests/test_vxlan_vtep_vni.rb
@@ -355,4 +428,17 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Utilities for management of Cisco network nodes
-test_files: []
+test_files:
+- spec/client_spec.rb
+- spec/environment_spec.rb
+- spec/grpc_client_spec.rb
+- spec/isolate/all_clients_spec.rb
+- spec/isolate/grpc_only_spec.rb
+- spec/isolate/no_clients_spec.rb
+- spec/isolate/nxapi_only_spec.rb
+- spec/nxapi_client_spec.rb
+- spec/schema.yaml
+- spec/shared_examples_for_clients.rb
+- spec/spec_helper.rb
+- spec/whitespace_spec.rb
+- spec/yaml_spec.rb