cisco_node_utils 1.10.0 → 2.0.0

data/tests/ciscotest.rb

@@ -153,12 +153,16 @@ class CiscoTestCase < TestCase
   # Some NXOS hardware is not capable of supporting certain features even
   # though the platform family in general includes support. In these cases
   # the NU feature setter will raise a RuntimeError.
-  def hardware_supports_feature?(message)
+  # Default behavior is to skip/flunk.
+  def hardware_supports_feature?(message, status_only: false)
     patterns = ['Hardware is not capable of supporting',
                 'is unsupported on this node',
+                'Feature NOT supported on this Platform',
                ]
-    skip('Skip test: Feature is unsupported on this device') if
-      message[Regexp.union(patterns)]
+    if message[Regexp.union(patterns)]
+      return true if status_only
+      skip('Skip test: Feature is unsupported on this device')
+    end
     flunk(message)
   end
 
@@ -213,6 +217,12 @@ class CiscoTestCase < TestCase
       Gem::Version.new(lim) < Gem::Version.new(ver)
   end
 
+  def skip_if_UnsupportedCmdRef(feature_name, attribute_name) # rubocop:disable Style/MethodName
+    # Check if attr is excluded by the cmd_ref yaml
+    skip("UnsupportedCmdRef attribute: '#{attribute_name}'") if
+      cmd_ref.lookup(feature_name, attribute_name).is_a?(UnsupportedCmdRef)
+  end
+
   def skip_nexus_i2_image?
     skip("This property is not supported on Nexus 'I2' images") if
       Utils.nexus_i2_image
@@ -550,7 +560,7 @@ class CiscoTestCase < TestCase
     when /N3K-C35/
       tag = 'n35'
     when /N3/
-      tag = Utils.image_version?(/7.0.3.F/) ? 'n3k-f' : 'n3k'
+      tag = Utils.fretta? ? 'n3k-f' : 'n3k'
     when /N5/
       tag = 'n5k'
     when /N6/
@@ -558,7 +568,7 @@ class CiscoTestCase < TestCase
     when /N7/
       tag = 'n7k'
     when /N9/
-      tag = Utils.image_version?(/7.0.3.F/) ? 'n9k-f' : 'n9k'
+      tag = Utils.fretta? ? 'n9k-f' : 'n9k'
     else
       fail "Unrecognized product_id: #{@product_id}"
     end

data/tests/cmd_config.yaml

@@ -12,7 +12,6 @@ nexus:
             feature hsrp
             feature lacp
             feature dhcp
-            feature vtp
 
   feature-disable:
     command: |
@@ -25,7 +24,6 @@ nexus:
             no feature hsrp
             no feature lacp
             no feature dhcp
-            no feature vtp
     nvgen: false
 
   feature-snmp-comm-acl-ro:

data/tests/test_acl.rb

@@ -169,7 +169,7 @@ class TestAcl < CiscoTestCase
   end
 
   def test_fragments
-    if node.product_id[/N(5|6)/]
+    if product_tag[/n(3k-f|5k|6k|9k-f)/]
       a = Acl.new('ipv4', 'acl_fragments')
       assert_nil(a.fragments)
       assert_nil(a.default_fragments)

data/tests/test_bgp_af.rb

@@ -170,6 +170,12 @@ class TestBgpAF < CiscoTestCase
       # triggers a version check below.
       if expect == :runtime
         case Platform.image_version
+        when /7\.3/
+          expect = :success if test == :additional_paths_send ||
+                               test == :additional_paths_receive ||
+                               test == :additional_paths_selection ||
+                               test == :maximum_paths ||
+                               test == :maximum_paths_ibgp
         when /8.0|8.1|8.2|8.3|F3.2/
           expect = :success
           expect = :runtime if test == :additional_paths_receive && Platform.image_version[/8.0|8.1/]

data/tests/test_feature.rb

@@ -84,6 +84,8 @@ class TestFeature < CiscoTestCase
 
     # Return testbed to pre-clean state
     config("no feature #{feat_str}") unless pre_clean_enabled
+  rescue RuntimeError => e
+    hardware_supports_feature?(e.message)
   end
 
   ###################
@@ -171,20 +173,22 @@ class TestFeature < CiscoTestCase
 
   def test_vn_segment_vlan_based
     vxlan_linecard?
-    Feature.nv_overlay_enable unless node.product_id[/N3/]
+    Feature.fabricpath_enable if node.product_id[/N(5|6)/]
+    Feature.nv_overlay_enable unless node.product_id[/N(3|5|6)/]
     feature('vn_segment_vlan_based')
   rescue RuntimeError => e
     hardware_supports_feature?(e.message)
   end
 
   def test_vni
-    if node.product_id[/N(5|6)/]
-      Feature.nv_overlay_enable
-    else
+    # 7k: 'feature vni'; All others: 'feature vn-segment-vlan-based'.
+    # Dependencies: 5/6k: feature-set fabricpath; 3/9k: feature nv overlay
+    if node.product_id[/N7/]
       # vni can't be removed if nv overlay is present
       config_no_warn('no feature nv overlay')
       vdc_limit_f3_no_intf_needed(:set)
     end
+    Feature.fabricpath_enable if node.product_id[/N(5|6)/]
     feature('vni')
   rescue RuntimeError => e
     hardware_supports_feature?(e.message)
@@ -220,6 +224,28 @@ class TestFeature < CiscoTestCase
     assert(Feature.fabric_enabled?, "(#{fs}) is not enabled")
   end
 
+  def test_feature_set_fabricpath
+    if node.product_id[/N(3|8|9)/]
+      assert_nil(Feature.fabricpath_enabled?)
+      assert_raises(Cisco::UnsupportedError) { Feature.fabricpath_enable }
+      return
+    end
+    vdc_limit_f3_no_intf_needed(:set)
+    fs = 'feature-set fabricpath'
+    # Get current state of the feature-set
+    feature_set_installed = Feature.fabricpath_installed?
+
+    config("no #{fs} ; no install #{fs}") if feature_set_installed
+    refute_show_match(
+      command: "show running | i '^install #{fs}$'",
+      pattern: /^install #{fs}$/,
+      msg:     "(#{fs}) is still configured",
+    )
+
+    Feature.fabricpath_enable
+    assert(Feature.fabricpath_enabled?, "(#{fs}) is not enabled")
+  end
+
   def test_feature_set_fex
     if validate_property_excluded?('feature', 'fex')
       assert_nil(Feature.fex_enabled?)

data/tests/test_interface.rb

@@ -346,6 +346,8 @@ class TestInterface < CiscoTestCase
     # Validate the collection
     inttype_h.each_value do |v|
       interface = v[:interface]
+      next if interface.name[/vlan|loopback/]
+      interface.switchport_mode = :access
 
       assert_equal(v[:access_vlan], interface.access_vlan,
                    'Error: Access vlan value not correct')
@@ -353,6 +355,7 @@ class TestInterface < CiscoTestCase
       # get_default check
       assert_equal(v[:default_access_vlan], interface.default_access_vlan,
                    'Error: Access vlan, default,  value not correct')
+      interface.switchport_mode = :disabled
     end
   end
 
@@ -856,8 +859,7 @@ class TestInterface < CiscoTestCase
     config("interface #{int}")
     interface = Interface.new(int)
 
-    assert_equal(interface.negotiate_auto, ref.default_value,
-                 "Error: #{int} negotiate auto value mismatch")
+    assert_nil(interface.negotiate_auto)
 
     assert_raises(Cisco::UnsupportedError) do
       interface.negotiate_auto = true
@@ -1328,8 +1330,6 @@ class TestInterface < CiscoTestCase
         default_shutdown:    true,
         switchport:          :disabled,
         default_switchport:  :disabled,
-        access_vlan:         DEFAULT_IF_ACCESS_VLAN,
-        default_access_vlan: DEFAULT_IF_ACCESS_VLAN,
         vrf_new:             'test2',
         default_vrf:         DEFAULT_IF_VRF,
       }
@@ -1362,8 +1362,6 @@ class TestInterface < CiscoTestCase
       default_shutdown:    false,
       switchport:          platform == :ios_xr ? nil : :disabled,
       default_switchport:  platform == :ios_xr ? nil : :disabled,
-      access_vlan:         DEFAULT_IF_ACCESS_VLAN,
-      default_access_vlan: DEFAULT_IF_ACCESS_VLAN,
       vrf_new:             'test2',
       default_vrf:         DEFAULT_IF_VRF,
     }
@@ -1411,12 +1409,12 @@ class TestInterface < CiscoTestCase
       validate_interfaces_not_empty
       validate_get_switchport(inttype_h)
       validate_description(inttype_h)
-      validate_get_access_vlan(inttype_h) unless platform == :ios_xr
       validate_ipv4_address(inttype_h)
       validate_ipv4_proxy_arp(inttype_h)
       validate_ipv4_redirects(inttype_h)
       validate_interface_shutdown(inttype_h)
       validate_vrf(inttype_h)
+      validate_get_access_vlan(inttype_h) unless platform == :ios_xr
       config(*cfg)
       interface_ethernet_default(interfaces[1])
     rescue Minitest::Assertion

data/tests/test_interface_ospf.rb

@@ -597,7 +597,11 @@ class TestInterfaceOspf < CiscoTestCase
           msg:     "Error: ip router ospf #{name} area #{hv[:area]} "\
                    "not found under #{ifname}")
 
-        assert_equal(hv[:bfd], interface.bfd, 'Error: get bfd failed')
+        if hv[:bfd].nil?
+          assert_nil(interface.bfd, 'Error: get bfd is not nil')
+        else
+          assert_equal(hv[:bfd], interface.bfd, 'Error: get bfd failed')
+        end
         assert_equal(hv[:cost], interface.cost, 'Error: get cost failed')
         assert_equal(hv[:hello], interface.hello_interval,
                      'Error: get hello interval failed')

data/tests/test_interface_private_vlan.rb

@@ -88,6 +88,7 @@ class TestInterfacePVlan < CiscoTestCase
       return
     end
 
+    i.switchport_mode = :access
     assert_equal(i.default_switchport_pvlan_host,
                  i.switchport_pvlan_host)
 
@@ -96,6 +97,7 @@ class TestInterfacePVlan < CiscoTestCase
 
     i.switchport_pvlan_host = false
     refute(i.switchport_pvlan_host)
+    i.switchport_mode = :disabled
   end
 
   def test_sw_pvlan_promiscuous
@@ -107,6 +109,7 @@ class TestInterfacePVlan < CiscoTestCase
       return
     end
 
+    i.switchport_mode = :access
     assert_equal(i.default_switchport_pvlan_promiscuous,
                  i.switchport_pvlan_promiscuous)
 
@@ -115,6 +118,7 @@ class TestInterfacePVlan < CiscoTestCase
 
     i.switchport_pvlan_promiscuous = false
     refute(i.switchport_pvlan_promiscuous)
+    i.switchport_mode = :disabled
   end
 
   def test_sw_pvlan_trunk_promiscuous
@@ -126,6 +130,7 @@ class TestInterfacePVlan < CiscoTestCase
       return
     end
 
+    i.switchport_mode = :access
     assert_equal(i.default_switchport_pvlan_trunk_promiscuous,
                  i.switchport_pvlan_trunk_promiscuous)
 
@@ -134,6 +139,7 @@ class TestInterfacePVlan < CiscoTestCase
 
     i.switchport_pvlan_trunk_promiscuous = false
     refute(i.switchport_pvlan_trunk_promiscuous)
+    i.switchport_mode = :disabled
   end
 
   def test_sw_pvlan_trunk_secondary
@@ -145,6 +151,7 @@ class TestInterfacePVlan < CiscoTestCase
       return
     end
 
+    i.switchport_mode = :access
     assert_equal(i.default_switchport_pvlan_trunk_secondary,
                  i.switchport_pvlan_trunk_secondary)
 
@@ -153,6 +160,7 @@ class TestInterfacePVlan < CiscoTestCase
 
     i.switchport_pvlan_trunk_secondary = false
     refute(i.switchport_pvlan_trunk_secondary)
+    i.switchport_mode = :disabled
   end
 
   # Helper to setup vlan associations
@@ -188,6 +196,9 @@ class TestInterfacePVlan < CiscoTestCase
   end
 
   def test_sw_pvlan_trunk_association
+    # N6k trunk association does not update primary-secondary associations automatically
+    skip('Test behavior not supported on device') if node.product_id[/N(5|6)/]
+
     # Supports multiple instances of [[pri, sec], [pri2, sec2]]
     if validate_property_excluded?('interface',
                                    'switchport_pvlan_trunk_association')
@@ -246,6 +257,9 @@ class TestInterfacePVlan < CiscoTestCase
   end
 
   def test_sw_pvlan_mapping_trunk
+    # N6k mapping trunk does not update primary-secondary associations automatically
+    skip('Test behavior not supported on device') if node.product_id[/N(5|6)/]
+
     if validate_property_excluded?('interface',
                                    'switchport_pvlan_mapping_trunk')
       assert_raises(Cisco::UnsupportedError) do
@@ -261,7 +275,6 @@ class TestInterfacePVlan < CiscoTestCase
     assert_equal([['2', '4-8,10-11']], i.switchport_pvlan_mapping_trunk)
 
     # Same primary, but change range
-
     i.switchport_pvlan_mapping_trunk = ['2', '11,4-6,8']
     assert_equal([['2', '4-6,8,11']], i.switchport_pvlan_mapping_trunk)
 
@@ -309,6 +322,7 @@ class TestInterfacePVlan < CiscoTestCase
       return
     end
 
+    i.switchport_mode = :access
     default = i.default_switchport_pvlan_trunk_allowed_vlan
     assert_equal(default, i.switchport_pvlan_trunk_allowed_vlan)
 
@@ -325,6 +339,7 @@ class TestInterfacePVlan < CiscoTestCase
     vlans = '500-528,530,532,534,587,590-593,597-598,600,602,604'
     i.switchport_pvlan_trunk_allowed_vlan = vlans
     assert_equal(vlans, i.switchport_pvlan_trunk_allowed_vlan)
+    i.switchport_mode = :disabled
   end
 
   def test_sw_pvlan_trunk_native_vlan
@@ -336,6 +351,7 @@ class TestInterfacePVlan < CiscoTestCase
       return
     end
 
+    i.switchport_mode = :access
     default = i.default_switchport_pvlan_trunk_native_vlan
     assert_equal(default, i.switchport_pvlan_trunk_native_vlan)
 
@@ -344,5 +360,6 @@ class TestInterfacePVlan < CiscoTestCase
 
     i.switchport_pvlan_trunk_native_vlan = default
     assert_equal(default, i.switchport_pvlan_trunk_native_vlan)
+    i.switchport_mode = :disabled
   end
 end

data/tests/test_interface_svi.rb

@@ -195,7 +195,7 @@ class TestSvi < CiscoTestCase
 
   def test_sys_def_svi_autostate
     skip_autostate_test?
-    skip_legacy_defect?('8.0.1|8.1.1', 'CSC: Behavior change after helsinki')
+    skip_legacy_defect?('8.0.1|8.1.1|8\.3', 'CSC: Behavior change after helsinki')
     interface = Interface.new(interfaces[0])
 
     system_default_svi_autostate('no ')

data/tests/test_interface_switchport.rb

@@ -80,11 +80,7 @@ class TestSwitchport < TestInterfaceSwitchport
 
   def test_access_vlan_sw_disabled
     interface.switchport_mode = :disabled
-    if platform == :ios_xr
-      assert_nil(interface.access_vlan)
-    else
-      assert_equal(DEFAULT_IF_ACCESS_VLAN, interface.access_vlan)
-    end
+    assert_nil(interface.access_vlan)
   end
 
   def test_access_vlan_sw_trunk
@@ -414,12 +410,13 @@ class TestInterfaceSwVtp < TestInterfaceSwitchport
 
   def setup
     super
-    skip('VTP is not supported on IOS XR') if platform == :ios_xr
+    skip('VTP is not supported on IOS XR or fretta') if
+      platform == :ios_xr || product_tag[/n(3|9)k-f/]
     @vtp = Vtp.new(true)
   end
 
   def teardown
-    vtp.destroy unless platform == :ios_xr
+    vtp.destroy unless platform == :ios_xr || product_tag[/n(3|9)k-f/]
     super
   end
 

data/tests/test_node_ext.rb

@@ -142,7 +142,7 @@ class TestNodeExt < CiscoTestCase
 
   def test_get_product_id
     # N3|9K Fretta product_id gets a '-F' appended so remove it for this check
-    if Utils.image_version?(/7.0.3.F/)
+    if product_tag[/n(3|9)k-f/]
       chassis = node.product_id.sub('-F', '')
     else
       chassis = node.product_id

data/tests/test_nxapi.rb

@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative 'basetest'
+require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/node'
 
 # TestNxapi - NXAPI client unit tests
-class TestNxapi < TestCase
+class TestNxapi < CiscoTestCase
   @@client = nil # rubocop:disable Style/ClassVars
 
   def self.runnable_methods
@@ -161,7 +161,7 @@ class TestNxapi < TestCase
     cmd = { command:     'show snmp internal globals',
             data_format: :nxapi_structured }
     if @product_id[/N(5|6)/]
-      assert_empty(client.get(cmd))
+      assert_empty(client.get(cmd).to_s)
     else
       assert_raises(Cisco::RequestNotSupported) { client.get(cmd) }
     end
@@ -207,12 +207,22 @@ class TestNxapi < TestCase
 
   def test_unsupported
     # Add a method to the NXAPI that sends a request of invalid type
-    def client.hello
-      req('hello', 'world')
-    end
+    if !product_tag[/n(3|9)k-f/]
+      def client.hello
+        req('hello', 'world')
+      end
+
+      assert_raises Cisco::RequestNotSupported do
+        client.hello
+      end
+    else
+      def client.hello
+        req('hello', 'world')
+      end
 
-    assert_raises Cisco::RequestNotSupported do
-      client.hello
+      assert_raises Cisco::ClientError do
+        client.hello
+      end
     end
   end
 

data/tests/test_radius_global.rb

@@ -66,8 +66,8 @@ class TestRadiusGlobal < CiscoTestCase
                  2)
 
     if platform == :nexus
-      key = '44444444'
-      global.key_set(key, nil)
+      key = 'aaaAAAGGTTYTYY 44444444 72'
+      global.key_set(key, 7)
       assert_match(/#{key}/, global.key)
       assert_match(/#{key}/, Cisco::RadiusGlobal.radius_global[id].key)
       assert_equal(7, global.key_format)
@@ -93,6 +93,7 @@ class TestRadiusGlobal < CiscoTestCase
     assert_nil(global.key)
 
     # Default source interface
+    global.source_interface = global.default_source_interface
     assert_nil(global.source_interface)
 
     # Set source interface