cisco_node_utils 2.0.2 → 2.1.0

data/tests/test_itd_service.rb

@@ -51,7 +51,7 @@ class TestItdSvc < CiscoTestCase
   def test_access_list
     skip_nexus_i2_image?
     itd = ItdService.new('new_group')
-    config 'ip access-list include'
+    config 'ip access-list include ; permit ip any any'
     config 'ip access-list exclude'
     itd.access_list = 'include'
     itd.exclude_access_list = 'exclude'
@@ -98,9 +98,21 @@ class TestItdSvc < CiscoTestCase
     intf = interfaces[0].dup
     new_intf = Interface.new(interfaces[0])
     new_intf.switchport_mode = :disabled
-    ii = [['vlan 2', '1.1.1.1'],
-          [intf.insert(8, ' '), '2.2.2.2'],
-          ['port-channel 100', '3.3.3.3']]
+    # The next-hop setting as part of the ingress_interface
+    # is not needed for n9k and in the latest images is not
+    # even supported by the cli.
+    if Platform.image_version[/9\.\d+/]
+      next_hop1 = ''
+      next_hop2 = ''
+      next_hop3 = ''
+    else
+      next_hop1 = '1.1.1.1'
+      next_hop2 = '2.2.2.2'
+      next_hop3 = '3.3.3.3'
+    end
+    ii = [['vlan 2', next_hop1],
+          [intf.insert(8, ' '), next_hop2],
+          ['port-channel 100', next_hop3]]
     itd.ingress_interface = ii
     assert_equal(itd.ingress_interface, ii)
     ii = [['vlan 2', ''],

data/tests/test_node_ext.rb

@@ -37,7 +37,8 @@ class TestNodeExt < CiscoTestCase
     node.client.set(context: ['interface loopback0'], values: ['shutdown'])
     node.client.set(values: ['interface loopback1', 'no shutdown'])
 
-    result = node.config_get('interface', 'shutdown', name: 'loopback1')
+    result = node.config_get('interface', 'shutdown',
+                             name: 'loopback1', show_name: 'loopback1')
     refute(result)
   end
 
@@ -143,8 +144,10 @@ class TestNodeExt < CiscoTestCase
   def test_get_product_id
     # N3|9K Fretta product_id gets a '-F' appended so remove it for this check
     if product_tag[/n(3|9)k-f/]
+      node.client.cache_flush
       chassis = node.product_id.sub('-F', '')
     else
+      node.client.cache_flush
       chassis = node.product_id
     end
     assert_output_check(command: 'show inventory',

data/tests/test_portchannel_global.rb

@@ -192,6 +192,9 @@ class TestPortchannelGlobal < CiscoTestCase
     skip('Test not supported on this platform') if n3k_in_n3k_mode? ||
       validate_property_excluded?('portchannel_global', 'symmetry')
     # rubocop:enable Style/MultilineOperationIndentation
+    # TBD: concat not supported; add N9k-EX to allowed platforms list and
+    # use proper _exclude tags
+    skip('TBD: Limited support for N9k-EX') if node.product_id[/N9K.*EX/]
 
     global = create_portchannel_global
     global.send(:port_channel_load_balance=,

data/tests/test_router_ospf_vrf.rb

@@ -244,11 +244,10 @@ class TestRouterOspfVrf < CiscoTestCase
   end
 
   def test_create_name_zero_length
-    routerospf = RouterOspf.new('testOspf')
+    RouterOspf.new('testOspf')
     assert_raises(ArgumentError) do
       RouterOspfVrf.new('testOspf', '')
     end
-    routerospf.destroy
   end
 
   def test_create_valid
@@ -259,7 +258,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_match_vrf_line(ospfname, vrfname)
     assert_equal(vrfname, vrf.name,
                  "Error: #{vrfname} vrf, create failed")
-    vrf.parent.destroy
   end
 
   def test_get_parent_name
@@ -267,7 +265,6 @@ class TestRouterOspfVrf < CiscoTestCase
     vrf = create_routerospfvrf(routerospf.name)
     assert_equal(routerospf.name, vrf.parent.name,
                  'Error: Parent value is not correct')
-    routerospf.destroy
   end
 
   def test_get_name
@@ -276,7 +273,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_match_vrf_line('green', vrfname)
     assert_equal(vrfname, vrf.name,
                  "Error: #{vrfname} vrf, name get value mismatch")
-    vrf.parent.destroy
   end
 
   def test_destroy
@@ -286,7 +282,6 @@ class TestRouterOspfVrf < CiscoTestCase
       vrf.destroy
     end
     assert_match_vrf_line(vrf.parent.name, vrfname)
-    vrf.parent.destroy
   end
 
   def test_auto_cost
@@ -298,7 +293,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_match_vrf_line(vrf.parent.name, vrf.name, pattern)
     assert_equal(auto_cost_value, vrf.auto_cost,
                  'Error: auto-cost, get value mismatch')
-    vrf.parent.destroy
   end
 
   def test_auto_cost_multiple_vrf
@@ -321,7 +315,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_match_vrf_line(routerospf.name, vrf1.name, pattern)
     assert_equal(auto_cost_value, vrf1.auto_cost,
                  "Error: #{vrf1.name} vrf, auto-cost get value mismatch")
-    routerospf.destroy
   end
 
   def test_get_default_auto_cost
@@ -332,7 +325,6 @@ class TestRouterOspfVrf < CiscoTestCase
                  'Error: default auto-cost get value mismatch')
     assert_equal(auto_cost_value, vrf.auto_cost,
                  'Error: auto-cost get value default mismatch')
-    vrf.parent.destroy
   end
 
   def test_bfd
@@ -349,7 +341,6 @@ class TestRouterOspfVrf < CiscoTestCase
     vrf1.bfd = vrf1.default_bfd
     assert_equal(vrf.default_bfd, vrf.bfd)
     assert_equal(vrf1.default_bfd, vrf1.bfd)
-    routerospf.destroy
   end
 
   def test_default_metric
@@ -365,7 +356,6 @@ class TestRouterOspfVrf < CiscoTestCase
     return unless step_unless_legacy_defect(skip_versions, 'CSCvi74876: Cannot remove default metric')
     vrf.default_metric = vrf.default_default_metric
     refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
-    vrf.parent.destroy
   end
 
   def test_default_metric_multiple_vrf
@@ -387,8 +377,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_match_vrf_line(routerospf.name, vrf1.name, pattern)
     assert_equal(metric, vrf1.default_metric,
                  "Error: #{vrf1.name} vrf, default-metric get value mismatch")
-
-    routerospf.destroy
   end
 
   def test_log_adjacency_changes
@@ -413,7 +401,6 @@ class TestRouterOspfVrf < CiscoTestCase
     vrf.log_adjacency = vrf.default_log_adjacency
     pattern = /\s+log-adjacency-changes(.*)/
     refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
-    vrf.parent.destroy
   end
 
   def test_log_adjacency_multiple_vrf
@@ -433,8 +420,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_match_vrf_line(routerospf.name, vrf1.name, pattern)
     assert_equal(:detail, vrf1.log_adjacency,
                  "Error: #{vrf1.name} vrf, log-adjacency get value mismatch")
-
-    routerospf.destroy
   end
 
   def test_log_adjacency_multiple_vrf_2
@@ -453,8 +438,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_equal(:none, vrf_default.log_adjacency,
                  "Error: #{vrf_default.name} vrf_default, " \
                  'log-adjacency get value mismatch')
-
-    routerospf.destroy
   end
 
   def test_router_id
@@ -468,7 +451,6 @@ class TestRouterOspfVrf < CiscoTestCase
 
     vrf.router_id = vrf.default_router_id
     refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
-    vrf.parent.destroy
   end
 
   def test_router_id_multiple_vrf
@@ -491,8 +473,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_match_vrf_line(routerospf.name, vrf1.name, pattern)
     assert_equal(id, vrf1.router_id,
                  "Error: #{vrf1.name} vrf, router-id get value mismatch")
-
-    routerospf.destroy
   end
 
   def test_timer_throttle_lsa
@@ -505,7 +485,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_equal(lsa, vrf.timer_throttle_lsa,
                  "Error: #{vrf.name} vrf, timer throttle lsa " \
                  'get values mismatch')
-    vrf.parent.destroy
   end
 
   def test_timer_throttle_lsa_multiple_vrf
@@ -529,8 +508,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_equal(lsa, vrf1.timer_throttle_lsa,
                  "Error: #{vrf1.name} vrf, timer throttle lsa " \
                  'get values mismatch')
-
-    routerospf.destroy
   end
 
   def test_get_default_timer_throttle_lsa
@@ -548,7 +525,6 @@ class TestRouterOspfVrf < CiscoTestCase
                  'Error: default timer throttle lsa hold not correct')
     assert_equal(lsa[2], vrf.default_timer_throttle_lsa_max,
                  'Error: default timer throttle lsa max not correct')
-    vrf.parent.destroy
   end
 
   def test_timer_throttle_spf
@@ -561,7 +537,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_equal(spf, vrf.timer_throttle_spf,
                  "Error: #{vrf.name} vrf, timer throttle spf " \
                  'get values mismatch')
-    vrf.parent.destroy
   end
 
   def test_timer_throttle_spf_multiple_vrf
@@ -585,8 +560,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_equal(spf, vrf1.timer_throttle_spf,
                  "Error: #{vrf1.name} vrf, timer throttle spf " \
                  'get values mismatch')
-
-    routerospf.destroy
   end
 
   def test_get_default_timer_throttle_spf
@@ -607,7 +580,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_equal(spf[2], vrf.timer_throttle_spf_max,
                  "Error: #{vrf.name} vrf, " \
                  'default timer throttle max not correct')
-    vrf.parent.destroy
   end
 
   def test_create_valid_destroy_default
@@ -621,7 +593,6 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_raises(RuntimeError) do
       vrf.destroy
     end
-    routerospf.destroy
   end
 
   # rubocop:disable Style/AlignHash
@@ -693,7 +664,6 @@ class TestRouterOspfVrf < CiscoTestCase
                  "Error: #{vrf.name} vrf, hold timer throttle lsa not correct")
     assert_equal(5001, vrf.timer_throttle_lsa_max,
                  "Error: #{vrf.name} vrf, max timer throttle lsa not correct")
-    vrf.parent.destroy
   end
 
   def test_timer_throttle_spf_start_hold_max
@@ -705,11 +675,10 @@ class TestRouterOspfVrf < CiscoTestCase
                  "Error: #{vrf.name} vrf, hold timer throttle spf not correct")
     assert_equal(5001, vrf.timer_throttle_spf_max,
                  "Error: #{vrf.name} vrf, max timer throttle spf not correct")
-    vrf.parent.destroy
   end
 
   def test_noninstantiated
-    routerospf = create_routerospf
+    create_routerospf
     vrf = RouterOspfVrf.new('absent', 'absent', false)
     vrf.auto_cost
     vrf.default_metric
@@ -717,6 +686,5 @@ class TestRouterOspfVrf < CiscoTestCase
     vrf.router_id
     vrf.timer_throttle_lsa
     vrf.timer_throttle_spf
-    routerospf.destroy
   end
 end

data/tests/test_stp_global.rb

@@ -233,6 +233,8 @@ class TestStpGlobal < CiscoTestCase
   end
 
   def test_get_set_mst_priorities
+    # TBD: Add N9k-EX to allowed platforms list and use proper _exclude tags
+    skip('TBD: Limited support for N9k-EX') if node.product_id[/N9K.*EX/]
     global = StpGlobal.new('default')
     global.mode = 'mst'
     global.mst_priority = global.default_mst_priority
@@ -392,6 +394,8 @@ class TestStpGlobal < CiscoTestCase
   end
 
   def test_get_set_vlan_priorities
+    # TBD: Add N9k-EX to allowed platforms list and use proper _exclude tags
+    skip('TBD: Limited support for N9k-EX') if node.product_id[/N9K.*EX/]
     global = StpGlobal.new('default')
     global.vlan_priority = global.default_vlan_priority
     global.vlan_root_priority = global.default_vlan_root_priority

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cisco_node_utils
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Rob Gries
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,7 +206,6 @@ 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
@@ -309,7 +308,6 @@ files:
 - lib/cisco_node_utils/hostname.rb
 - lib/cisco_node_utils/hsrp_global.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_evpn_multisite.rb
 - lib/cisco_node_utils/interface_hsrp_group.rb
@@ -362,7 +360,6 @@ files:
 - 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
@@ -517,7 +514,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Utilities for management of Cisco network nodes

data/lib/cisco_node_utils/cmd_ref/DEPRECATED.yaml

@@ -1,118 +0,0 @@
-# DEPRECATED
-#
-###############################################################################
-# WARNING. DO NOT USE ANY OF THE YAML TAGS IN THIS FILE.
-# These yaml tags are deprecated and will be removed in future releases.
-###############################################################################
----
-_template:
-  context: ["interface <name>"]
-  nexus:
-    get_command: "show running interface all"
-
-private_vlan_any:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'pvlan_any'
-  multiple:
-  get_value: '/switchport private-vlan/'
-
-private_vlan_association:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'pvlan_association'
-  _exclude: [N3k-F, N9k-F]
-  multiple: true
-  get_command: "show vlan private-vlan"
-  get_context: ~
-  get_value: '/^<id>\s+(\d+)/'
-  set_context: ['vlan <vlan>']
-  set_value: "<state> private-vlan association <vlans> ; end"
-  default_value: []
-
-private_vlan_mapping:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'pvlan_mapping'
-  _exclude: [ios_xr, N3k-F, N9k-F]
-  multiple: true
-  get_value: '/^private-vlan mapping (.*)$/'
-  set_value: "<state> private-vlan mapping <vlans>"
-  default_value: []
-
-private_vlan_type:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'pvlan_type'
-  _exclude: [N3k-F, N9k-F]
-  kind: string
-  get_command: 'show vlan private-vlan type'
-  get_context: ~
-  get_value: '/^<id>\s+(\S+)/'
-  set_context: ['vlan <vlan>']
-  set_value: "<state> private-vlan <type> ; end"
-  default_value: ""
-
-switchport_mode_private_vlan_host:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_host'
-  _exclude: [ios_xr, N3k-F, N9k-F]
-  get_value: '/^switchport mode private-vlan (.*)$/'
-  set_value: "<state> switchport mode private-vlan <mode>"
-  default_value: :disabled
-
-switchport_mode_private_vlan_host_association:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_host_association'
-  _exclude: [ios_xr, N3k-F, N9k-F]
-  multiple: true
-  get_value: '/^switchport private-vlan host-association (.*)$/'
-  set_value: "<state> switchport private-vlan host-association <vlan_pr> <vlan_sec>"
-  default_value: []
-
-switchport_mode_private_vlan_host_promiscous:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_promiscuous'
-  _exclude: [ios_xr, N3k-F, N9k-F]
-  multiple: true
-  get_value: '/^switchport private-vlan mapping (\d+.*)$/'
-  set_value: "<state> switchport private-vlan mapping <vlan_pr> <vlans>"
-  default_value: []
-
-switchport_mode_private_vlan_trunk_promiscuous:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_trunk_promiscuous'
-  _exclude: [ios_xr, N3k, N3k-F, N9k-F]
-  kind: boolean
-  get_value: '/^switchport mode private-vlan trunk promiscuous$/'
-  set_value: "<state> switchport mode private-vlan trunk promiscuous"
-  default_value: false
-
-switchport_mode_private_vlan_trunk_secondary:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_trunk_secondary'
-  _exclude: [ios_xr, N3k, N3k-F, N9k-F]
-  kind: boolean
-  get_value: '/^switchport mode private-vlan trunk secondary$/'
-  set_value: "<state> switchport mode private-vlan trunk secondary"
-  default_value: false
-
-switchport_private_vlan_association_trunk:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_trunk_association'
-  _exclude: [ios_xr, N3k, N3k-F, N9k-F]
-  multiple: true
-  #get_value: '/^switchport private-vlan association trunk (.*) (.*)$/'
-  get_value: '/^switchport private-vlan association trunk (.*)$/'
-  set_value: "<state> switchport private-vlan association trunk <vlan_pr> <vlan>"
-  default_value: []
-
-switchport_private_vlan_mapping_trunk:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_mapping_trunk'
-  _exclude: [ios_xr, N3k, N3k-F, N9k-F]
-  multiple: true
-  get_value: '/^switchport private-vlan mapping trunk (.*)$/'
-  set_value: "<state> switchport private-vlan mapping trunk <vlan_pr> <vlans>"
-  default_value: []
-
-switchport_private_vlan_trunk_allowed_vlan:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_trunk_allowed_vlan'
-  _exclude: [ios_xr, N3k-F, N9k-F]
-  multiple: true
-  get_value: '/^switchport private-vlan trunk allowed vlan (.*)$/'
-  set_value: "<state> switchport private-vlan trunk allowed vlan <oper> <vlans>"
-  default_value: []
-
-switchport_private_vlan_trunk_native_vlan:
-  # DEPRECATED (REMOVING WITH RELEASE 2.0.0). USE 'switchport_pvlan_trunk_native_vlan'
-  _exclude: [ios_xr, N3k-F, N9k-F]
-  kind: int
-  get_value: '/^switchport private-vlan trunk native vlan (.*)$/'
-  set_value: "<state> switchport private-vlan trunk native vlan <vlan>"
-  default_value: 1