cisco_node_utils 1.0.1 → 1.1.0

data/tests/test_interface_svi.rb

@@ -12,15 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path("../ciscotest", __FILE__)
-require File.expand_path("../../lib/cisco_node_utils/interface", __FILE__)
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/interface'
 
 include Cisco
 
+# TestSvi - Minitest for Interface configuration of SVI interfaces.
 class TestSvi < CiscoTestCase
-  def get_cmd_ref_autostate
-    ref = cmd_ref.lookup("interface", "svi_autostate")
-    assert(ref, "Error, reference not found for autostate")
+  def cmd_ref_autostate
+    ref = cmd_ref.lookup('interface', 'svi_autostate')
+    assert(ref, 'Error, reference not found for autostate')
     ref
   end
 
@@ -34,145 +35,121 @@ class TestSvi < CiscoTestCase
     end
   end
 
-  def set_cmd_ref_system_default_svi_autostate(state="")
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("#{state}system default interface-vlan autostate")
-    s = @device.cmd("end")
-    node.cache_flush
+  def system_default_svi_autostate(state='')
+    config("#{state}system default interface-vlan autostate")
   end
 
   def test_svi_prop_nil_when_ethernet
     intf = Interface.new(interfaces[0])
     assert_nil(intf.svi_autostate,
-               "Error: svi_autostate should be nil when interface is ethernet")
+               'Error: svi_autostate should be nil when interface is ethernet')
     assert_nil(intf.svi_management,
-               "Error: svi_management should be nil when interface is ethernet")
+               'Error: svi_management should be nil when interface is ethernet')
   end
 
   def test_svi_create_valid
     svi = Interface.new('Vlan23')
-    s = @device.cmd("show run interface all | inc Vlan")
-    cmd="interface Vlan1"
-    assert(s.include?(cmd), "Error: Failed to create svi Vlan1")
+    s = @device.cmd('show run interface all | inc Vlan')
+    cmd = 'interface Vlan1'
+    assert(s.include?(cmd), 'Error: Failed to create svi Vlan1')
 
-    cmd="interface Vlan23"
-    assert(s.include?(cmd), "Error: Failed to create svi Vlan23")
+    cmd = 'interface Vlan23'
+    assert(s.include?(cmd), 'Error: Failed to create svi Vlan23')
     svi.destroy
 
     # Verify that svi23 got removed now that we invoked svi.destroy
-    s = @device.cmd("show run interface all | inc Vlan")
-    cmd="interface Vlan23"
-    refute(s.include?(cmd), "Error: svi Vlan23 still configured")
+    s = @device.cmd('show run interface all | inc Vlan')
+    cmd = 'interface Vlan23'
+    refute(s.include?(cmd), 'Error: svi Vlan23 still configured')
   end
 
   def test_svi_create_vlan_invalid
-    assert_raises(CliError) do
-      svi = Interface.new('10.1.1.1')
-    end
+    assert_raises(CliError) { Interface.new('10.1.1.1') }
   end
 
   def test_svi_create_vlan_invalid_value
-    assert_raises(CliError) do
-      svi = Interface.new('Vlan0')
-    end
+    assert_raises(CliError) { Interface.new('Vlan0') }
   end
 
   def test_svi_create_vlan_nil
-    assert_raises(TypeError) do
-      svi = Interface.new(nil)
-    end
+    assert_raises(TypeError) { Interface.new(nil) }
   end
 
   def test_svi_name
     svi = Interface.new('Vlan23')
-    assert_equal("vlan23", svi.name, "Error: svi vlan name is wrong")
+    assert_equal('vlan23', svi.name, 'Error: svi vlan name is wrong')
     svi.destroy
   end
 
   def test_svi_assignment
     svi = Interface.new('Vlan23')
     svi.svi_management = true
-    assert(svi.svi_management, "Error: svi svi_management, false")
+    assert(svi.svi_management, 'Error: svi svi_management, false')
     svi_extra = svi
-    assert(svi_extra.svi_management, "Error: new svi svi_management, false")
+    assert(svi_extra.svi_management, 'Error: new svi svi_management, false')
     svi.destroy
   end
 
   def test_svi_get_autostate_false
     svi = Interface.new('Vlan23')
 
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface vlan 23")
-    s = @device.cmd("no autostate")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
-    ref = get_cmd_ref_autostate
+    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.")
+                 'Error: svi autostate not correct.')
     svi.destroy
   end
 
   def test_svi_get_autostate_true
     svi = Interface.new('Vlan23')
 
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface vlan 23")
-    s = @device.cmd("autostate")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
+    config('interface vlan 23', 'autostate')
 
-    ref = get_cmd_ref_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.")
+                 'Error: svi autostate not correct.')
     svi.destroy
   end
 
   def test_svi_set_autostate_false
-    ref = get_cmd_ref_autostate
+    ref = cmd_ref_autostate
     svi = Interface.new('Vlan23')
     assert_result(ref.test_config_result(false),
-                  "Error: svi autostate not set to false") {
+                  'Error: svi autostate not set to false') do
       svi.svi_autostate = false
-    }
+    end
     svi.destroy
   end
 
   def test_svi_set_autostate_true
     svi = Interface.new('Vlan23')
-    ref = get_cmd_ref_autostate
+    ref = cmd_ref_autostate
     assert_result(ref.test_config_result(true),
-                  "Error: svi autostate not set to true") {
+                  'Error: svi autostate not set to true') do
       svi.svi_autostate = true
-    }
+    end
     svi.destroy
   end
 
   def test_svi_set_autostate_default
     svi = Interface.new('Vlan23')
-    ref = get_cmd_ref_autostate
+    ref = cmd_ref_autostate
     default_value = ref.default_value
     assert_result(ref.test_config_result(default_value),
-                  "Error: svi autostate not set to default") {
+                  'Error: svi autostate not set to default') do
       svi.svi_autostate = default_value
-    }
+    end
     svi.destroy
   end
 
   def test_svi_get_management_true
     svi = Interface.new('Vlan23')
 
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface vlan 23")
-    s = @device.cmd("management")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
+    config('interface vlan 23', 'management')
 
     assert(svi.svi_management)
     svi.destroy
@@ -205,29 +182,29 @@ class TestSvi < CiscoTestCase
   def test_svi_get_svis
     count = 5
 
-    ref = get_cmd_ref_autostate
+    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
+      str = 'Vlan' + i.to_s
       svi = Interface.new(str)
       assert_result(ref.test_config_result(false),
-                    "Error: svi autostate not set to false") {
+                    'Error: svi autostate not set to false') do
         svi.svi_autostate = false
-      }
+      end
       svi.svi_management = true
     end
 
     svis = Interface.interfaces
-    ref = get_cmd_ref_autostate
+    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")
+                     'Error: svis collection, Vlan1, incorrect autostate')
         refute(svi.svi_management,
-               "Error: svis collection, Vlan1, incorrect management")
+               'Error: svis collection, Vlan1, incorrect management')
       when /^vlan/
         result = false if ref.config_set
         assert_equal(result, svi.svi_autostate,
@@ -237,31 +214,31 @@ class TestSvi < CiscoTestCase
       end
     end
 
-    svis.each do |id, svi|
-      s = @device.cmd("conf t ; no interface #{id} ; end") if id[/^vlan/]
+    svis.each_key do |id|
+      config("no interface #{id}") if id[/^vlan/]
     end
   end
 
   def test_svi_create_interface_description
     svi = Interface.new('Vlan23')
 
-    description = "Test description"
+    description = 'Test description'
     svi.description = description
     assert_equal(description, svi.description,
-                 "Error: Description not configured")
+                 'Error: Description not configured')
     svi.destroy
   end
 
   def test_system_default_svi_autostate_on_off
-    interface = Interface.new("Eth1/1")
+    interface = Interface.new('Eth1/1')
 
-    set_cmd_ref_system_default_svi_autostate("no ")
+    system_default_svi_autostate('no ')
     refute(interface.system_default_svi_autostate,
-           "Test for disabled - failed")
+           'Test for disabled - failed')
 
     # common default is enabled
-    set_cmd_ref_system_default_svi_autostate("")
+    system_default_svi_autostate('')
     assert(interface.system_default_svi_autostate,
-           "Test for enabled - failed")
+           'Test for enabled - failed')
   end
 end

data/tests/test_interface_switchport.rb

@@ -12,36 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path("../ciscotest", __FILE__)
-require File.expand_path("../../lib/cisco_node_utils/interface", __FILE__)
-require File.expand_path("../../lib/cisco_node_utils/vtp", __FILE__)
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/interface'
+require_relative '../lib/cisco_node_utils/vtp'
 
 include Cisco
 
+# TestInterfaceSwitchport - Minitest for switchport config by Interface class.
 class TestInterfaceSwitchport < CiscoTestCase
-  DEFAULT_IF_SWITCHPORT_ALLOWED_VLAN = "1-4094"
+  DEFAULT_IF_SWITCHPORT_ALLOWED_VLAN = '1-4094'
   DEFAULT_IF_SWITCHPORT_NATIVE_VLAN = 1
 
   def setup
     super
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("no feature vtp")
-    s = @device.cmd("no feature interface-vlan")
-    s = @device.cmd("end")
-    node.cache_flush
+    config('no feature vtp', 'no feature interface-vlan')
   end
 
   def interface_ethernet_default(ethernet_id)
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("default interface ethernet #{ethernet_id}")
-    s = @device.cmd("end")
-    node.cache_flush
+    config("default interface ethernet #{ethernet_id}")
   end
 
-  def get_cmd_ref_switchport_autostate_exclude
-    ref = cmd_ref.lookup("interface",
-                         "switchport_autostate_exclude")
-    assert(ref, "Error, reference not found for switchport_autostate_exclude")
+  def cmd_ref_switchport_autostate_exclude
+    ref = cmd_ref.lookup('interface',
+                         'switchport_autostate_exclude')
+    assert(ref, 'Error, reference not found for switchport_autostate_exclude')
     ref
   end
 
@@ -55,45 +49,39 @@ class TestInterfaceSwitchport < CiscoTestCase
     end
   end
 
-  def set_cmd_ref_system_default_switchport(state="")
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("#{state} system default switchport")
-    s = @device.cmd("end")
-    node.cache_flush
+  def system_default_switchport(state='')
+    config("#{state} system default switchport")
   end
 
-  def set_cmd_ref_system_default_switchport_shutdown(state="")
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("#{state} system default switchport shutdown")
-    s = @device.cmd("end")
-    node.cache_flush
+  def system_default_switchport_shutdown(state='')
+    config("#{state} system default switchport shutdown")
   end
 
   def test_switchport_vtp_disabled_feature_enabled
     vtp = Vtp.new(true)
     interface = Interface.new(interfaces[0])
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp not disabled")
+           'Error: interface, access, vtp not disabled')
     vtp.destroy
   end
 
   def test_switchport_vtp_disabled_feature_disabled_eth1_1
     interface = Interface.new(interfaces[0])
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp not disabled")
+           'Error: interface, access, vtp not disabled')
   end
 
   def test_switchport_vtp_disabled_feature_disabled_mgmt0
-    interface = Interface.new("mgmt0")
+    interface = Interface.new('mgmt0')
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp not disabled")
+           'Error: interface, access, vtp not disabled')
   end
 
   def test_switchport_vtp_disabled_unsupported_mode_disabled
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :disabled
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp not disabled")
+           'Error: interface, access, vtp not disabled')
     interface_ethernet_default(interfaces_id[0])
   end
 
@@ -102,9 +90,10 @@ class TestInterfaceSwitchport < CiscoTestCase
       interface = Interface.new(interfaces[0])
       interface.switchport_mode = :fex_fabric
       refute(interface.switchport_vtp,
-             "Error: interface, access, vtp not disabled")
+             'Error: interface, access, vtp not disabled')
     rescue RuntimeError => e
-      msg = "[#{interfaces[0]}] switchport_mode is not supported on this interface"
+      msg = "[#{interfaces[0]}] switchport_mode is not supported " \
+            'on this interface'
       assert_equal(msg.downcase, e.message)
     end
     interface_ethernet_default(interfaces_id[0])
@@ -114,15 +103,10 @@ class TestInterfaceSwitchport < CiscoTestCase
     vtp = Vtp.new(true)
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :access
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface ethernet #{interfaces_id[0]}")
-    s = @device.cmd("vtp")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
+    config("interface ethernet #{interfaces_id[0]}", 'vtp')
 
     assert(interface.switchport_vtp,
-           "Error: interface, access, vtp not enabled")
+           'Error: interface, access, vtp not enabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -131,15 +115,10 @@ class TestInterfaceSwitchport < CiscoTestCase
     vtp = Vtp.new(true)
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :access
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface ethernet #{interfaces_id[0]}")
-    s = @device.cmd("no vtp")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
+    config("interface ethernet #{interfaces_id[0]}", 'no vtp')
 
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp not disabled")
+           'Error: interface, access, vtp not disabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -148,15 +127,10 @@ class TestInterfaceSwitchport < CiscoTestCase
     vtp = Vtp.new(true)
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :trunk
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface ethernet #{interfaces_id[0]}")
-    s = @device.cmd("vtp")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
+    config("interface ethernet #{interfaces_id[0]}", 'vtp')
 
     assert(interface.switchport_vtp,
-           "Error: interface, trunk, vtp not enabled")
+           'Error: interface, trunk, vtp not enabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -167,7 +141,7 @@ class TestInterfaceSwitchport < CiscoTestCase
 
     interface.switchport_mode = :trunk
     refute(interface.switchport_vtp,
-           "Error: interface, trunk, vtp not disabled")
+           'Error: interface, trunk, vtp not disabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -179,15 +153,15 @@ class TestInterfaceSwitchport < CiscoTestCase
 
     interface.switchport_vtp = interface.default_switchport_vtp
     refute(interface.switchport_vtp,
-           "Error:(1) mode :access, vtp should be default (false)")
+           'Error:(1) mode :access, vtp should be default (false)')
 
     interface.switchport_vtp = true
     assert(interface.switchport_vtp,
-           "Error:(2) mode :access, vtp should be true")
+           'Error:(2) mode :access, vtp should be true')
 
     interface.switchport_vtp = interface.default_switchport_vtp
     refute(interface.switchport_vtp,
-           "Error:(3) mode :access, vtp should be default (false)")
+           'Error:(3) mode :access, vtp should be default (false)')
 
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
@@ -200,15 +174,15 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :trunk
     interface.switchport_vtp = interface.default_switchport_vtp
     refute(interface.switchport_vtp,
-           "Error:(1) mode :trunk, vtp should be default (false)")
+           'Error:(1) mode :trunk, vtp should be default (false)')
 
     interface.switchport_vtp = true
     assert(interface.switchport_vtp,
-           "Error:(2) mode :trunk, vtp should be true")
+           'Error:(2) mode :trunk, vtp should be true')
 
     interface.switchport_vtp = interface.default_switchport_vtp
     refute(interface.switchport_vtp,
-           "Error:(3) mode :trunk, vtp should be default (false)")
+           'Error:(3) mode :trunk, vtp should be default (false)')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -220,7 +194,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :access
     interface.switchport_vtp = true
     assert(interface.switchport_vtp,
-           "Error: interface, access, vtp not enabled")
+           'Error: interface, access, vtp not enabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -232,7 +206,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :trunk
     interface.switchport_vtp = true
     assert(interface.switchport_vtp,
-           "Error: interface, access, vtp not enabled")
+           'Error: interface, access, vtp not enabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -243,18 +217,18 @@ class TestInterfaceSwitchport < CiscoTestCase
 
     interface.switchport_mode = :disabled
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp is enabled")
+           'Error: interface, access, vtp is enabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
 
   def test_set_switchport_vtp_true_unsupported_mgmt0
     vtp = Vtp.new(true)
-    interface = Interface.new("mgmt0")
+    interface = Interface.new('mgmt0')
 
     interface.switchport_vtp = true
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp is enabled")
+           'Error: interface, access, vtp is enabled')
     vtp.destroy
   end
 
@@ -265,7 +239,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :access
     interface.switchport_vtp = false
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp not disabled")
+           'Error: interface, access, vtp not disabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -277,7 +251,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :trunk
     interface.switchport_vtp = false
     refute(interface.switchport_vtp,
-           "Error: interface, access, vtp not disabled")
+           'Error: interface, access, vtp not disabled')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -289,7 +263,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :disabled
     interface.switchport_vtp = false
     refute(interface.switchport_vtp,
-           "Error: mode :disabled, vtp should be false")
+           'Error: mode :disabled, vtp should be false')
     vtp.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -298,49 +272,45 @@ class TestInterfaceSwitchport < CiscoTestCase
     svi = Interface.new('Vlan23')
     interface = Interface.new(interfaces[0])
     refute(interface.switchport_autostate_exclude,
-           "Error: interface, access, autostate exclude not disabled")
+           'Error: interface, access, autostate exclude not disabled')
     svi.destroy
   end
 
   def test_switchport_autostate_disabled_feature_disabled_eth1_1
     interface = Interface.new(interfaces[0])
     refute(interface.switchport_autostate_exclude,
-           "Error: interface, access, autostate exclude not disabled")
+           'Error: interface, access, autostate exclude not disabled')
   end
 
   def test_switchport_autostate_disabled_feature_disabled_mgmt0
-    interface = Interface.new("mgmt0")
+    interface = Interface.new('mgmt0')
     refute(interface.switchport_autostate_exclude,
-           "Error: interface, access, autostate exclude not disabled")
+           'Error: interface, access, autostate exclude not disabled')
   end
 
   def test_switchport_autostate_disabled_unsupported_mode
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :disabled
     refute(interface.switchport_autostate_exclude,
-           "Error: interface, access, autostate exclude not disabled")
+           'Error: interface, access, autostate exclude not disabled')
     interface_ethernet_default(interfaces_id[0])
   end
 
   def test_switchport_autostate_enabled_access
     svi = Interface.new('Vlan23')
     interface = Interface.new(interfaces[0])
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface ethernet #{interfaces_id[0]}")
-    s = @device.cmd("switchport")
-    s = @device.cmd("switchport autostate exclude")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
+    config("interface ethernet #{interfaces_id[0]}",
+           'switchport',
+           'switchport autostate exclude')
 
-    cmd_ref = get_cmd_ref_switchport_autostate_exclude
+    cmd_ref = cmd_ref_switchport_autostate_exclude
     if cmd_ref.config_set
       assert(interface.switchport_autostate_exclude,
-             "Error: interface, access, autostate exclude not enabled")
-    elsif
+             'Error: interface, access, autostate exclude not enabled')
+    else
       assert_equal(interface.default_switchport_autostate_exclude,
                    interface.switchport_autostate_exclude,
-                   "Error: interface, access, autostate exclude not disabled")
+                   'Error: interface, access, autostate exclude not disabled')
     end
 
     svi.destroy
@@ -351,7 +321,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     svi = Interface.new('Vlan23')
     interface = Interface.new(interfaces[0])
     refute(interface.switchport_autostate_exclude,
-           "Error: interface, access, autostate exclude not disabled")
+           'Error: interface, access, autostate exclude not disabled')
     svi.destroy
   end
 
@@ -359,21 +329,17 @@ class TestInterfaceSwitchport < CiscoTestCase
     svi = Interface.new('Vlan23')
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :trunk
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface ethernet #{interfaces_id[0]}")
-    s = @device.cmd("switchport autostate exclude")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
-
-    cmd_ref = get_cmd_ref_switchport_autostate_exclude
+    config("interface ethernet #{interfaces_id[0]}",
+           'switchport autostate exclude')
+
+    cmd_ref = cmd_ref_switchport_autostate_exclude
     if cmd_ref.config_set
       assert(interface.switchport_autostate_exclude,
-             "Error: interface, access, autostate exclude not enabled")
-    elsif
+             'Error: interface, access, autostate exclude not enabled')
+    else
       assert_equal(interface.default_switchport_autostate_exclude,
                    interface.switchport_autostate_exclude,
-                   "Error: interface, access, autostate exclude not disabled")
+                   'Error: interface, access, autostate exclude not disabled')
     end
 
     svi.destroy
@@ -384,15 +350,11 @@ class TestInterfaceSwitchport < CiscoTestCase
     svi = Interface.new('Vlan23')
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :trunk
-    s = @device.cmd("configure terminal")
-    s = @device.cmd("interface ethernet #{interfaces_id[0]}")
-    s = @device.cmd("no switchport autostate exclude")
-    s = @device.cmd("end")
-    # Flush the cache since we've modified the device
-    node.cache_flush()
+    config("interface ethernet #{interfaces_id[0]}",
+           'no switchport autostate exclude')
 
     refute(interface.switchport_autostate_exclude,
-           "Error: interface, access, autostate exclude not disabled")
+           'Error: interface, access, autostate exclude not disabled')
     svi.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -400,15 +362,11 @@ class TestInterfaceSwitchport < CiscoTestCase
   def test_raise_error_switchport_not_enabled
     interface = Interface.new(interfaces[0])
 
-    @device.cmd("configure terminal")
-    @device.cmd("interface #{interfaces[0]}")
-    @device.cmd("no switchport")
-    @device.cmd("end")
-    node.cache_flush
+    config("interface #{interfaces[0]}", 'no switchport')
 
-    assert_raises(RuntimeError) {
+    assert_raises(RuntimeError) do
       interface.switchport_autostate_exclude = true
-    }
+    end
   end
 
   def test_set_switchport_autostate_default_access
@@ -416,17 +374,13 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface = Interface.new(interfaces[0])
 
     # switchport must be enabled to configure autostate
-    @device.cmd("configure terminal")
-    @device.cmd("interface #{interfaces[0]}")
-    @device.cmd("switchport")
-    @device.cmd("end")
-    node.cache_flush
+    config("interface #{interfaces[0]}", 'switchport')
 
     result = interface.default_switchport_autostate_exclude
     assert_result(result,
-                  "Error: interface, access, autostate exclude not disabled") {
+                  'Error: interface, access, autostate exclude not disabled') do
       interface.switchport_autostate_exclude = result
-    }
+    end
     svi.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -437,17 +391,13 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :trunk
 
     # switchport must be enabled to configure autostate
-    @device.cmd("configure terminal")
-    @device.cmd("interface #{interfaces[0]}")
-    @device.cmd("switchport")
-    @device.cmd("end")
-    node.cache_flush
+    config("interface #{interfaces[0]}", 'switchport')
 
     result = false
     assert_result(result,
-                  "Error: interface, access, autostate exclude not disabled") {
+                  'Error: interface, access, autostate exclude not disabled') do
       interface.switchport_autostate_exclude = result
-    }
+    end
     svi.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -457,17 +407,13 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface = Interface.new(interfaces[0])
 
     # switchport must be enabled to configure autostate
-    @device.cmd("configure terminal")
-    @device.cmd("interface #{interfaces[0]}")
-    @device.cmd("switchport")
-    @device.cmd("end")
-    node.cache_flush
+    config("interface #{interfaces[0]}", 'switchport')
 
     result = true
     assert_result(result,
-                  "Error: interface, access, autostate exclude not disabled") {
+                  'Error: interface, access, autostate exclude not disabled') do
       interface.switchport_autostate_exclude = result
-    }
+    end
     svi.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -478,17 +424,13 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :trunk
 
     # switchport must be enabled to configure autostate
-    @device.cmd("configure terminal")
-    @device.cmd("interface #{interfaces[0]}")
-    @device.cmd("switchport")
-    @device.cmd("end")
-    node.cache_flush
+    config("interface #{interfaces[0]}", 'switchport')
 
     result = true
     assert_result(result,
-                  "Error: interface, access, autostate exclude not disabled") {
+                  'Error: interface, access, autostate exclude not disabled') do
       interface.switchport_autostate_exclude = result
-    }
+    end
     svi.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -498,7 +440,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :disabled
 
-    assert_raises (RuntimeError) do
+    assert_raises RuntimeError do
       interface.switchport_autostate_exclude = true
     end
     svi.destroy
@@ -507,8 +449,8 @@ class TestInterfaceSwitchport < CiscoTestCase
 
   def test_set_switchport_autostate_true_unsupported_mgmt0
     svi = Interface.new('Vlan23')
-    interface = Interface.new("mgmt0")
-    assert_raises (RuntimeError) do
+    interface = Interface.new('mgmt0')
+    assert_raises RuntimeError do
       interface.switchport_autostate_exclude = true
     end
     svi.destroy
@@ -519,17 +461,13 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface = Interface.new(interfaces[0])
 
     # switchport must be enabled to configure autostate
-    @device.cmd("configure terminal")
-    @device.cmd("interface #{interfaces[0]}")
-    @device.cmd("switchport")
-    @device.cmd("end")
-    node.cache_flush
+    config("interface #{interfaces[0]}", 'switchport')
 
     result = false
     assert_result(result,
-                  "Error: interface, access, autostate exclude not disabled") {
+                  'Error: interface, access, autostate exclude not disabled') do
       interface.switchport_autostate_exclude = result
-    }
+    end
     svi.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -540,17 +478,13 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface.switchport_mode = :trunk
 
     # switchport must be enabled to configure autostate
-    @device.cmd("configure terminal")
-    @device.cmd("interface #{interfaces[0]}")
-    @device.cmd("switchport")
-    @device.cmd("end")
-    node.cache_flush
+    config("interface #{interfaces[0]}", 'switchport')
 
     result = false
     assert_result(result,
-                  "Error: interface, access, autostate exclude not disabled") {
+                  'Error: interface, access, autostate exclude not disabled') do
       interface.switchport_autostate_exclude = result
-    }
+    end
     svi.destroy
     interface_ethernet_default(interfaces_id[0])
   end
@@ -560,7 +494,7 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface = Interface.new(interfaces[0])
     interface.switchport_mode = :disabled
 
-    assert_raises (RuntimeError) do
+    assert_raises RuntimeError do
       interface.switchport_autostate_exclude = false
     end
     svi.destroy
@@ -569,21 +503,17 @@ class TestInterfaceSwitchport < CiscoTestCase
 
   def test_interface_switchport_mode_invalid
     interface = Interface.new(interfaces[0])
-    assert_raises(ArgumentError) {
-      interface.switchport_mode = :unknown
-    }
+    assert_raises(ArgumentError) { interface.switchport_mode = :unknown }
     interface_ethernet_default(interfaces_id[0])
   end
 
   def test_interface_switchport_mode_not_supported
-    interface = Interface.new("mgmt0")
-    assert_raises(RuntimeError) {
-      interface.switchport_mode = :access
-    }
+    interface = Interface.new('mgmt0')
+    assert_raises(RuntimeError) { interface.switchport_mode = :access }
     begin
       interface.switchport_mode = :access
     rescue RuntimeError => e
-      msg = "[mgmt0] switchport_mode is not supported on this interface"
+      msg = '[mgmt0] switchport_mode is not supported on this interface'
       assert_equal(msg, e.message)
     end
   end
@@ -600,25 +530,25 @@ class TestInterfaceSwitchport < CiscoTestCase
 
     interface = Interface.new(interfaces[0])
 
-    switchport_modes.each { | start |
-      switchport_modes.each { | finish |
-        if start != :unknown && finish != :unknown
-          begin
-            # puts "#{start},#{finish}"
-            interface.switchport_mode = start
-            assert_equal(start, interface.switchport_mode,
-                         "Error: Switchport mode, #{start}, not as expected")
-            # puts "now finish #{finish}"
-            interface.switchport_mode = finish
-            assert_equal(finish, interface.switchport_mode,
-                         "Error: Switchport mode, #{finish}, not as expected")
-          rescue RuntimeError => e
-            msg = "[#{interfaces[0]}] switchport_mode is not supported on this interface"
-            assert_equal(msg.downcase, e.message)
-          end
+    switchport_modes.each do |start|
+      switchport_modes.each do |finish|
+        next if start == :unknown || finish == :unknown
+        begin
+          # puts "#{start},#{finish}"
+          interface.switchport_mode = start
+          assert_equal(start, interface.switchport_mode,
+                       "Error: Switchport mode, #{start}, not as expected")
+          # puts "now finish #{finish}"
+          interface.switchport_mode = finish
+          assert_equal(finish, interface.switchport_mode,
+                       "Error: Switchport mode, #{finish}, not as expected")
+        rescue RuntimeError => e
+          msg = "[#{interfaces[0]}] switchport_mode is not supported " \
+                'on this interface'
+          assert_equal(msg.downcase, e.message)
         end
-      }
-    }
+      end
+    end
     interface_ethernet_default(interfaces_id[0])
   end
 
@@ -629,32 +559,31 @@ class TestInterfaceSwitchport < CiscoTestCase
     ]
 
     interface = Interface.new(interfaces[0])
-    switchport_modes.each { | start |
-      switchport_modes.each { | finish |
-        if start  != :unknown &&
-           finish != :unknown
-          begin
-            # puts "#{start},#{finish}"
-            interface.switchport_mode = start
-            assert_equal(start, interface.switchport_mode,
-                         "Error: Switchport mode, #{start}, not as expected")
-            interface.switchport_mode = finish
-            assert_equal(finish, interface.switchport_mode,
-                         "Error: Switchport mode, #{finish}, not as expected")
-          rescue RuntimeError => e
-            msg = "[#{interfaces[0]}] switchport_mode is not supported on this interface"
-            assert_equal(msg.downcase, e.message)
-          end
+    switchport_modes.each do |start|
+      switchport_modes.each do |finish|
+        next if start == :unknown || finish == :unknown
+        begin
+          # puts "#{start},#{finish}"
+          interface.switchport_mode = start
+          assert_equal(start, interface.switchport_mode,
+                       "Error: Switchport mode, #{start}, not as expected")
+          interface.switchport_mode = finish
+          assert_equal(finish, interface.switchport_mode,
+                       "Error: Switchport mode, #{finish}, not as expected")
+        rescue RuntimeError => e
+          msg = "[#{interfaces[0]}] switchport_mode is not supported " \
+                'on this interface'
+          assert_equal(msg.downcase, e.message)
         end
-      }
-    }
+      end
+    end
     interface_ethernet_default(interfaces_id[0])
   end
 
   def test_interface_switchport_trunk_allowed_vlan_all
     interface = Interface.new(interfaces[0])
     interface.switchport_enable
-    interface.switchport_trunk_allowed_vlan = "all"
+    interface.switchport_trunk_allowed_vlan = 'all'
     assert_equal(
       DEFAULT_IF_SWITCHPORT_ALLOWED_VLAN,
       interface.switchport_trunk_allowed_vlan)
@@ -664,10 +593,10 @@ class TestInterfaceSwitchport < CiscoTestCase
   def test_interface_switchport_trunk_allowed_vlan_change
     interface = Interface.new(interfaces[0])
     interface.switchport_enable
-    interface.switchport_trunk_allowed_vlan = "20"
-    assert_equal("20", interface.switchport_trunk_allowed_vlan)
-    interface.switchport_trunk_allowed_vlan = "30"
-    assert_equal("30", interface.switchport_trunk_allowed_vlan)
+    interface.switchport_trunk_allowed_vlan = '20'
+    assert_equal('20', interface.switchport_trunk_allowed_vlan)
+    interface.switchport_trunk_allowed_vlan = '30'
+    assert_equal('30', interface.switchport_trunk_allowed_vlan)
     interface_ethernet_default(interfaces_id[0])
   end
 
@@ -685,25 +614,25 @@ class TestInterfaceSwitchport < CiscoTestCase
   def test_interface_switchport_trunk_allowed_vlan_invalid
     interface = Interface.new(interfaces[0])
     interface.switchport_enable
-    assert_raises(RuntimeError) {
-      interface.switchport_trunk_allowed_vlan = "hello"
-    }
+    assert_raises(RuntimeError) do
+      interface.switchport_trunk_allowed_vlan = 'hello'
+    end
     interface_ethernet_default(interfaces_id[0])
   end
 
   def test_interface_switchport_trunk_allowed_vlan_none
     interface = Interface.new(interfaces[0])
     interface.switchport_enable
-    interface.switchport_trunk_allowed_vlan = "none"
-    assert_equal("none", interface.switchport_trunk_allowed_vlan)
+    interface.switchport_trunk_allowed_vlan = 'none'
+    assert_equal('none', interface.switchport_trunk_allowed_vlan)
     interface_ethernet_default(interfaces_id[0])
   end
 
   def test_interface_switchport_trunk_allowed_vlan_valid
     interface = Interface.new(interfaces[0])
     interface.switchport_enable
-    interface.switchport_trunk_allowed_vlan = "20, 30"
-    assert_equal("20,30", interface.switchport_trunk_allowed_vlan)
+    interface.switchport_trunk_allowed_vlan = '20, 30'
+    assert_equal('20,30', interface.switchport_trunk_allowed_vlan)
     interface_ethernet_default(interfaces_id[0])
   end
 
@@ -731,9 +660,9 @@ class TestInterfaceSwitchport < CiscoTestCase
   def test_interface_switchport_trunk_native_vlan_invalid
     interface = Interface.new(interfaces[0])
     interface.switchport_enable
-    assert_raises(RuntimeError) {
-      interface.switchport_trunk_native_vlan = "20, 30"
-    }
+    assert_raises(RuntimeError) do
+      interface.switchport_trunk_native_vlan = '20, 30'
+    end
     interface_ethernet_default(interfaces_id[0])
   end
 
@@ -745,81 +674,76 @@ class TestInterfaceSwitchport < CiscoTestCase
     interface_ethernet_default(interfaces_id[0])
   end
 
-=begin
-  # Run this test at your peril as it can cause timeouts for this test and
+  # TODO: Run this test at your peril as it can cause timeouts for this test and
   # others - 'no feature-set fex' states:
-  # "Feature-set Operation may take up to 30 minutes depending on the size of configuration."
-
-  def test_interface_switchport_fex_feature
-    test_matrix = {
-      #    [ <set_state>,  <expected> ]
-      1 => [:uninstalled, :uninstalled], # noop
-      2 => [:installed,   :installed],
-      3 => [:uninstalled, :uninstalled],
-      4 => [:enabled,     :enabled],
-      5 => [:enabled,     :enabled],     # noop
-      6 => [:installed,   :enabled],     # noop
-      7 => [:uninstalled, :uninstalled],
-      8 => [:disabled,    :uninstalled], # noop
-      9 => [:installed,   :installed],
-      10 => [:installed,   :installed],  # noop
-      11 => [:enabled,     :enabled],
-      12 => [:disabled,    :disabled],
-      13 => [:uninstalled, :uninstalled],
-      14 => [:installed,   :installed],
-      15 => [:disabled,    :installed],  # noop
-      16 => [:uninstalled, :uninstalled],
-    }
-    interface = Interface.new(interfaces[0])
-    # start test from :uninstalled state
-    interface.fex_feature_set(:uninstalled)
-    from = interface.fex_feature
-    test_matrix.each { |id,test|
-      #puts "Test #{id}: #{test}, (from: #{from}"
-      set_state, expected = test
-      interface.fex_feature_set(set_state)
-      curr = interface.fex_feature
-      assert_equal(expected, curr,
-                   "Error: fex test #{id}: from #{from} to #{set_state}")
-      from = curr
-    }
-  end
-=end
+  # "Feature-set Operation may take up to 30 minutes depending on the
+  #  size of configuration."
+  #
+  #   def test_interface_switchport_fex_feature
+  #     test_matrix = {
+  #       #    [ <set_state>,  <expected> ]
+  #       1 => [:uninstalled, :uninstalled], # noop
+  #       2 => [:installed,   :installed],
+  #       3 => [:uninstalled, :uninstalled],
+  #       4 => [:enabled,     :enabled],
+  #       5 => [:enabled,     :enabled],     # noop
+  #       6 => [:installed,   :enabled],     # noop
+  #       7 => [:uninstalled, :uninstalled],
+  #       8 => [:disabled,    :uninstalled], # noop
+  #       9 => [:installed,   :installed],
+  #       10 => [:installed,   :installed],  # noop
+  #       11 => [:enabled,     :enabled],
+  #       12 => [:disabled,    :disabled],
+  #       13 => [:uninstalled, :uninstalled],
+  #       14 => [:installed,   :installed],
+  #       15 => [:disabled,    :installed],  # noop
+  #       16 => [:uninstalled, :uninstalled],
+  #     }
+  #     interface = Interface.new(interfaces[0])
+  #     # start test from :uninstalled state
+  #     interface.fex_feature_set(:uninstalled)
+  #     from = interface.fex_feature
+  #     test_matrix.each do |id,test|
+  #       #puts "Test #{id}: #{test}, (from: #{from}"
+  #       set_state, expected = test
+  #       interface.fex_feature_set(set_state)
+  #       curr = interface.fex_feature
+  #       assert_equal(expected, curr,
+  #                    "Error: fex test #{id}: from #{from} to #{set_state}")
+  #       from = curr
+  #     end
+  #   end
 
   def test_system_default_switchport_on_off
-    interface = Interface.new("Eth1/1")
+    interface = Interface.new('Eth1/1')
 
-    set_cmd_ref_system_default_switchport("")
+    system_default_switchport('')
     assert(interface.system_default_switchport,
-           "Test for enabled - failed")
+           'Test for enabled - failed')
 
     # common default is "no switch"
-    set_cmd_ref_system_default_switchport("no ")
+    system_default_switchport('no ')
     refute(interface.system_default_switchport,
-           "Test for disabled - failed")
+           'Test for disabled - failed')
   end
 
   def test_system_default_switchport_shutdown_on_off
-    interface = Interface.new("Eth1/1")
+    interface = Interface.new('Eth1/1')
 
-    set_cmd_ref_system_default_switchport_shutdown("no ")
+    system_default_switchport_shutdown('no ')
     refute(interface.system_default_switchport_shutdown,
-           "Test for disabled - failed")
+           'Test for disabled - failed')
 
     # common default is "shutdown"
-    set_cmd_ref_system_default_switchport_shutdown("")
+    system_default_switchport_shutdown('')
     assert(interface.system_default_switchport_shutdown,
-           "Test for enabled - failed")
+           'Test for enabled - failed')
   end
 
   def test_interface_svi_command_on_non_vlan
     interface = Interface.new(interfaces[0])
-    assert_raises(RuntimeError) {
-      interface.svi_autostate = true
-    }
-    assert_raises(RuntimeError) {
-      interface.svi_management = true
-    }
+    assert_raises(RuntimeError) { interface.svi_autostate = true }
+    assert_raises(RuntimeError) { interface.svi_management = true }
     interface_ethernet_default(interfaces_id[0])
   end
 end