cisco_node_utils 1.8.0 → 1.9.0

data/tests/test_node_ext.rb

@@ -333,7 +333,7 @@ class TestNodeExt < CiscoTestCase
     if validate_property_excluded?('show_version', 'last_reset_time')
       assert_nil(node.last_reset_time)
     else
-      refute_nil(node.last_reset_time)
+      refute_nil(node.last_reset_time) unless virtual_platform?
     end
   end
 
@@ -345,7 +345,8 @@ class TestNodeExt < CiscoTestCase
     assert_output_check(command: 'show version',
                         pattern: /.*\nLast reset.*\n\n?  Reason: (.*)\n/,
                         check:   node.last_reset_reason,
-                        msg:     'Error, Last reset reason does not match')
+                        msg:     'Error, Last reset reason does not match') unless
+      virtual_platform?
   end
 
   def test_get_system_cpu_utilization

data/tests/test_radius_global.rb

@@ -71,11 +71,13 @@ class TestRadiusGlobal < CiscoTestCase
       assert_match(/#{key}/, global.key)
       assert_match(/#{key}/, Cisco::RadiusGlobal.radius_global[id].key)
       assert_equal(7, global.key_format)
-      # Change to type 6
-      key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
-      global.key_set(key, 6)
-      assert_match(/#{key}/, global.key)
-      assert_equal(6, global.key_format)
+      unless Platform.image_version[/I2|I4/] # legacy defect CSCvb57180
+        # Change to type 6
+        key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
+        global.key_set(key, 6)
+        assert_match(/#{key}/, global.key)
+        assert_equal(6, global.key_format)
+      end
     elsif platform == :ios_xr
       global.key_set('QsEfThUkO', nil)
       assert(!global.key.nil?)

data/tests/test_router_ospf_vrf.rb

@@ -300,6 +300,8 @@ class TestRouterOspfVrf < CiscoTestCase
     assert_equal(metric, vrf.default_metric,
                  "Error: #{vrf.name} vrf, default-metric get value mismatch")
 
+    skip_versions = ['7.0.3.I7.3']
+    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

data/tests/test_stp_global.rb

@@ -492,6 +492,13 @@ class TestStpGlobal < CiscoTestCase
     @intf.stp_port_type = @intf.default_stp_port_type
     assert_equal(@intf.default_stp_port_type,
                  @intf.stp_port_type)
+    # Set default again and check. This is needed since
+    # we query the stp_port_type to use with the 'no'
+    # form of the command and false is not a valid
+    # stp_port_type
+    @intf.stp_port_type = @intf.default_stp_port_type
+    assert_equal(@intf.default_stp_port_type,
+                 @intf.stp_port_type)
   end
 
   def test_intf_stp_mst_cost_change

data/tests/test_tacacs_global.rb

@@ -77,13 +77,16 @@ class TestTacacsGlobal < CiscoTestCase
     assert_equal(7, global.key_format)
     assert_equal('"WAWY_NZB"', global.key)
 
-    # 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_equal(key_format, global.key_format)
-    assert_equal("\"#{key}\"", global.key)
+    skip_versions = ['7.0.3.(I2|I3)', '7.0.3.I4.[1-7]']
+    if step_unless_legacy_defect(skip_versions, 'CSCvh72911: Cannot configure tacacs-server key 6')
+      # 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_equal(key_format, global.key_format)
+      assert_equal("\"#{key}\"", global.key)
+    end
 
     # Remove global key
     global.encryption_key_set('', '')

data/tests/test_vrf_af.rb

@@ -116,14 +116,21 @@ class TestVrfAf < CiscoTestCase
     vdc_limit_f3_no_intf_needed(:clear)
   end
 
-  def route_target(af)
+  def route_target(af, _test_mvpn=false)
     # Common tester for route-target properties. Tests evpn and non-evpn.
     #   route_target_both_auto
     #   route_target_both_auto_evpn
+    #   route_target_both_auto_mvpn
     #   route_target_export
     #   route_target_export_evpn
+    #   route_target_export_mvpn
     #   route_target_import
     #   route_target_import_evpn
+    #   route_target_import_mvpn
+
+    # mvpn tests are only supported on 7.0.3.I7.1 and later
+    mvpn_skip_versions = ['7.0.3.(I2|I3|I4|I5|I6)']
+
     vrf = 'orange'
     v = VrfAF.new(vrf, af)
 
@@ -134,6 +141,11 @@ class TestVrfAf < CiscoTestCase
     refute(v.default_route_target_both_auto_evpn,
            'default value for route target both auto evpn should be false')
 
+    if step_unless_version_unsupported(mvpn_skip_versions)
+      refute(v.default_route_target_both_auto_mvpn,
+             'default value for route target both auto mvpn should be false')
+    end
+
     if validate_property_excluded?('vrf_af', 'route_target_both_auto')
       assert_raises(Cisco::UnsupportedError) { v.route_target_both_auto = true }
     else
@@ -160,6 +172,22 @@ class TestVrfAf < CiscoTestCase
              'v route-target both auto evpn should be disabled')
     end
 
+    if step_unless_version_unsupported(mvpn_skip_versions)
+      if validate_property_excluded?('vrf_af', 'route_target_both_auto_mvpn')
+        assert_raises(Cisco::UnsupportedError) do
+          v.route_target_both_auto_mvpn = true
+        end
+      else
+        v.route_target_both_auto_mvpn = true
+        assert(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+               'v route-target both auto mvpn should be enabled')
+
+        v.route_target_both_auto_mvpn = false
+        refute(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+               'v route-target both auto mvpn should be disabled')
+      end
+    end
+
     opts = [:import, :export]
 
     # Master list of communities to test against
@@ -185,6 +213,9 @@ class TestVrfAf < CiscoTestCase
   end
 
   def route_target_tester(v, af, opts, should, test_id)
+    # mvpn tests are only supported on 7.0.3.I7.1 and later
+    mvpn_skip_versions = ['7.0.3.(I2|I3|I4|I5|I6)']
+
     # First configure all four property types
     opts.each do |opt|
       # non-evpn
@@ -197,6 +228,16 @@ class TestVrfAf < CiscoTestCase
       else
         v.send("route_target_#{opt}_evpn=", should)
       end
+      # mvpn
+      if step_unless_version_unsupported(mvpn_skip_versions)
+        if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+          assert_raises(Cisco::UnsupportedError, "route_target_#{opt}_mvpn=") do
+            v.send("route_target_#{opt}_mvpn=", should)
+          end
+        else
+          v.send("route_target_#{opt}_mvpn=", should)
+        end
+      end
       # stitching
       if platform == :nexus
         assert_raises(Cisco::UnsupportedError,
@@ -222,6 +263,16 @@ class TestVrfAf < CiscoTestCase
         assert_equal(should, result,
                      "#{test_id} : #{af} : route_target_#{opt}_evpn")
       end
+      # mvpn
+      if step_unless_version_unsupported(mvpn_skip_versions)
+        result = v.send("route_target_#{opt}_mvpn")
+        if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+          assert_nil(result)
+        else
+          assert_equal(should, result,
+                       "#{test_id} : #{af} : route_target_#{opt}_mvpn")
+        end
+      end
       # stitching
       result = v.send("route_target_#{opt}_stitching")
       if platform == :nexus

data/tests/test_vxlan_vtep.rb

@@ -16,6 +16,7 @@ require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/feature'
 require_relative '../lib/cisco_node_utils/vxlan_vtep'
 require_relative '../lib/cisco_node_utils/vdc'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
 
 include Cisco
 
@@ -182,6 +183,28 @@ class TestVxlanVtep < CiscoTestCase
     assert_equal(val, vtep.source_interface)
   end
 
+  def test_multisite_bg_interface
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    vtep = VxlanVtep.new('nve1')
+
+    # Set multisite_bg_interface to non-default value
+    val = 'loopback55'
+    ms = EvpnMultisite.new(100)
+    vtep.multisite_border_gateway_interface = val
+    assert_equal(val, vtep.multisite_border_gateway_interface)
+
+    vtep.multisite_border_gateway_interface = vtep.default_multisite_border_gateway_interface
+    assert_equal(vtep.default_multisite_border_gateway_interface,
+                 vtep.multisite_border_gateway_interface)
+
+    # Should Error when no 'evpn multisite border-gateway' set
+    ms.destroy
+    assert_raises(Cisco::CliError) do
+      vtep.multisite_border_gateway_interface = val
+    end
+  end
+
   def test_source_interface_hold_down_time
     vtep = VxlanVtep.new('nve1')
     if validate_property_excluded?('vxlan_vtep', 'source_intf_hold_down_time')

data/tests/test_vxlan_vtep_vni.rb

@@ -15,6 +15,7 @@
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/vxlan_vtep'
 require_relative '../lib/cisco_node_utils/vxlan_vtep_vni'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
 
 include Cisco
 
@@ -258,4 +259,34 @@ class TestVxlanVtepVni < CiscoTestCase
     vni.suppress_uuc = vni.default_suppress_uuc
     refute(vni.suppress_uuc, 'suppress_uuc should be disabled')
   end
+
+  def test_multisite_ingress_replication
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+
+    vni = VxlanVtepVni.new('nve1', '6000')
+    ms = EvpnMultisite.new(100)
+
+    # Test: Default
+    vni.multisite_ingress_replication =
+      vni.default_multisite_ingress_replication
+    refute(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be disabled')
+
+    # Test: Enable multisite_ingress_replication
+    vni.multisite_ingress_replication = true
+    assert(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be enabled')
+
+    # Test: Disable multisite_ingress_replication
+    vni.multisite_ingress_replication = false
+    refute(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be disabled')
+
+    ms.destroy
+    # Test: enabling multisite ingress-replication without a multisite bg errors
+    assert_raises(Cisco::CliError) do
+      vni.multisite_ingress_replication = true
+    end
+  end
 end

data/tests/yum_package.yaml

@@ -68,6 +68,16 @@
   name:     'nxos.sample-n9k_ALL'
   version:  '1.0.0-7.0.3.I7.1'
 
+7_0_3_I7_2_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I7.2.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I7.2'
+
+7_0_3_I7_3_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I7.3.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I7.3'
+
 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.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Rob Gries
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -222,6 +222,9 @@ files:
 - 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_multicast.yaml
+- lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
+- lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.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
@@ -230,11 +233,13 @@ files:
 - 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
+- lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
 - lib/cisco_node_utils/cmd_ref/interface_hsrp_group.yaml
 - lib/cisco_node_utils/cmd_ref/interface_ospf.yaml
 - 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/ip_multicast.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
@@ -289,6 +294,9 @@ files:
 - lib/cisco_node_utils/domain_name.rb
 - lib/cisco_node_utils/encapsulation.rb
 - lib/cisco_node_utils/environment.rb
+- lib/cisco_node_utils/evpn_multicast.rb
+- lib/cisco_node_utils/evpn_multisite.rb
+- lib/cisco_node_utils/evpn_stormcontrol.rb
 - lib/cisco_node_utils/evpn_vni.rb
 - lib/cisco_node_utils/exceptions.rb
 - lib/cisco_node_utils/fabricpath_global.rb
@@ -298,10 +306,12 @@ files:
 - 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
 - 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/ip_multicast.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
@@ -400,6 +410,9 @@ files:
 - tests/test_dns_domain.rb
 - tests/test_domain_name.rb
 - tests/test_encapsulation.rb
+- tests/test_evpn_multicast.rb
+- tests/test_evpn_multisite.rb
+- tests/test_evpn_stormcontrol.rb
 - tests/test_evpn_vni.rb
 - tests/test_fabricpath_global.rb
 - tests/test_fabricpath_topology.rb
@@ -409,6 +422,7 @@ files:
 - tests/test_interface.rb
 - tests/test_interface_bdi.rb
 - tests/test_interface_channel_group.rb
+- tests/test_interface_evpn_multisite.rb
 - tests/test_interface_hsrp.rb
 - tests/test_interface_hsrp_group.rb
 - tests/test_interface_ospf.rb
@@ -417,6 +431,7 @@ files:
 - tests/test_interface_service_vni.rb
 - tests/test_interface_svi.rb
 - tests/test_interface_switchport.rb
+- tests/test_ip_multicast.rb
 - tests/test_itd_device_group.rb
 - tests/test_itd_device_group_node.rb
 - tests/test_itd_service.rb
@@ -493,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Utilities for management of Cisco network nodes