cisco_node_utils 1.3.0 → 1.4.0

data/tests/test_interface_bdi.rb

@@ -19,7 +19,7 @@ require_relative '../lib/cisco_node_utils/bridge_domain'
 include Cisco
 
 # TestBdi - Minitest for Interface configuration of BDI interfaces.
-class TestBdi < CiscoTestCase
+class TestInterfaceBdi < CiscoTestCase
   @@pre_clean_needed = true # rubocop:disable Style/ClassVars
   attr_reader :bdi
 
@@ -57,7 +57,7 @@ platform")
     super
   end
 
-  def test_create_and_check_all_properties
+  def test_bdi
     # Check all the default values
     assert_equal(@bdi.default_vrf, @bdi.vrf)
     assert_equal(@bdi.default_ipv4_address, @bdi.ipv4_address)

data/tests/test_interface_channel_group.rb

@@ -16,7 +16,7 @@ require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/interface_channel_group'
 
 # TestInterface - Minitest for general functionality of the Interface class.
-class TestInterfaceChannelGroup < CiscoTestCase
+class TestInterfaceChanGrp < CiscoTestCase
   @@clean = false # rubocop:disable Style/ClassVars
   def setup
     super

data/tests/test_interface_ospf.rb

@@ -138,6 +138,30 @@ class TestInterfaceOspf < CiscoTestCase
                                              'dead_interval'),
                      interface.dead_interval,
                      'Error: get dead interval failed')
+        assert_equal(node.config_get_default('interface_ospf',
+                                             'bfd'),
+                     interface.bfd,
+                     'Error: bfd get failed')
+        assert_equal(node.config_get_default('interface_ospf',
+                                             'mtu_ignore'),
+                     interface.mtu_ignore,
+                     'Error: mtu_ignore get failed')
+        assert_equal(node.config_get_default('interface_ospf',
+                                             'priority'),
+                     interface.priority,
+                     'Error: priority get failed')
+        assert_equal(node.config_get_default('interface_ospf',
+                                             'network_type_default'),
+                     interface.network_type,
+                     'Error: network type get failed')
+        assert_equal(node.config_get_default('interface_ospf',
+                                             'shutdown'),
+                     interface.shutdown,
+                     'Error: shutdown get failed')
+        assert_equal(node.config_get_default('interface_ospf',
+                                             'transmit_delay'),
+                     interface.transmit_delay,
+                     'Error: transmit_delay get failed')
         assert_equal(node.config_get_default('interface_ospf',
                                              'passive_interface'),
                      interface.passive_interface,
@@ -154,13 +178,13 @@ class TestInterfaceOspf < CiscoTestCase
     end
   end
 
-  def test_create_routerospf_nil
+  def test_routerospf_nil
     assert_raises(TypeError) do
       InterfaceOspf.new(interfaces[0], nil, '0.0.0.0')
     end
   end
 
-  def test_create_interface_name_zero_length
+  def test_name_zero_length
     name = 'ospfTest'
     ospf = RouterOspf.new(name)
     assert_raises(ArgumentError) do
@@ -168,7 +192,7 @@ class TestInterfaceOspf < CiscoTestCase
     end
   end
 
-  def test_create_interface_area_zero_length
+  def test_area_zero_length
     name = 'ospfTest'
     ospf = RouterOspf.new(name)
     assert_raises(ArgumentError) do
@@ -176,7 +200,7 @@ class TestInterfaceOspf < CiscoTestCase
     end
   end
 
-  def test_routerospf_create_valid
+  def test_routerospf
     ospf = create_routerospf
     ifname = interfaces[1]
     area = '0.0.0.0'
@@ -211,17 +235,35 @@ class TestInterfaceOspf < CiscoTestCase
     refute_show_match(pattern: /^\s+ip ospf dead-interval \S+/,
                       msg:     "'dead-interval' not removed")
 
+    refute_show_match(pattern: /^\s+ip ospf bfd \S+/,
+                      msg:     "'bfd' not removed")
+
+    refute_show_match(pattern: /^\s+ip ospf mtu-ignore \S+/,
+                      msg:     "'mtu_ignore' not removed")
+
+    refute_show_match(pattern: /^\s+ip ospf shutdown \S+/,
+                      msg:     "'shutdown' not removed")
+
+    refute_show_match(pattern: /^\s+ip ospf transmit-delay \S+/,
+                      msg:     "'transmit_delay' not removed")
+
+    refute_show_match(pattern: /^\s+ip ospf priority \S+/,
+                      msg:     "'priority' not removed")
+
+    refute_show_match(pattern: /^\s+ip ospf network point-to-point/,
+                      msg:     "'network_type' not removed")
+
     refute_show_match(pattern: /^\s+ip ospf passive-interface/,
                       msg:     "'passive interface' not removed")
   end
 
-  def test_routerospf_get_parent
+  def test_get_parent
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
     assert_equal(ospf.name, interface.ospf_name)
   end
 
-  def test_cost_invalid_range
+  def test_cost_inv
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
     # upper range
@@ -250,7 +292,7 @@ class TestInterfaceOspf < CiscoTestCase
                       msg:     'Error: default cost set failed')
   end
 
-  def test_hello_interval_invalid_range
+  def test_hello_inv
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
     # upper range
@@ -263,7 +305,7 @@ class TestInterfaceOspf < CiscoTestCase
     end
   end
 
-  def test_hello_interval
+  def test_hello
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
     interval = 90
@@ -280,7 +322,7 @@ class TestInterfaceOspf < CiscoTestCase
                       msg:     'Error: default hello-interval set failed')
   end
 
-  def test_dead_interval_invalid_range
+  def test_dead_inv
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
 
@@ -297,7 +339,7 @@ class TestInterfaceOspf < CiscoTestCase
     end
   end
 
-  def test_dead_interval
+  def test_dead
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
     interval = 150
@@ -314,7 +356,51 @@ class TestInterfaceOspf < CiscoTestCase
       msg:     'Error: default dead-interval set failed')
   end
 
-  def test_passive_interface
+  def test_bfd
+    ospf = create_routerospf
+    interface = create_interfaceospf(ospf)
+    assert_equal(interface.default_bfd, interface.bfd)
+    interface.bfd = true
+    assert_equal(true, interface.bfd)
+    interface.bfd = false
+    assert_equal(false, interface.bfd)
+    interface.bfd = interface.default_bfd
+    assert_equal(interface.default_bfd, interface.bfd)
+  end
+
+  def test_mtu_ignore
+    ospf = create_routerospf
+    interface = create_interfaceospf(ospf)
+    assert_equal(interface.default_mtu_ignore, interface.mtu_ignore)
+    interface.mtu_ignore = true
+    assert_equal(true, interface.mtu_ignore)
+    interface.mtu_ignore = interface.default_mtu_ignore
+    assert_equal(interface.default_mtu_ignore, interface.mtu_ignore)
+  end
+
+  def test_network_type
+    ospf = create_routerospf
+    interface = create_interfaceospf(ospf)
+
+    assert_equal(interface.default_network_type, interface.network_type)
+    interface.network_type = 'p2p'
+    assert_equal('p2p', interface.network_type)
+    interface.network_type = interface.default_network_type
+    assert_equal(interface.default_network_type, interface.network_type)
+
+    # setup a loopback to use
+    config('interface loopback12')
+    interface = InterfaceOspf.new('loopback12', '12', '0.0.0.0')
+    assert_equal(interface.default_network_type, interface.network_type)
+    interface.network_type = 'p2p'
+    assert_equal('p2p', interface.network_type)
+    interface.network_type = interface.default_network_type
+    assert_equal(interface.default_network_type, interface.network_type)
+    # cleanup
+    config('no interface loopback12')
+  end
+
+  def test_passive
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
 
@@ -331,7 +417,37 @@ class TestInterfaceOspf < CiscoTestCase
                       msg:     'default passive interface set failed')
   end
 
-  def test_create_valid_multiple
+  def test_priority
+    ospf = create_routerospf
+    interface = create_interfaceospf(ospf)
+    assert_equal(interface.default_priority, interface.priority)
+    interface.priority = 100
+    assert_equal(100, interface.priority)
+    interface.priority = interface.default_priority
+    assert_equal(interface.default_priority, interface.priority)
+  end
+
+  def test_shutdown
+    ospf = create_routerospf
+    interface = create_interfaceospf(ospf)
+    assert_equal(interface.default_shutdown, interface.shutdown)
+    interface.shutdown = true
+    assert_equal(true, interface.shutdown)
+    interface.shutdown = interface.default_shutdown
+    assert_equal(interface.default_shutdown, interface.shutdown)
+  end
+
+  def test_transmit_delay
+    ospf = create_routerospf
+    interface = create_interfaceospf(ospf)
+    assert_equal(interface.default_transmit_delay, interface.transmit_delay)
+    interface.transmit_delay = 400
+    assert_equal(400, interface.transmit_delay)
+    interface.transmit_delay = interface.default_transmit_delay
+    assert_equal(interface.default_transmit_delay, interface.transmit_delay)
+  end
+
+  def test_mult
     # ospf and interfaces[0]
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
@@ -339,7 +455,6 @@ class TestInterfaceOspf < CiscoTestCase
       pattern: /\s+ip router ospf #{ospf.name} area #{interface.area}/,
       msg:     "'ip router ospf #{ospf.name} default area' not configured")
 
-    # ospf and interfaces_id[2]
     ifname = interfaces[2]
     area = '1.1.1.1'
     create_interfaceospf(ospf, ifname, area)
@@ -348,12 +463,11 @@ class TestInterfaceOspf < CiscoTestCase
       msg:     "'ip router ospf #{ospf.name} area #{area}' is not configured")
   end
 
-  def test_create_multiple_delete_one
+  def test_mult_delete_one
     # ospf and interfaces[0]
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
 
-    # ospf and interfaces_id[2]
     ifname = interfaces[2]
     area = '1.1.1.1'
     interface1 = create_interfaceospf(ospf, ifname, area)
@@ -361,7 +475,6 @@ class TestInterfaceOspf < CiscoTestCase
                  "Error: 'ip router ospf #{ospf.name} area #{area}' " \
                  'not configured')
 
-    # delete ospf instance from interfaces_id[2]
     interface1.destroy
     refute_show_match(
       command: show_cmd(ifname),
@@ -389,9 +502,14 @@ class TestInterfaceOspf < CiscoTestCase
         end
         # puts "k1: #{k1}, k:  #{k},   area   #{v1[:area]}"
         cfg << "ip router ospf #{k} area #{v1[:area]}"
+        cfg << 'ip ospf bfd' if v1[:bfd]
+        cfg << 'ip ospf bfd disable' if v1[:bfd] == false
+        cfg << 'no ip ospf bfd' if v1[:bfd].nil?
         cfg << "ip ospf cost #{v1[:cost]}" unless v1[:cost] == 0
         cfg << "ip ospf hello-interval #{v1[:hello]}" unless v1[:hello].nil?
         cfg << "ip ospf dead-interval #{v1[:dead]}" unless v1[:dead].nil?
+        cfg << 'ip ospf network point-to-point' if v1[:net] == 'p2p'
+        cfg << 'no ip ospf network' if v1[:net] == 'broadcast'
         cfg << 'ip ospf passive-interface' if !v1[:pass].nil? &&
                                               v1[:pass] == true
         config(*cfg)
@@ -404,37 +522,44 @@ class TestInterfaceOspf < CiscoTestCase
     hash = {
       'ospfTest' => {
         interfaces[0].downcase => {
-          area: '0.0.0.0', cost: 10, hello: 30, dead: 120, pass: true },
+          area: '0.0.0.0', bfd: true, cost: 10, hello: 30,
+          dead: 120, net: 'p2p', pass: true },
         interfaces[1].downcase => {
-          area: '1.1.1.38', dead: 40, pass: false },
+          area: '1.1.1.38', bfd: false, dead: 40, net: 'p2p', pass: false },
         'vlan101'              => {
-          area: '2.2.2.101', cost: 5, hello: 20, dead: 80, pass: true },
+          area: '2.2.2.101', bfd: true, cost: 5, hello: 20, dead: 80,
+          net: 'p2p', pass: true },
       },
       'TestOspfInt' => {
         interfaces[2].downcase => {
           area: '0.0.0.19' },
         'vlan290'              => {
-          area: '2.2.2.29', cost: 200, hello: 30, dead: 120, pass: true },
+          area: '2.2.2.29', bfd: true, cost: 200, hello: 30,
+          dead: 120, net: 'broadcast', pass: true },
         'port-channel100'      => {
-          area: '3.2.2.29', cost: 25, hello: 50, dead: 200, pass: false },
+          area: '3.2.2.29', bfd: false, cost: 25, hello: 50, dead: 200,
+          net: 'p2p', pass: false },
       },
     }
     # rubocop:enable Style/AlignHash
     # Set defaults
     hash.each_key do |name|
       hash[name].each_value do |hv|
+        hv[:bfd] ||= node.config_get_default('interface_ospf', 'bfd')
         hv[:cost] ||= node.config_get_default('interface_ospf', 'cost')
         hv[:hello] ||= node.config_get_default('interface_ospf',
                                                'hello_interval')
         hv[:dead] ||= node.config_get_default('interface_ospf',
                                               'dead_interval')
+        hv[:net] ||= node.config_get_default('interface_ospf',
+                                             'network_type_default')
         hv[:pass] ||= node.config_get_default('interface_ospf',
                                               'passive_interface')
       end
     end
   end
 
-  def test_collection_multiple_interface
+  def test_collect_mult_intf
     s = config('int port-channel 42', 'descr foo')
     known_failure = s[/ERROR:.*port channel not present/]
     refute(known_failure, 'ERROR: port channel not present')
@@ -444,6 +569,7 @@ class TestInterfaceOspf < CiscoTestCase
     # enable feature ospf
     config('no feature ospf',
            'feature ospf',
+           'feature bfd',
            'feature interface-vlan',
            "default interface #{interfaces[0]}",
            "default interface #{interfaces[1]}",
@@ -471,11 +597,14 @@ 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')
         assert_equal(hv[:cost], interface.cost, 'Error: get cost failed')
         assert_equal(hv[:hello], interface.hello_interval,
                      'Error: get hello interval failed')
         assert_equal(hv[:dead], interface.dead_interval,
                      'Error: get dead interval failed')
+        assert_equal(hv[:net], interface.network_type,
+                     'Error: network_type get failed')
         assert_equal(hv[:pass], interface.passive_interface,
                      'Error: passive interface get failed')
       end
@@ -484,6 +613,7 @@ class TestInterfaceOspf < CiscoTestCase
 
     # disable feature interface-vlan
     config('no feature interface-vlan')
+    config('no feature bfd')
     # clean up port channel
     ospf_h.each_value do |v|
       v.each_key do |k1|
@@ -577,7 +707,7 @@ class TestInterfaceOspf < CiscoTestCase
     assert_equal(encr, interface.message_digest_encryption_type)
   end
 
-  def test_message_digest_key_invalid_password
+  def test_message_digest_key_inv
     ospf = create_routerospf
     interface = create_interfaceospf(ospf)
 

data/tests/test_interface_portchannel.rb

@@ -41,7 +41,16 @@ class TestInterfacePortChannel < CiscoTestCase
     InterfacePortChannel.new(ifname)
   end
 
-  def test_get_set_port_hash_distribution
+  def test_bfd_per_link
+    interface = create_port_channel
+    assert_equal(interface.default_bfd_per_link, interface.bfd_per_link)
+    interface.bfd_per_link = true
+    assert_equal(true, interface.bfd_per_link)
+    interface.bfd_per_link = interface.default_bfd_per_link
+    assert_equal(interface.default_bfd_per_link, interface.bfd_per_link)
+  end
+
+  def test_port_hash_distribution
     skip('Platform does not support this property') if n6k_platform?
     interface = create_port_channel
     interface.port_hash_distribution = 'adaptive'
@@ -54,7 +63,7 @@ class TestInterfacePortChannel < CiscoTestCase
                  interface.port_hash_distribution)
   end
 
-  def test_get_set_lacp_graceful_convergence
+  def test_lacp_graceful_convergence
     interface = create_port_channel
     interface.lacp_graceful_convergence = false
     assert_equal(false, interface.lacp_graceful_convergence)
@@ -64,7 +73,7 @@ class TestInterfacePortChannel < CiscoTestCase
                  interface.lacp_graceful_convergence)
   end
 
-  def test_get_set_lacp_min_links
+  def test_lacp_min_links
     interface = create_port_channel
     interface.lacp_min_links = 5
     assert_equal(5, interface.lacp_min_links)
@@ -73,7 +82,7 @@ class TestInterfacePortChannel < CiscoTestCase
                  interface.lacp_min_links)
   end
 
-  def test_get_set_lacp_max_bundle
+  def test_lacp_max_bundle
     interface = create_port_channel
     interface.lacp_max_bundle = 10
     assert_equal(10, interface.lacp_max_bundle)
@@ -83,7 +92,7 @@ class TestInterfacePortChannel < CiscoTestCase
                  interface.lacp_max_bundle)
   end
 
-  def test_get_set_lacp_suspend_individual
+  def test_lacp_suspend_individual
     interface = create_port_channel
     interface.lacp_suspend_individual = false
     assert_equal(false, interface.lacp_suspend_individual)
@@ -93,7 +102,7 @@ class TestInterfacePortChannel < CiscoTestCase
                  interface.lacp_suspend_individual)
   end
 
-  def test_get_set_port_load_defer
+  def test_port_load_defer
     skip('Platform does not support this property') if n6k_platform?
     interface = create_port_channel
     interface.port_load_defer = true

data/tests/test_interface_private_vlan.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 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.
@@ -18,18 +18,25 @@ require_relative '../lib/cisco_node_utils/vlan'
 
 include Cisco
 
-# TestInterfaceSwitchport
+# TestInterfacePrivateVlan
 # Parent class for specific types of switchport tests (below)
-class TestInterfaceSwitchport < CiscoTestCase
-  @@pre_clean_needed = true # rubocop:disable Style/ClassVars
-  attr_reader :interface
+class TestInterfacePVlan < CiscoTestCase
+  # rubocop:disable Style/ClassVars
+  @@pre_clean_needed = true
+  attr_reader :i
+
+  def i
+    @@interface
+  end
 
   def setup
     super
-    @interface = Interface.new(interfaces[0])
-    cleanup if @@pre_clean_needed
-    @@pre_clean_needed = false # rubocop:disable Style/ClassVars
+    return unless @@pre_clean_needed
+    cleanup
+    @@interface = Interface.new(interfaces[0])
+    @@pre_clean_needed = false
   end
+  # rubocop:enable Style/ClassVars
 
   def teardown
     cleanup
@@ -37,688 +44,305 @@ class TestInterfaceSwitchport < CiscoTestCase
   end
 
   def cleanup
-    remove_svis
-    cleanup_pvlan_intfs
+    interface_cleanup_pvlan
     remove_all_vlans
     config_no_warn('no feature private-vlan', 'no feature vtp')
   end
 
-  def remove_svis
-    Interface.interfaces.each do |name, _i|
-      next unless name[/vlan/] || name.match(/^vlan1$/)
-      config("no interface #{name}")
-    end
-  end
-
-  def cleanup_pvlan_intfs
-    pvlan_intfs = Interface.interfaces(:private_vlan_any)
+  def interface_cleanup_pvlan
+    pvlan_intfs = Interface.interfaces(:pvlan_any)
     pvlan_intfs.keys.each { |name| interface_cleanup(name) }
   end
-end
 
-# TestSwitchport - general interface switchport tests.
-class TestSwitchport < TestInterfaceSwitchport
-  def test_interface_switchport_private_host_mode
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+  def test_pvlan_mapping
+    # This is an SVI property
+    svi = Interface.new('vlan13')
+    if validate_property_excluded?('interface', 'pvlan_mapping')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        svi.pvlan_mapping = ['10-11,4-7,8']
       end
       return
     end
-    switchport_modes = [
-      :host,
-      :promiscuous,
-    ]
-
-    switchport_modes.each do |start|
-      interface.switchport_mode_private_vlan_host = start
-      assert_equal(start, interface.switchport_mode_private_vlan_host,
-                   "Err: Switchport mode, #{start}, not as expected")
-    end
-  end
 
-  def test_interface_switchport_private_trunk_promisc
-    if validate_property_excluded?(
-      'interface',
-      'switchport_mode_private_vlan_trunk_secondary')
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_trunk_promiscuous = true
-      end
-      return
-    end
-    interface.switchport_mode_private_vlan_trunk_promiscuous = true
-    assert(interface.switchport_mode_private_vlan_trunk_promiscuous,
-           'Err: Switchport mode, not as expected')
-  end
+    default = svi.default_pvlan_mapping
+    assert_equal(default, svi.pvlan_mapping)
 
-  def test_interface_switchport_private_trunk_secondary
-    if validate_property_excluded?(
-      'interface',
-      'switchport_mode_private_vlan_trunk_secondary')
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_trunk_secondary = true
-      end
-      return
-    end
-    interface.switchport_mode_private_vlan_trunk_secondary = true
-    assert(interface.switchport_mode_private_vlan_trunk_secondary,
-           'Err: Switchport mode, not as expected')
-  end
+    # Input can be Array or String
+    svi.pvlan_mapping = ['10-11,4-7,8']
+    assert_equal(['4-8,10-11'], svi.pvlan_mapping)
 
-  def test_interface_no_switchport_private_host_mode
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    switchport_modes = [
-      :host,
-      :promiscuous,
-    ]
-
-    switchport_modes.each do |start|
-      interface.switchport_mode_private_vlan_host = start
-      assert_equal(start, interface.switchport_mode_private_vlan_host,
-                   "Err: Switchport mode, #{start}, not as expected")
-      interface.switchport_mode_private_vlan_host = :disabled
-      assert_equal(:disabled, interface.switchport_mode_private_vlan_host,
-                   'Error: Switchport mode not disabled')
-    end
-  end
+    # Change range
+    svi.pvlan_mapping = '11,4-6,8'
+    assert_equal(['4-6,8,11'], svi.pvlan_mapping)
 
-  def test_interface_no_switchport_private_trunk_mode
-    if validate_property_excluded?(
-      'interface',
-      'switchport_mode_private_vlan_trunk_secondary')
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_trunk_secondary = true
-      end
-      return
-    end
-    interface.switchport_mode_private_vlan_trunk_secondary = true
-    assert(interface.switchport_mode_private_vlan_trunk_secondary,
-           'Err: Switchport mode not as expected')
-    interface.switchport_mode_private_vlan_trunk_secondary = false
-    refute(interface.switchport_mode_private_vlan_trunk_secondary,
-           'Err: Switchport mode not disabled')
+    svi.pvlan_mapping = default
+    assert_equal(default, svi.pvlan_mapping)
   end
 
-  def test_interface_switchport_private_host_association
+  def test_switchport_pvlan_host
     if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+                                   'switchport_pvlan_host')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_host = true
       end
       return
     end
-    v1 = Vlan.new(10)
-    v1.private_vlan_type = 'primary'
-    v2 = Vlan.new(11)
-    v2.private_vlan_type = 'community'
-    v1.private_vlan_association = ['11']
-
-    interface.switchport_mode_private_vlan_host = :host
-    assert_equal(:host, interface.switchport_mode_private_vlan_host,
-                 'Err: Switchport mode not as expected')
-
-    input = %w(10 11)
-
-    interface.switchport_mode_private_vlan_host_association = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_association,
-                 'Err: switchport private host_association not configured')
-  end
 
-  def test_interface_switchport_pvlan_host_assoc_change
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    v1 = Vlan.new(10)
-    v1.private_vlan_type = 'primary'
-    v2 = Vlan.new(11)
-    v2.private_vlan_type = 'community'
-    v1.private_vlan_association = ['11']
-
-    interface.switchport_mode_private_vlan_host = :host
-    assert_equal(:host, interface.switchport_mode_private_vlan_host,
-                 'Error: Switchport mode not as expected')
-
-    input = %w(10 11)
-
-    interface.switchport_mode_private_vlan_host_association = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_association,
-                 'Err: switchport private host_association not configured')
-
-    v3 = Vlan.new(20)
-    v3.private_vlan_type = 'primary'
-
-    v4 = Vlan.new(21)
-    v4.private_vlan_type = 'community'
-    v3.private_vlan_association = ['21']
-
-    input = %w(20 21)
-    interface.switchport_mode_private_vlan_host_association = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_association,
-                 'Err: switchport private host_association not configured')
-
-    input = []
-    interface.switchport_mode_private_vlan_host_association = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_association,
-                 'Err: switchport private host_association not configured')
-  end
+    assert_equal(i.default_switchport_pvlan_host,
+                 i.switchport_pvlan_host)
 
-  def test_interface_switchport_no_pvlan_host_assoc
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+    i.switchport_pvlan_host = true
+    assert(i.switchport_pvlan_host)
 
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    v1 = Vlan.new(10)
-    v1.private_vlan_type = 'primary'
-    v2 = Vlan.new(11)
-    v2.private_vlan_type = 'community'
-    v1.private_vlan_association = ['11']
-
-    input = %w(10 11)
-    interface.switchport_mode_private_vlan_host = :host
-    assert_equal(:host, interface.switchport_mode_private_vlan_host,
-                 'Err: Switchport mode not as expected')
-    interface.switchport_mode_private_vlan_host_association = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_association,
-                 'Err: switchport private host_association not configured')
-    input = []
-    interface.switchport_mode_private_vlan_host_association = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_association,
-                 'Err: switchport private host_association not configured')
+    i.switchport_pvlan_host = false
+    refute(i.switchport_pvlan_host)
   end
 
-  def test_interface_switchport_pvlan_host_assoc_default
+  def test_sw_pvlan_promiscuous
     if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-
+                                   'switchport_pvlan_promiscuous')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_promiscuous = true
       end
       return
     end
-    val = interface.default_switchport_mode_private_vlan_host_association
-    assert_equal(val, interface.switchport_mode_private_vlan_host_association,
-                 'Err: host association failed')
+
+    assert_equal(i.default_switchport_pvlan_promiscuous,
+                 i.switchport_pvlan_promiscuous)
+
+    i.switchport_pvlan_promiscuous = true
+    assert(i.switchport_pvlan_promiscuous)
+
+    i.switchport_pvlan_promiscuous = false
+    refute(i.switchport_pvlan_promiscuous)
   end
 
-  def test_interface_switchport_pvlan_host_assoc_bad_arg
+  def test_sw_pvlan_trunk_promiscuous
     if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-
+                                   'switchport_pvlan_trunk_promiscuous')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_trunk_promiscuous = true
       end
       return
     end
-    interface.switchport_mode_private_vlan_host = :host
-    assert_equal(:host, interface.switchport_mode_private_vlan_host,
-                 'Err: Switchport mode not as expected')
 
-    input = %w(10)
-    assert_raises(CliError) do
-      interface.switchport_mode_private_vlan_host_association = input
-    end
+    assert_equal(i.default_switchport_pvlan_trunk_promiscuous,
+                 i.switchport_pvlan_trunk_promiscuous)
 
-    input = %w(10 ten)
-    assert_raises(CliError) do
-      interface.switchport_mode_private_vlan_host_association = input
-    end
+    i.switchport_pvlan_trunk_promiscuous = true
+    assert(i.switchport_pvlan_trunk_promiscuous)
 
-    input = %w(10,12)
-    assert_raises(CliError) do
-      interface.switchport_mode_private_vlan_host_association = input
-    end
-
-    input = %w(10 10)
-    assert_raises(RuntimeError,
-                  'host association did not raise RuntimeError') do
-      interface.switchport_mode_private_vlan_host_association = input
-    end
+    i.switchport_pvlan_trunk_promiscuous = false
+    refute(i.switchport_pvlan_trunk_promiscuous)
   end
 
-  def test_interface_switchport_pvlan_host_primisc_default
+  def test_sw_pvlan_trunk_secondary
     if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-
+                                   'switchport_pvlan_trunk_secondary')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_trunk_secondary = true
       end
       return
     end
-    val = interface.default_switchport_mode_private_vlan_host_promisc
-    assert_equal(val, interface.switchport_mode_private_vlan_host_promisc,
-                 'Err: promisc association failed')
+
+    assert_equal(i.default_switchport_pvlan_trunk_secondary,
+                 i.switchport_pvlan_trunk_secondary)
+
+    i.switchport_pvlan_trunk_secondary = true
+    assert(i.switchport_pvlan_trunk_secondary)
+
+    i.switchport_pvlan_trunk_secondary = false
+    refute(i.switchport_pvlan_trunk_secondary)
   end
 
-  def test_interface_switchport_private_host_promisc
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+  # Helper to setup vlan associations
+  def vlan_associate(pri, range)
+    Vlan.new(pri).pvlan_type = 'primary'
+    secondaries = Utils.dash_range_to_elements(range)
+    secondaries.each { |vlan| Vlan.new(vlan).pvlan_type = 'community' }
 
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    v1 = Vlan.new(10)
-    v1.private_vlan_type = 'primary'
-    v2 = Vlan.new(11)
-    v2.private_vlan_type = 'community'
-    v1.private_vlan_association = ['11']
-
-    input = %w(10 11)
-    interface.switchport_mode_private_vlan_host = :promiscuous
-    assert_equal(:promiscuous,
-                 interface.switchport_mode_private_vlan_host,
-                 'Error: Switchport mode not as expected')
-    interface.switchport_mode_private_vlan_host_promisc = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_promisc,
-                 'Error: switchport private host promisc not configured')
-
-    v3 = Vlan.new(12)
-    v3.private_vlan_type = 'community'
-
-    v1.private_vlan_association = ['12']
-    input = %w(10 12)
-    interface.switchport_mode_private_vlan_host_promisc = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_promisc,
-                 'Error: switchport private host promisc not configured')
-
-    v4 = Vlan.new(12)
-    v4.private_vlan_type = 'community'
-
-    v5 = Vlan.new(13)
-    v5.private_vlan_type = 'community'
-
-    v6 = Vlan.new(18)
-    v6.private_vlan_type = 'community'
-
-    v7 = Vlan.new(30)
-    v7.private_vlan_type = 'community'
-
-    v1.private_vlan_association = ['12-13', '18', '30']
-    input = %w(10 12-13,18,30)
-    interface.switchport_mode_private_vlan_host_promisc = input
-    assert_equal(input,
-                 interface.switchport_mode_private_vlan_host_promisc,
-                 'Error: switchport private host promisc not configured')
+    Vlan.new(pri).pvlan_association = range
   end
 
-  def test_interface_switchport_private_host_promisc_bad_arg
+  def test_sw_pvlan_host_association
+    # Supports single instance of [pri, sec]
     if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-
+                                   'switchport_pvlan_host_association')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_host_association = %w(2 3)
       end
       return
     end
 
-    input = %w(10)
-    interface.switchport_mode_private_vlan_host = :promiscuous
-    assert_equal(:promiscuous, interface.switchport_mode_private_vlan_host,
-                 'Error: Switchport mode not as expected')
+    default = i.default_switchport_pvlan_host_association
+    assert_equal(default, i.switchport_pvlan_host_association)
 
-    assert_raises(TypeError, 'private vlan host promisc raise typeError') do
-      interface.switchport_mode_private_vlan_host_promisc = input
-    end
-
-    input = %w(10,)
-    assert_raises(TypeError, 'private vlan host promisc raise typeError') do
-      interface.switchport_mode_private_vlan_host_promisc = input
-    end
-
-    input = %w(10 11 12)
-
-    assert_raises(TypeError, 'private vlan host promisc raise typeError') do
-      interface.switchport_mode_private_vlan_host_promisc = input
-    end
-
-    input = %w(10 ten)
-    assert_raises(CliError) do
-      interface.switchport_mode_private_vlan_host_promisc = input
-    end
+    # Setup prerequisites
+    vlan_associate('2', '3')
 
-    input = %w(10 10)
-    assert_raises(CliError) do
-      interface.switchport_mode_private_vlan_host_promisc = input
-    end
+    i.switchport_pvlan_host_association = %w(2 3)
+    assert_equal(%w(2 3), i.switchport_pvlan_host_association)
 
-    input = %w(10 10)
-    assert_raises(RuntimeError,
-                  'promisc association did not raise RuntimeError') do
-      interface.switchport_mode_private_vlan_host_promisc = input
-    end
+    i.switchport_pvlan_host_association = default
+    assert_equal(default, i.switchport_pvlan_host_association)
   end
 
-  def test_interface_no_switchport_private_host_promisc
+  def test_sw_pvlan_trunk_association
+    # Supports multiple instances of [[pri, sec], [pri2, sec2]]
     if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-
+                                   'switchport_pvlan_trunk_association')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_trunk_association = %w(2 3)
       end
       return
     end
-    v1 = Vlan.new(10)
-    v1.private_vlan_type = 'primary'
-
-    v2 = Vlan.new(11)
-    v2.private_vlan_type = 'community'
-    v1.private_vlan_association = ['11']
-
-    input = %w(10 11)
-    interface.switchport_mode_private_vlan_host = :promiscuous
-    assert_equal(:promiscuous, interface.switchport_mode_private_vlan_host,
-                 'Error: Switchport mode not as expected')
-
-    interface.switchport_mode_private_vlan_host_promisc = input
-    assert_equal(input, interface.switchport_mode_private_vlan_host_promisc,
-                 'Error: switchport private host promisc not configured')
-    input = []
-    interface.switchport_mode_private_vlan_host_promisc = input
-    assert_equal(input, interface.switchport_mode_private_vlan_host_promisc,
-                 'Error: switchport private host promisc not configured')
-  end
 
-  def test_interface_switchport_pvlan_trunk_allow_default
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+    default = i.default_switchport_pvlan_trunk_association
+    assert_equal(default, i.switchport_pvlan_trunk_association)
 
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    val = interface.default_switchport_private_vlan_trunk_allowed_vlan
-    assert_equal(val, interface.switchport_private_vlan_trunk_allowed_vlan,
-                 'Err: trunk allowed vlan failed')
-  end
+    pairs = %w(2 3)
+    i.switchport_pvlan_trunk_association = pairs
+    assert_equal([pairs], i.switchport_pvlan_trunk_association)
 
-  def test_interface_switchport_pvlan_trunk_allow_bad_arg
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+    # Add a second pairs
+    pairs = [%w(2 3), %w(4 5)]
+    i.switchport_pvlan_trunk_association = pairs
+    assert_equal(pairs, i.switchport_pvlan_trunk_association)
 
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    input = %w(ten)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_trunk_allowed_vlan = input
-    end
+    # New pair
+    pairs = [%w(6 7)]
+    i.switchport_pvlan_trunk_association = pairs
+    assert_equal(pairs, i.switchport_pvlan_trunk_association)
 
-    input = %w(5000)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_trunk_allowed_vlan = input
-    end
+    i.switchport_pvlan_trunk_association = default
+    assert_equal(default, i.switchport_pvlan_trunk_association)
   end
 
-  def test_interface_switchport_pvlan_trunk_allow
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-
+  def test_sw_pvlan_mapping
+    if validate_property_excluded?('interface', 'switchport_pvlan_mapping')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_mapping = ['2', '10-11,4-7,8']
       end
       return
     end
-    input = %w(10)
-    interface.switchport_private_vlan_trunk_allowed_vlan = input
-    assert_equal(input, interface.switchport_private_vlan_trunk_allowed_vlan,
-                 'Error: switchport private trunk allow vlan not configured')
-
-    input = %w(10-20)
-    result = %w(10-20)
-    interface.switchport_private_vlan_trunk_allowed_vlan = input
-    assert_equal(result, interface.switchport_private_vlan_trunk_allowed_vlan,
-                 'Error: switchport private trunk allow vlan not configured')
-
-    input = %w(10 13-14 40)
-    result = %w(10 13-14 40)
-    interface.switchport_private_vlan_trunk_allowed_vlan = input
-    assert_equal(result, interface.switchport_private_vlan_trunk_allowed_vlan,
-                 'Error: switchport private trunk allow vlan not configured')
-
-    input = []
-    interface.switchport_private_vlan_trunk_allowed_vlan = input
-    assert_equal(input, interface.switchport_private_vlan_trunk_allowed_vlan,
-                 'Error: switchport private trunk allow vlan not configured')
-  end
 
-  def test_interface_switchport_pvlan_trunk_native_vlan_bad_arg
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+    default = i.default_switchport_pvlan_mapping
+    assert_equal(default, i.switchport_pvlan_mapping)
 
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    input = 'ten'
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_trunk_native_vlan = input
-    end
+    # Setup prerequisites
+    vlan_associate('2', '3-4')
 
-    input = 5000
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_trunk_native_vlan = input
-    end
-  end
+    i.switchport_pvlan_mapping = %w(2 3)
+    assert_equal(%w(2 3), i.switchport_pvlan_mapping)
 
-  def test_interface_switchport_pvlan_trunk_native_default
-    if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
+    i.switchport_pvlan_mapping = %w(2 3-4)
+    assert_equal(%w(2 3-4), i.switchport_pvlan_mapping)
 
-      assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
-      end
-      return
-    end
-    val = interface.default_switchport_private_vlan_trunk_native_vlan
-    assert_equal(val, interface.switchport_private_vlan_trunk_native_vlan,
-                 'Err: trunk native vlan failed')
+    i.switchport_pvlan_mapping = %w(2 3)
+    assert_equal(%w(2 3), i.switchport_pvlan_mapping)
+
+    i.switchport_pvlan_mapping = default
+    assert_equal(default, i.switchport_pvlan_mapping)
   end
 
-  def test_interface_switchport_pvlan_trunk_native_vlan
+  def test_sw_pvlan_mapping_trunk
     if validate_property_excluded?('interface',
-                                   'switchport_mode_private_vlan_host')
-
+                                   'switchport_pvlan_mapping_trunk')
       assert_raises(Cisco::UnsupportedError) do
-        interface.switchport_mode_private_vlan_host = :host
+        i.switchport_pvlan_mapping_trunk = [['2', '10-11']]
       end
       return
     end
+    default = i.default_switchport_pvlan_mapping_trunk
+    assert_equal(default, i.switchport_pvlan_mapping_trunk)
 
-    input = 10
-    interface.switchport_private_vlan_trunk_native_vlan = input
-
-    assert_equal(input, interface.switchport_private_vlan_trunk_native_vlan,
-                 'Error: switchport private trunk native vlan not configured')
-    input = 1
-    interface.switchport_private_vlan_trunk_native_vlan = input
-    assert_equal(input, interface.switchport_private_vlan_trunk_native_vlan,
-                 'Error: switchport private trunk native vlan not configured')
-    input = 40
-    interface.switchport_private_vlan_trunk_native_vlan = input
-    assert_equal(input, interface.switchport_private_vlan_trunk_native_vlan,
-                 'Error: switchport private trunk native vlan not configured')
-
-    input = 50
-    interface.switchport_private_vlan_trunk_native_vlan = input
-    assert_equal(input,
-                 interface.switchport_private_vlan_trunk_native_vlan,
-                 'Error: switchport private trunk native vlan not configured')
-  end
+    # Basic, non-nested array
+    i.switchport_pvlan_mapping_trunk = ['2', '10-11,4-7,8']
+    assert_equal([['2', '4-8,10-11']], i.switchport_pvlan_mapping_trunk)
 
-  def test_interface_switchport_pvlan_association_trunk
-    if validate_property_excluded?('interface',
-                                   'switchport_private_vlan_association_trunk')
-      assert_nil(interface.switchport_private_vlan_association_trunk)
-      return
-    end
-    input = %w(10 12)
-    result = ['10 12']
-    interface.switchport_private_vlan_association_trunk = input
-    input = interface.switchport_private_vlan_association_trunk
-    refute((result & input).empty?,
-           'Err: wrong config for switchport private trunk association')
-    input = %w(20 30)
-    result = ['20 30']
-    interface.switchport_private_vlan_association_trunk = input
-    input = interface.switchport_private_vlan_association_trunk
-    refute((result & input).empty?,
-           'Err: wrong config for switchport private trunk association')
-
-    input = %w(10 13)
-    result = ['10 13']
-    interface.switchport_private_vlan_association_trunk = input
-    input = interface.switchport_private_vlan_association_trunk
-    refute((result & input).empty?,
-           'Err: wrong config for switchport private trunk association')
-
-    input = []
-    interface.switchport_private_vlan_association_trunk = input
-    assert_equal(input, interface.switchport_private_vlan_association_trunk,
-                 'Err: wrong config for switchport private trunk association')
-  end
+    # Same primary, but change range
 
-  def test_interface_switchport_pvlan_trunk_assoc_vlan_bad_arg
-    if validate_property_excluded?('interface',
-                                   'switchport_private_vlan_association_trunk')
-      assert_nil(interface.switchport_private_vlan_association_trunk)
-      return
-    end
-    input = %w(10 10)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_association_trunk = input
-    end
+    i.switchport_pvlan_mapping_trunk = ['2', '11,4-6,8']
+    assert_equal([['2', '4-6,8,11']], i.switchport_pvlan_mapping_trunk)
 
-    input = %w(10 5000)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_association_trunk = input
-    end
+    # Change primary
+    array = ['3', '4-6,8,11']
+    i.switchport_pvlan_mapping_trunk = array
+    assert_equal([array], i.switchport_pvlan_mapping_trunk)
 
-    input = %w(10)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_association_trunk = input
-    end
+    # Multiple: basic
+    nest = Array[%w(4 14), %w(5 25)]
+    i.switchport_pvlan_mapping_trunk = nest
+    assert_equal(nest, i.switchport_pvlan_mapping_trunk)
 
-    input = '10'
-    assert_raises(TypeError,
-                  'private vlan trunk association raise typeError') do
-      interface.switchport_private_vlan_association_trunk = input
-    end
-  end
+    # Multiple: change only one range
+    nest = Array[%w(4 14), %w(5 7-9)]
+    i.switchport_pvlan_mapping_trunk = nest
+    assert_equal(nest, i.switchport_pvlan_mapping_trunk)
 
-  def test_interface_switchport_pvlan_trunk_assocciation_default
-    if validate_property_excluded?('interface',
-                                   'switchport_private_vlan_association_trunk')
-      assert_nil(interface.switchport_private_vlan_association_trunk)
-      return
-    end
-    val = interface.default_switchport_private_vlan_association_trunk
-    assert_equal(val, interface.switchport_private_vlan_association_trunk,
-                 'Err: association trunk failed')
-  end
+    # Multiple: Move part of one range to a new primary
+    nest = Array[%w(4 14), %w(5 7,9), %w(6 8)]
+    i.switchport_pvlan_mapping_trunk = nest
+    assert_equal(nest, i.switchport_pvlan_mapping_trunk)
 
-  def test_interface_switchport_pvlan_mapping_trunk_default
-    if validate_property_excluded?('interface',
-                                   'switchport_private_vlan_mapping_trunk')
+    # Multiple: Move part of one range from one primary to an existing primary
+    nest = Array[%w(3 14), %w(5 7,9), %w(6 8)]
+    i.switchport_pvlan_mapping_trunk = nest
+    assert_equal(nest, i.switchport_pvlan_mapping_trunk)
 
-      assert_nil(interface.switchport_private_vlan_mapping_trunk)
-      return
-    end
-    val = interface.default_switchport_private_vlan_mapping_trunk
-    assert_equal(val, interface.switchport_private_vlan_mapping_trunk,
-                 'Err: mapping trunk failed')
+    # Multiple: Leave out a set while changing another
+    nest = Array[%w(5 7), %w(6 8-9,11)]
+    i.switchport_pvlan_mapping_trunk = nest
+    assert_equal(nest, i.switchport_pvlan_mapping_trunk)
+
+    # Explicitly set the default
+    i.switchport_pvlan_mapping_trunk = default
+    assert_equal(default, i.switchport_pvlan_mapping_trunk)
   end
 
-  def test_interface_switchport_pvlan_mapping_trunk
+  def test_sw_pvlan_trunk_allowed_vlan
     if validate_property_excluded?('interface',
-                                   'switchport_private_vlan_mapping_trunk')
-      assert_nil(interface.switchport_private_vlan_mapping_trunk)
+                                   'switchport_pvlan_trunk_allowed_vlan')
+      assert_raises(Cisco::UnsupportedError) do
+        i.switchport_pvlan_trunk_allowed_vlan = '8-9,4,2-3'
+      end
       return
     end
-    input = %w(10 11)
-    result = '10 11'
-    interface.switchport_private_vlan_mapping_trunk = input
-    input = interface.switchport_private_vlan_mapping_trunk
-    assert_includes(input, result,
-                    'Err: wrong config for switchport private mapping trunk ')
-
-    input = %w(10 12)
-    result = '10 12'
-    interface.switchport_private_vlan_mapping_trunk = input
-    input = interface.switchport_private_vlan_mapping_trunk
-    assert_includes(input, result,
-                    'Err: wrong config for switchport private mapping trunk ')
-
-    input = %w(20 21)
-    result = '20 21'
-    interface.switchport_private_vlan_mapping_trunk = input
-    input = interface.switchport_private_vlan_mapping_trunk
-    assert_includes(input, result,
-                    'Err: wrong config for switchport private mapping trunk ')
-
-    input = []
-    interface.switchport_private_vlan_mapping_trunk = input
-    assert_equal(input, interface.switchport_private_vlan_mapping_trunk)
+
+    default = i.default_switchport_pvlan_trunk_allowed_vlan
+    assert_equal(default, i.switchport_pvlan_trunk_allowed_vlan)
+
+    i.switchport_pvlan_trunk_allowed_vlan = '8-9,4,2-3'
+    assert_equal('2-4,8-9', i.switchport_pvlan_trunk_allowed_vlan)
+
+    # Change range
+    i.switchport_pvlan_trunk_allowed_vlan = '9-10,2'
+    assert_equal('2,9-10', i.switchport_pvlan_trunk_allowed_vlan)
+
+    i.switchport_pvlan_trunk_allowed_vlan = default
+    assert_equal(default, i.switchport_pvlan_trunk_allowed_vlan)
+
+    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)
   end
 
-  def test_interface_switchport_pvlan_mapping_trunk_bad_arg
+  def test_sw_pvlan_trunk_native_vlan
     if validate_property_excluded?('interface',
-                                   'switchport_private_vlan_mapping_trunk')
-      assert_nil(interface.switchport_private_vlan_mapping_trunk)
+                                   'switchport_pvlan_trunk_native_vlan')
+      assert_raises(Cisco::UnsupportedError) do
+        i.switchport_pvlan_trunk_native_vlan = '2'
+      end
       return
     end
-    input = %w(10 10)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_mapping_trunk = input
-    end
-
-    input = %w(10 5000)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_mapping_trunk = input
-    end
 
-    input = %w(10)
-    assert_raises(CliError) do
-      interface.switchport_private_vlan_mapping_trunk = input
-    end
+    default = i.default_switchport_pvlan_trunk_native_vlan
+    assert_equal(default, i.switchport_pvlan_trunk_native_vlan)
 
-    input = '10'
-    assert_raises(TypeError,
-                  'private vlan mapping trunk raise typeError') do
-      interface.switchport_private_vlan_mapping_trunk = input
-    end
+    i.switchport_pvlan_trunk_native_vlan = '2'
+    assert_equal('2', i.switchport_pvlan_trunk_native_vlan)
 
-    input = %w(10 20-148)
-    assert_raises(RuntimeError,
-                  'mapping trunk did not raise RuntimeError') do
-      interface.switchport_private_vlan_mapping_trunk = input
-    end
+    i.switchport_pvlan_trunk_native_vlan = default
+    assert_equal(default, i.switchport_pvlan_trunk_native_vlan)
   end
 end