cisco_node_utils 1.6.0 → 1.7.0

data/tests/test_vlan_private.rb

@@ -381,7 +381,7 @@ class TestVlanPVlan < CiscoTestCase
       assert_equal(result, v1.pvlan_association)
 
       pv_type = 'isolated'
-      assert_raises(RuntimeError, 'vlan misconf did not raise RuntimeError') do
+      assert_raises(CliError, 'vlan misconf did not raise CliError') do
         v3.pvlan_type = pv_type
       end
 

data/tests/test_vpc.rb

@@ -130,11 +130,7 @@ class TestVpc < CiscoTestCase
 
   def test_layer3_peer_routing
     vpc = Vpc.new(100)
-    if validate_property_excluded?('vpc', 'layer3_peer_routing')
-      assert_raises(Cisco::UnsupportedError) { vpc.layer3_peer_routing = true }
-      return
-    end
-
+    skip_incompat_version?('vpc', 'layer3_peer_routing')
     default_val = vpc.default_layer3_peer_routing
     assert_equal(default_val, vpc.layer3_peer_routing,
                  "layer3_peer_routing should be #{default_val} by default")
@@ -196,6 +192,39 @@ class TestVpc < CiscoTestCase
     refute(vpc.peer_gateway, 'peer_gateway not getting disabled')
   end
 
+  def test_peer_switch
+    vpc = Vpc.new(100)
+    default_val = vpc.default_peer_switch
+    assert_equal(default_val, vpc.peer_switch,
+                 "peer_switch should be #{default_val} by default")
+    vpc.peer_switch = true
+    assert(vpc.peer_switch, 'peer_switch not getting set')
+    vpc.peer_switch = false
+    refute(vpc.peer_switch, 'peer_switch not getting disabled')
+  end
+
+  def test_arp_synchronize
+    vpc = Vpc.new(100)
+    default_val = vpc.default_arp_synchronize
+    assert_equal(default_val, vpc.arp_synchronize,
+                 "arp_synchronize should be #{default_val} by default")
+    vpc.arp_synchronize = true
+    assert(vpc.arp_synchronize, 'arp_synchronize not getting set')
+    vpc.arp_synchronize = false
+    refute(vpc.arp_synchronize, 'arp_synchronize not getting disabled')
+  end
+
+  def test_nd_synchronize
+    vpc = Vpc.new(100)
+    default_val = vpc.default_nd_synchronize
+    assert_equal(default_val, vpc.nd_synchronize,
+                 "nd_synchronize should be #{default_val} by default")
+    vpc.nd_synchronize = true
+    assert(vpc.nd_synchronize, 'nd_synchronize not getting set')
+    vpc.nd_synchronize = false
+    refute(vpc.nd_synchronize, 'nd_synchronize not getting disabled')
+  end
+
   def test_peer_gateway_exclude_bridge_domain
     vpc = Vpc.new(100)
     if validate_property_excluded?('vpc', 'peer_gateway_exclude_bridge_domain')
@@ -254,11 +283,7 @@ class TestVpc < CiscoTestCase
 
   def test_shutdown
     vpc = Vpc.new(100)
-    if validate_property_excluded?('vpc', 'shutdown')
-      assert_raises(Cisco::UnsupportedError) { vpc.shutdown = true }
-      return
-    end
-
+    skip_incompat_version?('vpc', 'shutdown')
     vpc.shutdown = vpc.default_shutdown
     refute(vpc.shutdown, 'Vpc domain should not be shutdown')
 
@@ -315,7 +340,7 @@ class TestVpc < CiscoTestCase
                            6, 3)
     # init channel group as none first, to test phy-port vPC link
     interface = InterfaceChannelGroup.new(interfaces[0])
-    interface.channel_group = false if interface.channel_group
+    interface.channel_group_mode_set(false) if interface.channel_group
     # Phy port vPC is supported only on N7K
     if /N7/ =~ node.product_id
       phy_port_iflist =
@@ -340,7 +365,7 @@ class TestVpc < CiscoTestCase
       end
     end
     # test port-channel vpc
-    interface.channel_group = 10
+    interface.channel_group_mode_set(10)
     interface_pc = Interface.new('port-channel10')
     interface_pc.switchport_mode = :trunk
     interface_pc.vpc_id = 20
@@ -353,7 +378,7 @@ class TestVpc < CiscoTestCase
     # clean-up
     interface_pc.vpc_id = false
     # remove PC
-    interface.channel_group = false
+    interface.channel_group_mode_set(false)
     refute(interface.channel_group, 'Port channel not cleaned up')
   end
 
@@ -363,7 +388,7 @@ class TestVpc < CiscoTestCase
     vpc.peer_keepalive_set('1.1.1.2', '1.1.1.1', 3800, 'management', 400, 3,
                            6, 3)
     interface = InterfaceChannelGroup.new(interfaces[1])
-    interface.channel_group = 100
+    interface.channel_group_mode_set(100)
     interface_pc = Interface.new('port-channel100')
     interface_pc.switchport_mode = :trunk
     refute(interface_pc.vpc_peer_link,
@@ -379,7 +404,7 @@ class TestVpc < CiscoTestCase
     end
 
     # clean up
-    interface.channel_group = false
+    interface.channel_group_mode_set(false)
     refute(interface.channel_group, 'channel group should be unset')
     # try with a phy port
     interface = Interface.new(interfaces[1])
@@ -497,7 +522,7 @@ class TestVpc < CiscoTestCase
     vpc.peer_keepalive_set('1.1.1.2', '1.1.1.1', 3800, 'management', 400, 3,
                            6, 3)
     interface = InterfaceChannelGroup.new(interfaces[1])
-    interface.channel_group = 100
+    interface.channel_group_mode_set(100)
     interface_pc = Interface.new('port-channel100')
     interface_pc.switchport_mode = :fabricpath
     refute(interface_pc.vpc_peer_link,
@@ -507,7 +532,7 @@ class TestVpc < CiscoTestCase
     interface_pc.vpc_peer_link = false
     refute(interface_pc.vpc_peer_link, 'vpc_peer_link should not be set')
     # clean up
-    interface.channel_group = false
+    interface.channel_group_mode_set(false)
     refute(interface.channel_group, 'channel group should be unset')
     # try with a phy port
     interface = Interface.new(interfaces[1])

data/tests/test_vxlan_vtep.rb

@@ -193,6 +193,7 @@ class TestVxlanVtep < CiscoTestCase
       return
     end
 
+    skip_incompat_version?('vxlan_vtep', 'source_intf_hold_down_time')
     # Set source_interface to non-default value
     val = 'loopback55'
     vtep.source_interface = val

data/tests/test_vxlan_vtep_vni.rb

@@ -120,6 +120,7 @@ class TestVxlanVtepVni < CiscoTestCase
       return
     end
 
+    skip_incompat_version?('vxlan_vtep_vni', 'ingress_replication')
     # Test non-default values
     vni.ingress_replication = 'static'
     assert_equal('static', vni.ingress_replication)
@@ -157,6 +158,7 @@ class TestVxlanVtepVni < CiscoTestCase
 
     # Test the case where an existing ingress_replication is removed before
     # configuring multicast_group
+    skip_incompat_version?('vxlan_vtep_vni', 'ingress_replication')
     unless validate_property_excluded?('vxlan_vtep_vni', 'ingress_replication')
       vni1.ingress_replication = 'static'
       assert_equal('static', vni1.ingress_replication)
@@ -178,11 +180,12 @@ class TestVxlanVtepVni < CiscoTestCase
 
   def test_peer_list
     vni = VxlanVtepVni.new('nve1', '6000')
-    if validate_property_excluded?('vxlan_vtep_vni', 'ingress_replication')
+    if validate_property_excluded?('vxlan_vtep_vni', 'peer_list')
       assert_raises(Cisco::UnsupportedError) { vni.peer_list = ['1.1.1.1'] }
       return
     end
 
+    skip_incompat_version?('vxlan_vtep_vni', 'peer_list')
     peer_list = ['1.1.1.1', '2.2.2.2', '3.3.3.3', '4.4.4.4']
 
     # Test: all peers when current is empty
@@ -246,6 +249,7 @@ class TestVxlanVtepVni < CiscoTestCase
       return
     end
 
+    skip_incompat_version?('vxlan_vtep_vni', 'suppress_uuc')
     # Test: Check suppress_uuc is not configured.
     refute(vni.suppress_uuc, 'suppress_uuc should be disabled')
 

data/tests/test_yum.rb

@@ -37,7 +37,6 @@ class TestYum < CiscoTestCase
     # Image Version before gsub: 7.0(3)I3(1)
     # Image Version after  gsub: 7_0_3_I3_1_
     @@pv = Platform.image_version.gsub(/[.()]/, '_')[/\S+/]
-    info "Image version detected: #{Platform.image_version}"
     skip("No pkginfo filename found for image version #{@@pv}") if
       pkginfo[@@pv].nil?
 
@@ -57,26 +56,6 @@ class TestYum < CiscoTestCase
     return unless @@run_setup
 
     select_pkg
-    s = @device.cmd("show file bootflash:#{@@pkg_filename} cksum")
-    if s[/No such file/]
-      @@skip = true # rubocop:disable Style/ClassVars
-    else
-      # add pkg to the repo
-      # normally this could be accomplished by first installing via full path
-      # but that would make these tests order dependent
-
-      # Remnants of the package my still exist from a previous install attempt.
-      info 'Executing test setup... Please be patient, this will take a while.'
-      steps = ["install deactivate #{@@pkg}",
-               "install remove #{@@pkg} forced",
-               "install add bootflash:#{@@pkg_filename}"]
-      steps.each do |step|
-        info "Executing setup step: #{step}..."
-        s = @device.cmd(step)
-        sleep 20
-        debug "Step Complete.\n\n#{s}\n"
-      end
-    end
     @@run_setup = false # rubocop:disable Style/ClassVars
   end
 
@@ -85,29 +64,27 @@ class TestYum < CiscoTestCase
       'this file can be found in the cisco_node_utils/tests directory' if @@skip
   end
 
+  def older_releases?
+    return true if Utils.image_version?(/I2|I3/)
+    false
+  end
+
   def test_install_query_remove
     skip?
-    if @device.cmd("show install package | include #{@@pkg}")[/@patching/]
-      @device.cmd("install deactivate #{@@pkg}")
-      node.cache_flush
-      sleep 20
-    end
-
+    skip if older_releases?
     # On dublin and later images, must specify the full rpm name.
     package = @@pv[/7_0_3_I2_1_/] ? @@pkg : @@pkg_filename
 
     # INSTALL
     # Specify "management" vrf for install
     Yum.install(package, 'management')
-    sleep 20
     assert(Yum.query(@@pkg), "failed to find installed package #{@@pkg}")
 
     # QUERY INSTALLED
     assert_equal(@@pkg_ver, Yum.query(@@pkg), @@incompatible_rpm_msg)
 
     # REMOVE
-    Yum.remove(@@pkg)
-    sleep 20
+    Yum.remove(Yum.pkg_name(@@pkg_filename))
 
     # QUERY REMOVED
     assert_nil(Yum.query(@@pkg))

data/tests/yum_package.yaml

@@ -18,6 +18,11 @@
   name:     'nxos.sample-n9k_EOR'
   version:  '1.0.0-7.0.3.I2.5'
 
+7_0_3_I3_1_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I3.1.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_EOR'
+  version:  '1.0.0-7.0.3.I3.1'
+
 7_0_3_I4_1_:
   filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I4.1.lib32_n9000.rpm'
   name:     'nxos.sample-n9k_EOR'
@@ -33,6 +38,11 @@
   name:     'nxos.sample-n9k_EOR'
   version:  '1.0.0-7.0.3.I4.5'
 
+7_0_3_I4_6_:
+  filename: 'nxos.sample-n9k_EOR-1.0.0-7.0.3.I4.6.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_EOR'
+  version:  '1.0.0-7.0.3.I4.6'
+
 7_0_3_I5_1_:
   filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I5.1.lib32_n9000.rpm'
   name:     'nxos.sample-n9k_ALL'
@@ -43,6 +53,16 @@
   name:     'nxos.sample-n9k_ALL'
   version:  '1.0.0-7.0.3.I5.2'
 
+7_0_3_I5_3_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I5.3.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I5.3'
+
+7_0_3_I6_1_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I6.1.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I6.1'
+
 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.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Rob Gries
@@ -11,10 +11,11 @@ authors:
 - Rich Wellum
 - Mike Wiebe
 - Jie Yang
+- Sai Chintalapudi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,6 +175,7 @@ files:
 - lib/cisco_node_utils/bfd_global.rb
 - lib/cisco_node_utils/bgp.rb
 - lib/cisco_node_utils/bgp_af.rb
+- lib/cisco_node_utils/bgp_af_aggr_addr.rb
 - lib/cisco_node_utils/bgp_neighbor.rb
 - lib/cisco_node_utils/bgp_neighbor_af.rb
 - lib/cisco_node_utils/bridge_domain.rb
@@ -198,6 +200,7 @@ files:
 - lib/cisco_node_utils/cmd_ref/bfd_global.yaml
 - lib/cisco_node_utils/cmd_ref/bgp.yaml
 - lib/cisco_node_utils/cmd_ref/bgp_af.yaml
+- lib/cisco_node_utils/cmd_ref/bgp_af_aa.yaml
 - lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
 - lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
 - lib/cisco_node_utils/cmd_ref/bridge_domain.yaml
@@ -221,6 +224,7 @@ files:
 - 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
+- lib/cisco_node_utils/cmd_ref/ntp_auth_key.yaml
 - lib/cisco_node_utils/cmd_ref/ntp_config.yaml
 - lib/cisco_node_utils/cmd_ref/ntp_server.yaml
 - lib/cisco_node_utils/cmd_ref/ospf.yaml
@@ -241,6 +245,7 @@ files:
 - lib/cisco_node_utils/cmd_ref/snmp_server.yaml
 - lib/cisco_node_utils/cmd_ref/snmp_user.yaml
 - lib/cisco_node_utils/cmd_ref/snmpnotification.yaml
+- lib/cisco_node_utils/cmd_ref/span_session.yaml
 - lib/cisco_node_utils/cmd_ref/stp_global.yaml
 - lib/cisco_node_utils/cmd_ref/syslog_server.yaml
 - lib/cisco_node_utils/cmd_ref/syslog_settings.yaml
@@ -289,6 +294,7 @@ files:
 - lib/cisco_node_utils/name_server.rb
 - lib/cisco_node_utils/node.rb
 - lib/cisco_node_utils/node_util.rb
+- lib/cisco_node_utils/ntp_auth_key.rb
 - lib/cisco_node_utils/ntp_config.rb
 - lib/cisco_node_utils/ntp_server.rb
 - lib/cisco_node_utils/overlay_global.rb
@@ -311,6 +317,7 @@ files:
 - lib/cisco_node_utils/snmpnotification.rb
 - lib/cisco_node_utils/snmpserver.rb
 - lib/cisco_node_utils/snmpuser.rb
+- lib/cisco_node_utils/span_session.rb
 - lib/cisco_node_utils/stp_global.rb
 - lib/cisco_node_utils/syslog_server.rb
 - lib/cisco_node_utils/syslog_settings.rb
@@ -363,6 +370,7 @@ files:
 - tests/test_acl.rb
 - tests/test_bfd_global.rb
 - tests/test_bgp_af.rb
+- tests/test_bgp_af_aa.rb
 - tests/test_bgp_neighbor.rb
 - tests/test_bgp_neighbor_af.rb
 - tests/test_bridge_domain.rb
@@ -400,6 +408,7 @@ files:
 - tests/test_node.rb
 - tests/test_node_ext.rb
 - tests/test_node_util.rb
+- tests/test_ntp_auth_key.rb
 - tests/test_ntp_config.rb
 - tests/test_ntp_server.rb
 - tests/test_nxapi.rb
@@ -424,6 +433,7 @@ files:
 - tests/test_snmpnotification.rb
 - tests/test_snmpserver.rb
 - tests/test_snmpuser.rb
+- tests/test_span_session.rb
 - tests/test_stp_global.rb
 - tests/test_syslog_server.rb
 - tests/test_syslog_settings.rb
@@ -465,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Utilities for management of Cisco network nodes