cisco_node_utils 1.6.0 → 1.7.0

data/tests/test_bgp_neighbor.rb

@@ -315,7 +315,7 @@ class TestBgpNeighbor < CiscoTestCase
   end
 
   def test_log_neighbor_changes
-    if platform == :ios_xr || node.product_id[/N(5|6|7)/]
+    if platform == :ios_xr || node.product_id[/N(5|6)/]
       b = create_neighbor('blue')
       assert_nil(b.log_neighbor_changes)
       assert_nil(b.default_log_neighbor_changes)
@@ -324,6 +324,7 @@ class TestBgpNeighbor < CiscoTestCase
       end
       return
     end
+    skip_incompat_version?('bgp_neighbor', 'log_neighbor_changes')
     %w(default test_vrf).each do |vrf|
       neighbor = create_neighbor(vrf)
       check = [:enable, :disable, :inherit, 'enable', 'disable', 'inherit',

data/tests/test_bgp_neighbor_af.rb

@@ -64,10 +64,10 @@ class TestBgpNeighborAF < CiscoTestCase
     asn, vrf, nbr, af = af_args
     dbg = sprintf('[VRF %s NBR %s AF %s]', vrf, nbr, af.join('/'))
 
-    obj_nbr = RouterBgpNeighbor.new(asn, vrf, nbr, true)
+    obj_nbr = RouterBgpNeighbor.new(asn, vrf, nbr)
     obj_nbr.remote_as = ebgp ? asn + 1 : asn
 
-    obj_af = RouterBgpNeighborAF.new(asn, vrf, nbr, af, true)
+    obj_af = RouterBgpNeighborAF.new(asn, vrf, nbr, af)
 
     # clean up address-family only
     obj_af.destroy
@@ -160,7 +160,7 @@ class TestBgpNeighborAF < CiscoTestCase
     @@matrix.each do |k, v|
       asn, vrf, nbr, af = v
       dbg = sprintf('[VRF %s NBR %s AF %s]', vrf, nbr, af)
-      obj[k] = RouterBgpNeighborAF.new(asn, vrf, nbr, af, true)
+      obj[k] = RouterBgpNeighborAF.new(asn, vrf, nbr, af)
       # TBD: This flush should not be needed but we see an intermittent problem
       # with certain rake test seed values, where 'afs' below is not detecting
       # vrf 'aa' AF.
@@ -193,13 +193,13 @@ class TestBgpNeighborAF < CiscoTestCase
         # so make sure to catch the error
         assert_raises(UnsupportedError,
                       'Neighbors do not support slash notation') do
-          RouterBgpNeighborAF.new(asn, vrf, nbr, af, true)
+          RouterBgpNeighborAF.new(asn, vrf, nbr, af)
         end
         next
       end
       next if platform == :ios_xr
       dbg = sprintf('[VRF %s NBR %s AF %s]', vrf, nbr, af.join('/'))
-      obj[k] = RouterBgpNeighborAF.new(asn, vrf, nbr, af, true)
+      obj[k] = RouterBgpNeighborAF.new(asn, vrf, nbr, af)
       nbr_munged = Utils.process_network_mask(nbr)
       # TBD: This flush should not be needed but we see an intermittent problem
       # with certain rake test seed values, where 'afs' below is not detecting
@@ -217,7 +217,7 @@ class TestBgpNeighborAF < CiscoTestCase
       if platform == :ios_xr
         assert_raises(UnsupportedError,
                       'Neighbors do not support slash notation') do
-          RouterBgpNeighborAF.new(asn, vrf, nbr, af, true)
+          RouterBgpNeighborAF.new(asn, vrf, nbr, af)
         end
         next
       end

data/tests/test_dhcp_relay_global.rb

@@ -211,6 +211,7 @@ class TestDhcpRelayGlobal < CiscoTestCase
       end
       return
     end
+    skip_incompat_version?('dhcp_relay_global', 'ipv4_sub_option_circuit_id_string')
     assert_equal(drg.default_ipv4_sub_option_circuit_id_string, drg.ipv4_sub_option_circuit_id_string)
     str = '%p%p'
     drg.ipv4_sub_option_circuit_id_string = str

data/tests/test_interface.rb

@@ -788,7 +788,7 @@ class TestInterface < CiscoTestCase
     if validate_property_excluded?('interface_channel_group', 'channel_group')
       member = InterfaceChannelGroup.new(interfaces[0])
       assert_raises(Cisco::UnsupportedError) do
-        member.channel_group = 10
+        member.channel_group_mode_set(10)
       end
       return
     end
@@ -1359,7 +1359,7 @@ class TestInterface < CiscoTestCase
     # pre-configure
     begin
       interface_ethernet_default(interfaces[1])
-      InterfaceChannelGroup.new(interfaces[1]).channel_group = 48
+      InterfaceChannelGroup.new(interfaces[1]).channel_group_mode_set(48)
     rescue Cisco::UnsupportedError
       raise unless platform == :ios_xr
       # Some XR platform/version combos don't support port-channels
@@ -1764,6 +1764,7 @@ class TestInterface < CiscoTestCase
     assert_equal(interface.default_load_interval_counter_1_delay,
                  interface.load_interval_counter_1_delay)
     # check nil for subintf and loopback
+    interface.switchport_mode = :disabled if platform == :nexus
     subif = Interface.new(interfaces[0] + '.1')
     assert_nil(subif.load_interval_counter_1_delay)
     assert_raises(ArgumentError) { subif.load_interval_counter_1_delay = 100 }
@@ -1794,6 +1795,7 @@ class TestInterface < CiscoTestCase
     assert_equal(interface.default_load_interval_counter_2_delay,
                  interface.load_interval_counter_2_delay)
     # check nil for subintf and loopback
+    interface.switchport_mode = :disabled if platform == :nexus
     subif = Interface.new(interfaces[0] + '.1')
     assert_nil(subif.load_interval_counter_2_delay)
     assert_raises(ArgumentError) { subif.load_interval_counter_2_delay = 100 }
@@ -1824,6 +1826,7 @@ class TestInterface < CiscoTestCase
     assert_equal(interface.default_load_interval_counter_3_delay,
                  interface.load_interval_counter_3_delay)
     # check nil for subintf and loopback
+    interface.switchport_mode = :disabled if platform == :nexus
     subif = Interface.new(interfaces[0] + '.1')
     assert_nil(subif.load_interval_counter_3_delay)
     assert_raises(ArgumentError) { subif.load_interval_counter_3_delay = 100 }
@@ -1833,4 +1836,17 @@ class TestInterface < CiscoTestCase
     subif.destroy
     lb.destroy
   end
+
+  def test_purge_config
+    name = interfaces[0]
+    int = Interface.new(name)
+    int.switchport_mode = :disabled
+
+    int.description = 'destroy_pysical'
+    int.ipv4_addr_mask_set('192.168.0.1', '24')
+    refute(int.purge_config)
+
+    int.purge_config = true
+    assert(int.purge_config)
+  end
 end

data/tests/test_interface_channel_group.rb

@@ -32,6 +32,7 @@ class TestInterfaceChanGrp < CiscoTestCase
   end
 
   def test_channel_group
+    skip if platform == :nexus
     i = @intf
     group = 200
     i.channel_group = group
@@ -49,6 +50,52 @@ class TestInterfaceChanGrp < CiscoTestCase
     skip(e.to_s)
   end
 
+  def test_channel_group_mode
+    skip if platform == :ios_xr
+    i = @intf
+    group = 55
+
+    # Default Case: group = mode = false
+    refute(i.channel_group)
+    refute(i.channel_group_mode)
+
+    # group = 55, mode = on
+    i.channel_group_mode_set(group)
+    assert_equal(group, i.channel_group)
+    assert_equal(i.default_channel_group_mode, i.channel_group_mode)
+
+    # group = 55, mode = active
+    i.channel_group_mode_set(group, 'active')
+    assert_equal(group, i.channel_group)
+    assert_equal('active', i.channel_group_mode)
+
+    # group = 55, mode = passive
+    i.channel_group_mode_set(group, 'passive')
+    assert_equal(group, i.channel_group)
+    assert_equal('passive', i.channel_group_mode)
+
+    # group = 55, mode = on
+    i.channel_group_mode_set(group, 'on')
+    assert_equal(group, i.channel_group)
+    assert_equal(i.default_channel_group_mode, i.channel_group_mode)
+
+    # group = 66, mode = active
+    group = 66
+    i.channel_group_mode_set(group, 'active')
+    assert_equal(group, i.channel_group)
+    assert_equal('active', i.channel_group_mode)
+
+    # group = 66, mode = on
+    i.channel_group_mode_set(group)
+    assert_equal(group, i.channel_group)
+    assert_equal(i.default_channel_group_mode, i.channel_group_mode)
+
+    # Default Case: group = mode = false
+    i.channel_group_mode_set(i.default_channel_group)
+    refute(i.channel_group)
+    refute(i.channel_group_mode)
+  end
+
   def test_description
     i = @intf
     desc = 'test desc'

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', 'CSC: Atherton behavior change')
+    skip_legacy_defect?('8.0.1|8.1.1', 'CSC: Behavior change after helsinki')
     interface = Interface.new(interfaces[0])
 
     system_default_svi_autostate('no ')

data/tests/test_ntp_auth_key.rb

@@ -0,0 +1,77 @@
+#
+# Minitest for NtpAuthKey class
+#
+# Copyright (c) 2014-2017 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/ntp_auth_key'
+
+# TestNtpAuthKey - Minitest for NtpAuthKey node utility.
+class TestNtpAuthKey < CiscoTestCase
+  def setup
+    # setup runs at the beginning of each test
+    super
+    no_ntpkey
+  end
+
+  def teardown
+    # teardown runs at the end of each test
+    no_ntpkey
+    super
+  end
+
+  def no_ntpkey
+    # Turn the feature off for a clean test.
+    config('no ntp authentication-key 111 md5 test 7',
+           'no ntp authentication-key 999 md5 test 7')
+  end
+
+  # TESTS
+
+  def test_create_defaults
+    id = '111'
+    options = { 'name' => id, 'password' => 'test' }
+    refute_includes(Cisco::NtpAuthKey.ntpkeys, id)
+
+    key = Cisco::NtpAuthKey.new(options, true)
+    assert_includes(Cisco::NtpAuthKey.ntpkeys, id)
+    assert_equal(key, Cisco::NtpAuthKey.ntpkeys[id])
+
+    assert_equal(id, Cisco::NtpAuthKey.ntpkeys[id].name)
+    assert_equal('md5', Cisco::NtpAuthKey.ntpkeys[id].algorithm)
+    assert_equal('7', Cisco::NtpAuthKey.ntpkeys[id].mode)
+
+    key.destroy
+    refute_includes(Cisco::NtpAuthKey.ntpkeys, id)
+  end
+
+  def test_create_options
+    id = '999'
+    options = { 'name' => id, 'password' => 'test', 'algorithm' => 'md5',
+                'mode' => '7' }
+    refute_includes(Cisco::NtpAuthKey.ntpkeys, id)
+
+    key = Cisco::NtpAuthKey.new(options, true)
+    assert_includes(Cisco::NtpAuthKey.ntpkeys, id)
+    assert_equal(key, Cisco::NtpAuthKey.ntpkeys[id])
+
+    assert_equal(id, Cisco::NtpAuthKey.ntpkeys[id].name)
+    assert_equal('md5', Cisco::NtpAuthKey.ntpkeys[id].algorithm)
+    assert_equal('7', Cisco::NtpAuthKey.ntpkeys[id].mode)
+
+    key.destroy
+    refute_includes(Cisco::NtpAuthKey.ntpkeys, id)
+  end
+end

data/tests/test_ntp_config.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for NtpConfig class
 #
-# Copyright (c) 2015-2016 Cisco and/or its affiliates.
+# Copyright (c) 2015-2017 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.
@@ -26,28 +26,75 @@ class TestNtpConfig < CiscoTestCase
     no_ntpconfig
   end
 
+  def teardown
+    # teardown runs at the end of each test
+    no_ntpconfig
+    super
+  end
+
   def no_ntpconfig
     # Turn the feature off for a clean test.
     if platform == :ios_xr
-      config("no ntp source #{interfaces[0]}")
+      config("no ntp source #{interfaces[1]}")
     else
-      config("no ntp source-interface #{interfaces[0]}")
+      config("no ntp source-interface #{interfaces[1]}",
+             'no ntp authentication-key 111 md5 test 7',
+             'no ntp authentication-key 999 md5 test 7',
+             'no ntp trusted-key 111',
+             'no ntp trusted-key 999',
+             'no ntp authenticate')
     end
   end
 
   # TESTS
 
-  def test_create_destroy
+  def test_source_interface
     id = 'default'
 
     ntp = Cisco::NtpConfig.new(id)
     assert_includes(Cisco::NtpConfig.ntpconfigs, id)
     assert_equal(Cisco::NtpConfig.ntpconfigs[id], ntp)
 
+    assert_nil(Cisco::NtpConfig.ntpconfigs[id].source_interface)
+    assert_nil(ntp.source_interface)
+
     ntp.source_interface = interfaces[1]
     assert_equal(Cisco::NtpConfig.ntpconfigs[id].source_interface,
                  interfaces[1].downcase)
     assert_equal(Cisco::NtpConfig.ntpconfigs[id].source_interface,
                  ntp.source_interface)
+
+    ntp.source_interface = nil
+    assert_nil(Cisco::NtpConfig.ntpconfigs[id].source_interface)
+    assert_nil(ntp.source_interface)
+  end
+
+  def test_authenticate
+    id = 'default'
+
+    ntp = Cisco::NtpConfig.new(id)
+    assert_includes(Cisco::NtpConfig.ntpconfigs, id)
+    assert_equal(Cisco::NtpConfig.ntpconfigs[id], ntp)
+
+    assert_equal(false, Cisco::NtpConfig.ntpconfigs[id].authenticate)
+
+    ntp.authenticate = true
+    assert_equal(true, Cisco::NtpConfig.ntpconfigs[id].authenticate)
+  end
+
+  def test_trusted_key
+    id = 'default'
+
+    ntp = Cisco::NtpConfig.new(id)
+    assert_includes(Cisco::NtpConfig.ntpconfigs, id)
+    assert_equal(Cisco::NtpConfig.ntpconfigs[id], ntp)
+
+    assert_nil(Cisco::NtpConfig.ntpconfigs[id].trusted_key)
+
+    config('ntp authentication-key 111 md5 test 7',
+           'ntp authentication-key 999 md5 test 7')
+    ntp.trusted_key_set(true, 111)
+    ntp.trusted_key_set(true, 999)
+    assert_equal(%w(111 999), Cisco::NtpConfig.ntpconfigs[id].trusted_key)
   end
 end

data/tests/test_ntp_server.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for NtpServer class
 #
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 2014-2017 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.
@@ -23,28 +23,37 @@ class TestNtpServer < CiscoTestCase
   def setup
     # setup runs at the beginning of each test
     super
-    no_ntpserver_uk
+    no_ntpserver
   end
 
   def teardown
     # teardown runs at the end of each test
-    no_ntpserver_uk
+    no_ntpserver
     super
   end
 
-  def no_ntpserver_uk
+  def no_ntpserver
     # Turn the feature off for a clean test.
     config('no ntp server 130.88.203.12',
-           'no ntp server 2003::5')
+           'no ntp server 2003::5',
+           'no ntp server 0.us.pool.ntp.org',
+           'no ntp authentication-key 999 md5 test 7',
+           'no vrf context red')
   end
 
   # TESTS
 
+  def test_create_name_invalid
+    assert_raises(ArgumentError) do
+      Cisco::NtpServer.new({ 'name' => '1_com' }, true)
+    end
+  end
+
   def test_ipv4
     id = '130.88.203.12'
     refute_includes(Cisco::NtpServer.ntpservers, id)
 
-    ntp = Cisco::NtpServer.new(id, false)
+    ntp = Cisco::NtpServer.new({ 'name' => id }, true)
     assert_includes(Cisco::NtpServer.ntpservers, id)
     assert_equal(ntp, Cisco::NtpServer.ntpservers[id])
 
@@ -56,7 +65,7 @@ class TestNtpServer < CiscoTestCase
     id = '2003::5'
     refute_includes(Cisco::NtpServer.ntpservers, id)
 
-    ntp = Cisco::NtpServer.new(id, false)
+    ntp = Cisco::NtpServer.new({ 'name' => id }, true)
     assert_includes(Cisco::NtpServer.ntpservers, id)
     assert_equal(ntp, Cisco::NtpServer.ntpservers[id])
 
@@ -70,8 +79,8 @@ class TestNtpServer < CiscoTestCase
     refute_includes(Cisco::NtpServer.ntpservers, id1)
     refute_includes(Cisco::NtpServer.ntpservers, id2)
 
-    ntp1 = Cisco::NtpServer.new(id1, false)
-    ntp2 = Cisco::NtpServer.new(id2, true)
+    ntp1 = Cisco::NtpServer.new({ 'name' => id1 }, true)
+    ntp2 = Cisco::NtpServer.new({ 'name' => id2 }, true)
     refute_equal(ntp1, ntp2)
     assert_includes(Cisco::NtpServer.ntpservers, id1)
     assert_includes(Cisco::NtpServer.ntpservers, id2)
@@ -83,4 +92,55 @@ class TestNtpServer < CiscoTestCase
     refute_includes(Cisco::NtpServer.ntpservers, id1)
     refute_includes(Cisco::NtpServer.ntpservers, id2)
   end
+
+  # This test requires DNS resolution be avaabile - leaving for reference
+  # def test_domain_name
+  #   id = '0.us.pool.ntp.org'
+  #   refute_includes(Cisco::NtpServer.ntpservers, id)
+  #
+  #   ntp = Cisco::NtpServer.new({ 'name' => id }, true)
+  #   assert_includes(Cisco::NtpServer.ntpservers, id)
+  #   assert_equal(ntp, Cisco::NtpServer.ntpservers[id])
+  #
+  #   ntp.destroy
+  #   refute_includes(Cisco::NtpServer.ntpservers, id)
+  # end
+
+  def test_defaults
+    id = '130.88.203.12'
+    refute_includes(Cisco::NtpServer.ntpservers, id)
+
+    ntp = Cisco::NtpServer.new({ 'name' => id }, true)
+    assert_includes(Cisco::NtpServer.ntpservers, id)
+    assert_equal('default', Cisco::NtpServer.ntpservers[id].vrf)
+    assert_nil(Cisco::NtpServer.ntpservers[id].key)
+    assert_nil(Cisco::NtpServer.ntpservers[id].maxpoll)
+    assert_nil(Cisco::NtpServer.ntpservers[id].minpoll)
+    refute(Cisco::NtpServer.ntpservers[id].prefer)
+
+    ntp.destroy
+    refute_includes(Cisco::NtpServer.ntpservers, id)
+  end
+
+  def test_create_options
+    id = '130.88.203.12'
+    refute_includes(Cisco::NtpServer.ntpservers, id)
+
+    options = { 'name' => id, 'key' => '999', 'prefer' => 'true',
+                'minpoll' => '5', 'maxpoll' => '8', 'vrf' => 'red' }
+
+    config('vrf context red')
+    config('ntp authentication-key 999 md5 test 7')
+
+    ntp = Cisco::NtpServer.new(options, true)
+    assert_includes(Cisco::NtpServer.ntpservers, id)
+    assert_equal('red', Cisco::NtpServer.ntpservers[id].vrf)
+    assert_equal('999', Cisco::NtpServer.ntpservers[id].key)
+    assert_equal('5', Cisco::NtpServer.ntpservers[id].minpoll)
+    assert_equal('8', Cisco::NtpServer.ntpservers[id].maxpoll)
+    assert(Cisco::NtpServer.ntpservers[id].prefer)
+
+    ntp.destroy
+    refute_includes(Cisco::NtpServer.ntpservers, id)
+  end
 end