cisco_node_utils 1.1.0 → 1.2.0

data/tests/test_interface_svi.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2015 Cisco and/or its affiliates.
+# Copyright (c) 2014-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.
@@ -19,6 +19,27 @@ include Cisco
 
 # TestSvi - Minitest for Interface configuration of SVI interfaces.
 class TestSvi < CiscoTestCase
+  @@pre_clean_needed = true # rubocop:disable Style/ClassVars
+
+  def remove_all_svis
+    Interface.interfaces.each do |int, obj|
+      next unless int[/vlan/]
+      next if int[/vlan1/]
+      obj.destroy
+    end
+  end
+
+  def setup
+    super
+    remove_all_svis if @@pre_clean_needed
+    @@pre_clean_needed = false # rubocop:disable Style/ClassVars
+  end
+
+  def teardown
+    super
+    remove_all_svis
+  end
+
   def cmd_ref_autostate
     ref = cmd_ref.lookup('interface', 'svi_autostate')
     assert(ref, 'Error, reference not found for autostate')
@@ -35,11 +56,17 @@ class TestSvi < CiscoTestCase
     end
   end
 
+  def skip_autostate_test?
+    skip('svi autostate properties are not supported on this platform') if
+      node.product_id =~ /N(5|6)K/
+  end
+
   def system_default_svi_autostate(state='')
     config("#{state}system default interface-vlan autostate")
   end
 
-  def test_svi_prop_nil_when_ethernet
+  def test_prop_nil_when_ethernet
+    skip_autostate_test?
     intf = Interface.new(interfaces[0])
     assert_nil(intf.svi_autostate,
                'Error: svi_autostate should be nil when interface is ethernet')
@@ -47,7 +74,7 @@ class TestSvi < CiscoTestCase
                'Error: svi_management should be nil when interface is ethernet')
   end
 
-  def test_svi_create_valid
+  def test_create_valid
     svi = Interface.new('Vlan23')
     s = @device.cmd('show run interface all | inc Vlan')
     cmd = 'interface Vlan1'
@@ -63,25 +90,25 @@ class TestSvi < CiscoTestCase
     refute(s.include?(cmd), 'Error: svi Vlan23 still configured')
   end
 
-  def test_svi_create_vlan_invalid
+  def test_create_vlan_invalid
     assert_raises(CliError) { Interface.new('10.1.1.1') }
   end
 
-  def test_svi_create_vlan_invalid_value
+  def test_create_vlan_invalid_value
     assert_raises(CliError) { Interface.new('Vlan0') }
   end
 
-  def test_svi_create_vlan_nil
+  def test_create_vlan_nil
     assert_raises(TypeError) { Interface.new(nil) }
   end
 
-  def test_svi_name
+  def test_name
     svi = Interface.new('Vlan23')
     assert_equal('vlan23', svi.name, 'Error: svi vlan name is wrong')
     svi.destroy
   end
 
-  def test_svi_assignment
+  def test_assignment
     svi = Interface.new('Vlan23')
     svi.svi_management = true
     assert(svi.svi_management, 'Error: svi svi_management, false')
@@ -90,32 +117,26 @@ class TestSvi < CiscoTestCase
     svi.destroy
   end
 
-  def test_svi_get_autostate_false
+  def test_get_autostate_false
+    skip_autostate_test?
     svi = Interface.new('Vlan23')
 
     config('interface vlan 23', 'no autostate')
-    ref = cmd_ref_autostate
-    result = ref.default_value
-    result = false if ref.config_set
-    assert_equal(result, svi.svi_autostate,
-                 'Error: svi autostate not correct.')
+    refute(svi.svi_autostate, 'Error: svi autostate not correct.')
     svi.destroy
   end
 
-  def test_svi_get_autostate_true
+  def test_get_autostate_true
+    skip_autostate_test?
     svi = Interface.new('Vlan23')
 
     config('interface vlan 23', 'autostate')
-
-    ref = cmd_ref_autostate
-    result = ref.default_value
-    result = true if ref.config_set
-    assert_equal(result, svi.svi_autostate,
-                 'Error: svi autostate not correct.')
+    assert(svi.svi_autostate, 'Error: svi autostate not correct.')
     svi.destroy
   end
 
-  def test_svi_set_autostate_false
+  def test_set_autostate_false
+    skip_autostate_test?
     ref = cmd_ref_autostate
     svi = Interface.new('Vlan23')
     assert_result(ref.test_config_result(false),
@@ -125,7 +146,8 @@ class TestSvi < CiscoTestCase
     svi.destroy
   end
 
-  def test_svi_set_autostate_true
+  def test_set_autostate_true
+    skip_autostate_test?
     svi = Interface.new('Vlan23')
     ref = cmd_ref_autostate
     assert_result(ref.test_config_result(true),
@@ -135,7 +157,8 @@ class TestSvi < CiscoTestCase
     svi.destroy
   end
 
-  def test_svi_set_autostate_default
+  def test_set_autostate_default
+    skip_autostate_test?
     svi = Interface.new('Vlan23')
     ref = cmd_ref_autostate
     default_value = ref.default_value
@@ -146,7 +169,7 @@ class TestSvi < CiscoTestCase
     svi.destroy
   end
 
-  def test_svi_get_management_true
+  def test_get_management_true
     svi = Interface.new('Vlan23')
 
     config('interface vlan 23', 'management')
@@ -155,21 +178,21 @@ class TestSvi < CiscoTestCase
     svi.destroy
   end
 
-  def test_svi_set_management_false
+  def test_set_management_false
     svi = Interface.new('Vlan23')
     svi.svi_management = false
     refute(svi.svi_management)
     svi.destroy
   end
 
-  def test_svi_set_management_true
+  def test_set_management_true
     svi = Interface.new('Vlan23')
     svi.svi_management = true
     assert(svi.svi_management)
     svi.destroy
   end
 
-  def test_svi_set_management_default
+  def test_set_management_default
     svi = Interface.new('Vlan23')
     svi.svi_management = true
     assert(svi.svi_management)
@@ -179,47 +202,38 @@ class TestSvi < CiscoTestCase
     svi.destroy
   end
 
-  def test_svi_get_svis
-    count = 5
-
-    ref = cmd_ref_autostate
-    # Have to account for interface Vlan1 why we add 1 to count
-    (2..count + 1).each do |i|
-      str = 'Vlan' + i.to_s
-      svi = Interface.new(str)
-      assert_result(ref.test_config_result(false),
-                    'Error: svi autostate not set to false') do
-        svi.svi_autostate = false
-      end
-      svi.svi_management = true
+  def config_svi_properties(state)
+    # Skip default vlan1
+    (2..6).each do |i|
+      svi = Interface.new('Vlan' + i.to_s)
+      svi.svi_autostate = state unless /N(5|6)K/.match(node.product_id)
+      svi.svi_management = state
     end
+  end
 
-    svis = Interface.interfaces
-    ref = cmd_ref_autostate
-    result = ref.default_value
-    svis.each do |id, svi|
-      case id
-      when /^vlan1$/
-        result = true if ref.config_set
-        assert_equal(result, svi.svi_autostate,
-                     'Error: svis collection, Vlan1, incorrect autostate')
-        refute(svi.svi_management,
-               'Error: svis collection, Vlan1, incorrect management')
-      when /^vlan/
-        result = false if ref.config_set
-        assert_equal(result, svi.svi_autostate,
-                     "Error: svis collection, Vlan#{id}, incorrect autostate")
-        assert(svi.svi_management,
-               "Error: svis collection, Vlan#{id}, incorrect management")
+  def test_get_svis
+    config_svi_properties(true)
+    Interface.interfaces.each do |id, obj|
+      next if id[/vlan1/]
+      next unless id[/vlan/]
+      unless /N(5|6)K/.match(node.product_id)
+        assert(obj.svi_autostate, "svi autostate should be enabled #{id}")
       end
+      assert(obj.svi_management, "svi management should be enabled #{id}")
     end
 
-    svis.each_key do |id|
-      config("no interface #{id}") if id[/^vlan/]
+    config_svi_properties(false)
+    Interface.interfaces.each do |id, obj|
+      next if id[/vlan1/]
+      next unless id[/vlan/]
+      unless /N(5|6)K/.match(node.product_id)
+        refute(obj.svi_autostate, "svi autostate should be disabled #{id}")
+      end
+      refute(obj.svi_management, "svi management should be disabled #{id}")
     end
   end
 
-  def test_svi_create_interface_description
+  def test_create_interface_description
     svi = Interface.new('Vlan23')
 
     description = 'Test description'
@@ -230,7 +244,8 @@ class TestSvi < CiscoTestCase
   end
 
   def test_system_default_svi_autostate_on_off
-    interface = Interface.new('Eth1/1')
+    skip_autostate_test?
+    interface = Interface.new(interfaces[0])
 
     system_default_svi_autostate('no ')
     refute(interface.system_default_svi_autostate,

data/tests/test_interface_switchport.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2015 Cisco and/or its affiliates.
+# Copyright (c) 2014-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.
@@ -49,6 +49,11 @@ class TestInterfaceSwitchport < CiscoTestCase
     end
   end
 
+  def platform_supports_vtp_switchport_access?
+    skip('Platform does not support VTP when switchport mode is access') if
+      node.product_id =~ /N(5|6|7)/
+  end
+
   def system_default_switchport(state='')
     config("#{state} system default switchport")
   end
@@ -100,6 +105,7 @@ class TestInterfaceSwitchport < CiscoTestCase
   end
 
   def test_switchport_vtp_enabled_access
+    platform_supports_vtp_switchport_access?
     vtp = Vtp.new(true)
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :access
@@ -147,6 +153,7 @@ class TestInterfaceSwitchport < CiscoTestCase
   end
 
   def test_set_switchport_vtp_default_access
+    platform_supports_vtp_switchport_access?
     vtp = Vtp.new(true)
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :access
@@ -188,6 +195,7 @@ class TestInterfaceSwitchport < CiscoTestCase
   end
 
   def test_set_switchport_vtp_true_access
+    platform_supports_vtp_switchport_access?
     vtp = Vtp.new(true)
     interface = Interface.new(interfaces[0])
 
@@ -304,7 +312,7 @@ class TestInterfaceSwitchport < CiscoTestCase
            'switchport autostate exclude')
 
     cmd_ref = cmd_ref_switchport_autostate_exclude
-    if cmd_ref.config_set
+    if cmd_ref.config_set?
       assert(interface.switchport_autostate_exclude,
              'Error: interface, access, autostate exclude not enabled')
     else
@@ -333,7 +341,7 @@ class TestInterfaceSwitchport < CiscoTestCase
            'switchport autostate exclude')
 
     cmd_ref = cmd_ref_switchport_autostate_exclude
-    if cmd_ref.config_set
+    if cmd_ref.config_set?
       assert(interface.switchport_autostate_exclude,
              'Error: interface, access, autostate exclude not enabled')
     else
@@ -715,7 +723,7 @@ class TestInterfaceSwitchport < CiscoTestCase
   #   end
 
   def test_system_default_switchport_on_off
-    interface = Interface.new('Eth1/1')
+    interface = Interface.new(interfaces[0])
 
     system_default_switchport('')
     assert(interface.system_default_switchport,
@@ -725,10 +733,14 @@ class TestInterfaceSwitchport < CiscoTestCase
     system_default_switchport('no ')
     refute(interface.system_default_switchport,
            'Test for disabled - failed')
+  rescue RuntimeError => e
+    skip('NX-OS defect: system default switchport nvgens twice') if
+      e.message[/Expected zero.one value/]
+    flunk(e.message)
   end
 
   def test_system_default_switchport_shutdown_on_off
-    interface = Interface.new('Eth1/1')
+    interface = Interface.new(interfaces[0])
 
     system_default_switchport_shutdown('no ')
     refute(interface.system_default_switchport_shutdown,

data/tests/test_name_server.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for NameServer class
 #
-# Copyright (c) 2014-2015 Cisco and/or its affiliates.
+# Copyright (c) 2014-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.

data/tests/test_node.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 Cisco and/or its affiliates.
+# Copyright (c) 2013-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.

data/tests/test_node_ext.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 Cisco and/or its affiliates.
+# Copyright (c) 2013-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.
@@ -84,17 +84,7 @@ vrf blue",
     node.client.config(['interface loopback1', 'no shutdown'])
 
     result = node.config_get('interface', 'shutdown', 'loopback1')
-    assert_nil(result)
-  end
-
-  def test_node_token_str_to_regexp
-    token = ['/%s/i', '/%s foo %s/', '/zzz/i']
-    args = %w(LoopBack2 no bar)
-    expected = [/LoopBack2/i, /no foo bar/, /zzz/i]
-
-    result = node.token_str_to_regexp(token, args)
-    # puts "intersection: #{result & expected}, diff: #{result - expected}"
-    assert_equal(expected, result)
+    refute(result)
   end
 
   def test_node_config_get_invalid
@@ -126,13 +116,13 @@ vrf blue",
   def test_node_config_set
     node.config_set('snmp_server', 'aaa_user_cache_timeout', '', 100)
     run = node.client.show('show run all | inc snmp')
-    val = find_one_ascii(run, /snmp-server aaa-user cache-timeout (\d+)/)
-    assert_equal('100', val)
+    val = find_ascii(run, /snmp-server aaa-user cache-timeout (\d+)/)
+    assert_equal(['100'], val)
 
     node.config_set('snmp_server', 'aaa_user_cache_timeout', 'no', 100)
     run = node.client.show('show run all | inc snmp')
-    val = find_one_ascii(run, /snmp-server aaa-user cache-timeout (\d+)/)
-    assert_equal('3600', val)
+    val = find_ascii(run, /snmp-server aaa-user cache-timeout (\d+)/)
+    assert_equal(['3600'], val)
   end
 
   def test_node_config_set_invalid
@@ -236,8 +226,8 @@ vrf blue",
     assert_equal('switch', name)
 
     return unless configured_name
-    config("hostname #{configured_name}") if (switchname == false)
-    config("switchname #{configured_name}") if (switchname == true)
+    config("hostname #{configured_name}") if switchname == false
+    config("switchname #{configured_name}") if switchname == true
   end
 
   def test_node_get_host_name_when_set
@@ -266,8 +256,8 @@ vrf blue",
     assert_equal('xyz', host_name)
 
     if configured_name
-      config("hostname #{configured_name}") if (switchname == false)
-      config("switchname #{configured_name}") if (switchname == true)
+      config("hostname #{configured_name}") if switchname == false
+      config("switchname #{configured_name}") if switchname == true
     else
       switchname ? config('no switchname') : config('no hostname')
     end

data/tests/test_ntp_config.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for NtpConfig class
 #
-# Copyright (c) 2015 Cisco and/or its affiliates.
+# Copyright (c) 2015-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.

data/tests/test_ntp_server.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for NtpServer class
 #
-# Copyright (c) 2014-2015 Cisco and/or its affiliates.
+# Copyright (c) 2014-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.
@@ -35,7 +35,7 @@ class TestNtpServer < CiscoTestCase
   def no_ntpserver_uk
     # Turn the feature off for a clean test.
     config('no ntpserver 130.88.203.12',
-           'no ntpserver 194.207.34.9')
+           'no ntpserver 2003::5')
   end
 
   # TESTS
@@ -46,7 +46,19 @@ class TestNtpServer < CiscoTestCase
 
     ntp = Cisco::NtpServer.new(id, false)
     assert_includes(Cisco::NtpServer.ntpservers, id)
-    assert_equal(Cisco::NtpServer.ntpservers[id], ntp)
+    assert_equal(ntp, Cisco::NtpServer.ntpservers[id])
+
+    ntp.destroy
+    refute_includes(Cisco::NtpServer.ntpservers, id)
+  end
+
+  def test_ntpserver_create_destroy_single_ipv6
+    id = '2003::5'
+    refute_includes(Cisco::NtpServer.ntpservers, id)
+
+    ntp = Cisco::NtpServer.new(id, false)
+    assert_includes(Cisco::NtpServer.ntpservers, id)
+    assert_equal(ntp, Cisco::NtpServer.ntpservers[id])
 
     ntp.destroy
     refute_includes(Cisco::NtpServer.ntpservers, id)
@@ -54,7 +66,7 @@ class TestNtpServer < CiscoTestCase
 
   def test_ntpserver_create_destroy_multiple
     id1 = '130.88.203.12'
-    id2 = '194.207.34.9'
+    id2 = '2003::5'
     refute_includes(Cisco::NtpServer.ntpservers, id1)
     refute_includes(Cisco::NtpServer.ntpservers, id2)
 
@@ -63,8 +75,8 @@ class TestNtpServer < CiscoTestCase
     refute_equal(ntp1, ntp2)
     assert_includes(Cisco::NtpServer.ntpservers, id1)
     assert_includes(Cisco::NtpServer.ntpservers, id2)
-    assert_equal(Cisco::NtpServer.ntpservers[id1], ntp1)
-    assert_equal(Cisco::NtpServer.ntpservers[id2], ntp2)
+    assert_equal(ntp1, Cisco::NtpServer.ntpservers[id1])
+    assert_equal(ntp2, Cisco::NtpServer.ntpservers[id2])
 
     ntp1.destroy
     ntp2.destroy