cisco_node_utils 1.3.0 → 1.4.0

data/tests/cmd_config_invalid.yaml

@@ -12,5 +12,5 @@ feature-nested_bad_syntax:
 
 feature-input_too_long:
   command: |
-          router ospf bluethisoutputistolongwaytoolong
+          router ospf bluethisoutputistolongwaytoolongreallylong
 

data/tests/noop.rb

@@ -0,0 +1,7 @@
+require_relative 'ciscotest'
+# NOOP class for CI development use only
+class Noop < CiscoTestCase
+  def test_noop
+    assert(true)
+  end
+end

data/tests/tacacs_server.yaml.example

@@ -0,0 +1,6 @@
+# Tacacs server configuration for test_aaa_authorization_service.rb
+# Tacacs server must be set up with external access for test to run
+host: '10.122.197.197'
+key:  'testing123'
+vrf:  'management'
+intf: 'mgmt0'

data/tests/test_aaa_authentication_login.rb

@@ -16,8 +16,31 @@ require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/aaa_authentication_login'
 
 # Test class for AAA Authentication Login
-class TestAaaAuthenticationLogin < CiscoTestCase
+class TestAaaAuthenLogin < CiscoTestCase
   @skip_unless_supported = 'aaa_authentication_login'
+  @@pre_clean_needed = true # rubocop:disable Style/ClassVars
+
+  def setup
+    super
+    return unless @@pre_clean_needed
+    cleanup
+    @@pre_clean_needed = false # rubocop:disable Style/ClassVars
+  end
+
+  def teardown
+    cleanup
+    super
+  end
+
+  def cleanup
+    # Remove any stale commands that may conflict with this testfile
+    s = @device.cmd("show run | i '^aaa authentication' | sed 's/^/no /'")
+    s.split("\n").each do |line|
+      next unless line[/no aaa/]
+      config_no_warn(line)
+    end
+  end
+
   # DEFAULT(:ascii_authentication)
   # => false
   # rubocop:disable Style/MethodName

data/tests/test_aaa_authentication_login_service.rb

@@ -20,14 +20,13 @@ AAA_AUTH_LOGIN_SERVICE_METHOD_LOCAL = :local
 AAA_AUTH_LOGIN_SERVICE_METHOD_UNSELECTED = :unselected
 
 # Test class for AAA Authentication Login Service
-class TestAaaAuthenticationLoginService < CiscoTestCase
+class TestAaaAuthenLoginSvc < CiscoTestCase
   @skip_unless_supported = 'aaa_auth_login_service'
 
   def setup
     super
-    # TBD: Remove once CSCuz44696 is resolved.
-    skip('This test is not currently supported on 7.0(3)I3 images') if
-      node.os_version[/7.0\(3\)I3\(/]
+    skip_legacy_defect?('7.0.3.I3.1',
+                        'CSCuz44696: Cannot configure aaa group server tacacs')
   end
 
   def unconfig_tacacs
@@ -85,13 +84,12 @@ class TestAaaAuthenticationLoginService < CiscoTestCase
       aaaauthloginservice.nil?
   end
 
-  def test_collection_with_service_default
+  # Test with service default
+  def test_collection_svc_def
     unconfig_aaa
     aaaauthloginservice_list = AaaAuthenticationLoginService.services
     refute_empty(aaaauthloginservice_list,
                  'Error: service collection is not filled')
-    assert_equal(1, aaaauthloginservice_list.size,
-                 'Error:  collection not reporting correct ')
     assert(aaaauthloginservice_list.key?('default'),
            'Error:  collection does contain default')
     aaaauthloginservice_list.each do |name, aaaauthloginservice|
@@ -107,7 +105,8 @@ class TestAaaAuthenticationLoginService < CiscoTestCase
     aaaauthloginservices_default
   end
 
-  def test_collection_with_service_default_and_console
+  # Test with service default and console
+  def test_collection_svc_def_con
     unconfig_aaa
     # preconfig console
     config('aaa authentication login console none')
@@ -143,7 +142,8 @@ class TestAaaAuthenticationLoginService < CiscoTestCase
     aaaauthloginservices_default
   end
 
-  def test_collection_with_service_default_and_console_with_group
+  # Test with service default and console with group
+  def test_collection_svc_def_con_grp
     # preconfig servers
     servers = %w(group1 group2)
     config_tacacs_servers(servers)
@@ -655,13 +655,6 @@ class TestAaaAuthenticationLoginService < CiscoTestCase
     assert_show_match(command: 'show run aaa all | no-more',
                       pattern: Regexp.new(prefix + groups.join(' ')))
 
-    # default group and method
-    method = aaaauthloginservice.default_method
-    groups = aaaauthloginservice.default_groups
-    aaaauthloginservice.groups_method_set(groups, method)
-    refute_show_match(command: 'show run aaa all | no-more',
-                      pattern: /^aaa authentication login console local/)
-
     aaaauthloginservice_detach(aaaauthloginservice)
     unconfig_tacacs
   end

data/tests/test_aaa_authorization_service.rb

@@ -12,20 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'yaml'
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/aaa_authorization_service'
 
 # TestAaaAuthorizationService - Minitest for AaaAuthorizationService util
-class TestAaaAuthorizationService < CiscoTestCase
+class TestAaaAuthorSvc < CiscoTestCase
   @skip_unless_supported = 'aaa_authorization_service'
   @@pre_clean_needed = true # rubocop:disable Style/ClassVars
 
   def setup
     super
-    # TBD: Remove once CSCuz44696 is resolved.
-    skip('This test is not currently supported on 7.0(3)I3 images') if
-      node.os_version[/7.0\(3\)I3\(/]
 
+    skip_legacy_defect?('7.0.3.I3.1',
+                        'CSCuz44696: Cannot configure aaa group server tacacs')
     cleanup_aaa if @@pre_clean_needed
     @@pre_clean_needed = false # rubocop:disable Style/ClassVars
     feature_tacacs
@@ -42,6 +42,7 @@ class TestAaaAuthorizationService < CiscoTestCase
   def cleanup_aaa
     cmds = config('show run aaa').scan(/^aaa auth.*/)
     cmds.each do |cmd|
+      cmd = strip_local(cmd) unless AaaAuthorizationService.remove_local_auth
       config("no #{cmd}")
     end
   end
@@ -57,6 +58,13 @@ class TestAaaAuthorizationService < CiscoTestCase
     config("#{state} feature tacacs+")
   end
 
+  def strip_local(config_string)
+    # AAA authorization method 'local' is a prerequisite for several tests in
+    # this suite but once configured by design is not allowed to be removed on
+    # certain nxos platforms.
+    config_string.gsub('local', '')
+  end
+
   # Helper method to get regexp for aaa authorization commands
   def get_pattern(cmd_type, service, groups, method=:unselected)
     cmd_type = cmd_type == :config_commands ? 'config-commands' : cmd_type.to_s
@@ -70,17 +78,19 @@ class TestAaaAuthorizationService < CiscoTestCase
     Regexp.new(p)
   end
 
-  # Method to pre-configure a valid tacacs server and aaa group.  This
-  # group can be included in the testing such access to the device
-  # never is compromised.
+  # Pre-configure the user-defined tacacs server in tests/tacacs_server.yaml
   def preconfig_tacacs_server_access(group_name)
-    config('tacacs-server key testing123',
-           'tacacs-server host 10.122.197.197 key testing123',
+    path = File.expand_path('../tacacs_server.yaml', __FILE__)
+    skip('Cannot find tests/tacacs_server.yaml') unless File.file?(path)
+    cfg = YAML.load(File.read(path))
+    valid_cfg?(cfg)
+    config("tacacs-server host #{cfg['host']} key #{cfg['key']}",
            "aaa group server tacacs+ #{group_name}",
-           'server 10.122.197.197',
-           'use-vrf management',
-           'source-interface mgmt0',
+           "server #{cfg['host']}",
+           "use-vrf #{cfg['vrf']}",
+           "source-interface #{cfg['intf']}",
            'aaa authentication login ascii-authentication')
+    valid_server?(cfg['host'])
   end
 
   def prefix
@@ -95,57 +105,73 @@ class TestAaaAuthorizationService < CiscoTestCase
     %w(tac_group bxb100 sjc200 rtp10)
   end
 
+  def valid_cfg?(cfg)
+    skip('tests/tacacs_server.yaml file is empty') unless cfg
+    msg = 'Missing key in tests/tacacs_server.yaml'
+    %w(host key vrf intf).each do |key|
+      skip("#{msg}: #{key}") if cfg[key].nil?
+    end
+  end
+
+  def valid_server?(host)
+    test_aaa = config("test aaa server tacacs+ #{host} test test")
+    # Valid tacacs server will return message regarding user authentication
+    valid = test_aaa[/^user has \S+ authenticat(ed|ion)/]
+    fail "Host '#{host}' is either not a valid tacacs server " \
+          'or not reachable' unless valid
+  end
+
   def test_create_unsupported_type
     assert_raises(ArgumentError) do
       AaaAuthorizationService.new(:none, 'default')
     end
   end
 
-  def test_create_nil_type
+  def test_nil_type
     assert_raises(TypeError) do
       AaaAuthorizationService.new(nil, 'default')
     end
   end
 
-  def test_create_invalid_type
+  def test_type_inv
     assert_raises(TypeError) do
       AaaAuthorizationService.new('test', 'default')
     end
   end
 
-  def test_create_invalid_range_type
+  def test_range_type_inv
     assert_raises(TypeError) do
       AaaAuthorizationService.new(34, 'default')
     end
   end
 
-  def test_create_invalid_service
+  def test_svc_inv
     assert_raises(ArgumentError) do
       AaaAuthorizationService.new(:commands, 'test')
     end
   end
 
-  def test_create_empty_service
+  def test_empty_svc
     assert_raises(ArgumentError) do
       AaaAuthorizationService.new(:commands, '')
     end
   end
 
-  def test_create_commands_default
+  def test_cmds_def
     aaa_a_service = AaaAuthorizationService.new(:commands, 'default')
     refute_nil(aaa_a_service,
                'Error: AaaAuthorizationService creating commands default')
     aaa_a_service.destroy unless aaa_a_service.nil?
   end
 
-  def test_create_commands_console
+  def test_cmds_con
     aaa_a_service = AaaAuthorizationService.new(:commands, 'console')
     refute_nil(aaa_a_service,
                'Error: AaaAuthorizationService creating commands default')
     aaa_a_service.destroy unless aaa_a_service.nil?
   end
 
-  def test_create_config_commands_default
+  def test_cfg_cmds_def
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'default')
     refute_nil(aaa_a_service,
                'Error: AaaAuthorizationService creating ' \
@@ -153,7 +179,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     aaa_a_service.destroy unless aaa_a_service.nil?
   end
 
-  def test_create_config_commands_console
+  def test_cfg_cmds_con
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'console')
     refute_nil(aaa_a_service,
                'Error: AaaAuthorizationService creating commands default')
@@ -174,11 +200,11 @@ class TestAaaAuthorizationService < CiscoTestCase
     aaa_a_service.destroy
   end
 
-  def test_collection_invalid
+  def test_collect_inv
     assert_nil(AaaAuthorizationService.services['TEST'])
   end
 
-  def test_collection_services_type_commands
+  def test_collect_svc_cmds
     type = :commands
     collection = AaaAuthorizationService.services[type]
 
@@ -210,7 +236,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     end
   end
 
-  def test_collection_services_type_config_commands
+  def test_collect_svc_cfg_cmds
     type = :config_commands
     collection = AaaAuthorizationService.services[type]
 
@@ -241,7 +267,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     end
   end
 
-  def test_type_commands_default_console_group
+  def test_type_cmds_def_con_grp
     # Preconfig AAA Authorization
     cmd1 = 'aaa authorization commands default group group2 group1 local'
     cmd2 = 'aaa authorization commands console group group1 local'
@@ -278,7 +304,7 @@ class TestAaaAuthorizationService < CiscoTestCase
 
     # only one of default or console can be configured at a time without
     # locking the CLI
-    config("no #{cmd1}", cmd2)
+    config("no #{strip_local(cmd1)}", cmd2)
 
     service = 'console'
     aaa_a_service = collection[service]
@@ -290,11 +316,9 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_equal(groups, aaa_a_service.groups,
                  'Error: Invalid AaaAuthorizationService groups for ' \
                  'console in collection')
-
-    config("no #{cmd2}")
   end
 
-  def test_type_config_commands_default_console_group
+  def test_type_cfg_cmds_def_con_grp
     # Preconfig AAA Authorization
     cmd1 = 'aaa authorization config-commands default group group2 group1 local'
     cmd2 = 'aaa authorization config-commands console group group1 local'
@@ -329,7 +353,7 @@ class TestAaaAuthorizationService < CiscoTestCase
                  'Error: Invalid AaaAuthorizationService groups ' \
                  'for default in collection')
 
-    config("no #{cmd1}", cmd2)
+    config("no #{strip_local(cmd1)}", cmd2)
 
     service = 'console'
     aaa_a_service = collection[service]
@@ -341,11 +365,9 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_equal(groups, aaa_a_service.groups,
                  'Error: Invalid AaaAuthorizationService groups ' \
                  'for console in collection')
-
-    config("no #{cmd2}")
   end
 
-  def test_get_default_method
+  def test_get_def_method
     type = :commands
     aaa_a_service = AaaAuthorizationService.new(type, 'default')
     assert_equal(:local, aaa_a_service.default_method,
@@ -373,7 +395,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     aaa_a_service.destroy
   end
 
-  def test_collection_groups_commands_default
+  def test_collect_grps_cmds_def
     type = :commands
     aaa_a_service = AaaAuthorizationService.new(type, 'default')
 
@@ -389,8 +411,9 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_equal(:unselected, aaa_a_service.method)
 
     # Change the config to have different groups and method
-    config('aaa authorization commands default group ' \
-           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local")
+    cmd0 = 'aaa authorization commands default group ' \
+           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local"
+    config(cmd0)
 
     conf_groups = [tacacs_groups[0], tacacs_groups[3], tacacs_groups[1]]
     assert_equal(conf_groups, aaa_a_service.groups)
@@ -399,17 +422,18 @@ class TestAaaAuthorizationService < CiscoTestCase
     # Mix default and console, but since our instance is for 'default'
     # service we should only get 'default' groups and not 'console'
     # groups.
-    aaa_cmd1 = 'aaa authorization commands default group ' \
-               "#{tacacs_groups.join(' ')} local"
-    aaa_cmd2 = 'aaa authorization commands console group ' \
-               "#{tacacs_groups[1..3].join(' ')} local"
-    config(aaa_cmd1, aaa_cmd2)
+    cmd1 = 'aaa authorization commands default group ' \
+           "#{tacacs_groups.join(' ')} local"
+    cmd2 = 'aaa authorization commands console group ' \
+           "#{tacacs_groups[1..3].join(' ')} local"
+
+    config(cmd1, cmd2)
 
     assert_equal(tacacs_groups, aaa_a_service.groups)
     assert_equal(:local, aaa_a_service.method)
   end
 
-  def test_collection_groups_commands_console
+  def test_collect_grps_cmds_con
     type = :commands
     aaa_a_service = AaaAuthorizationService.new(type, 'console')
 
@@ -423,8 +447,9 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_equal(:unselected, aaa_a_service.method)
 
     # Change the config to have different groups and method
-    config('aaa authorization commands console group ' \
-           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local")
+    cmd0 = 'aaa authorization commands console group ' \
+           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local"
+    config(cmd0)
 
     conf_groups = [tacacs_groups[0], tacacs_groups[3], tacacs_groups[1]]
     assert_equal(conf_groups, aaa_a_service.groups)
@@ -433,17 +458,17 @@ class TestAaaAuthorizationService < CiscoTestCase
     # Mix default and console, but since our instance is for 'console'
     # service we should only get 'console' groups and not 'default'
     # groups.
-    aaa_cmd1 = 'aaa authorization commands console group ' \
+    cmd1 = 'aaa authorization commands console group ' \
                "#{tacacs_groups.join(' ')} local"
-    aaa_cmd2 = 'aaa authorization commands default group ' \
+    cmd2 = 'aaa authorization commands default group ' \
                "#{tacacs_groups[1..3].join(' ')} local"
-    config(aaa_cmd1, aaa_cmd2)
+    config(cmd1, cmd2)
 
     assert_equal(tacacs_groups, aaa_a_service.groups)
     assert_equal(:local, aaa_a_service.method)
   end
 
-  def test_collection_groups_config_commands_default
+  def test_collect_grps_cfg_cmds_def
     type = :config_commands
     aaa_a_service = AaaAuthorizationService.new(type, 'default')
 
@@ -457,8 +482,9 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_equal(:unselected, aaa_a_service.method)
 
     # Change the config to have different groups and method
-    config('aaa authorization config-commands default group ' \
-           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local")
+    cmd0 = 'aaa authorization config-commands default group ' \
+           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local"
+    config(cmd0)
 
     conf_groups = [tacacs_groups[0], tacacs_groups[3], tacacs_groups[1]]
     assert_equal(conf_groups, aaa_a_service.groups)
@@ -467,17 +493,17 @@ class TestAaaAuthorizationService < CiscoTestCase
     # Mix default and console, but since our instance is for 'default'
     # service we should only get 'default' groups and not 'console'
     # groups.
-    aaa_cmd1 = 'aaa authorization config-commands default group ' \
-               "#{tacacs_groups.join(' ')} local"
-    aaa_cmd2 = 'aaa authorization config-commands console group ' \
-               "#{tacacs_groups[1..3].join(' ')} local"
-    config(aaa_cmd1, aaa_cmd2)
+    cmd1 = 'aaa authorization config-commands default group ' \
+           "#{tacacs_groups.join(' ')} local"
+    cmd2 = 'aaa authorization config-commands console group ' \
+           "#{tacacs_groups[1..3].join(' ')} local"
+    config(cmd1, cmd2)
 
     assert_equal(tacacs_groups, aaa_a_service.groups)
     assert_equal(:local, aaa_a_service.method)
   end
 
-  def test_collection_groups_config_commands_console
+  def test_collect_grps_cfg_cmds_con
     type = :config_commands
     aaa_a_service = AaaAuthorizationService.new(type, 'console')
 
@@ -491,8 +517,9 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_equal(:unselected, aaa_a_service.method)
 
     # Change the config to have different groups and method
-    config('aaa authorization config-commands console group ' \
-           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local")
+    cmd0 = 'aaa authorization config-commands console group ' \
+           "#{tacacs_groups[0]} #{tacacs_groups[3]} #{tacacs_groups[1]} local"
+    config(cmd0)
 
     conf_groups = [tacacs_groups[0], tacacs_groups[3], tacacs_groups[1]]
     assert_equal(conf_groups, aaa_a_service.groups)
@@ -501,17 +528,17 @@ class TestAaaAuthorizationService < CiscoTestCase
     # Mix default and console, but since our instance is for 'console'
     # service we should only get 'console' groups and not 'default'
     # groups.
-    aaa_cmd1 = 'aaa authorization config-commands console group ' \
-               "#{tacacs_groups.join(' ')} local"
-    aaa_cmd2 = 'aaa authorization config-commands default group ' \
-               "#{tacacs_groups[1..3].join(' ')} local"
-    config(aaa_cmd1, aaa_cmd2)
+    cmd1 = 'aaa authorization config-commands console group ' \
+           "#{tacacs_groups.join(' ')} local"
+    cmd2 = 'aaa authorization config-commands default group ' \
+           "#{tacacs_groups[1..3].join(' ')} local"
+    config(cmd1, cmd2)
 
     assert_equal(tacacs_groups, aaa_a_service.groups)
     assert_equal(:local, aaa_a_service.method)
   end
 
-  def test_get_default_groups
+  def test_get_def_grps
     groups = []
     type = :commands
     aaa_a_service = AaaAuthorizationService.new(type, 'default')
@@ -544,7 +571,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     aaa_a_service.destroy
   end
 
-  def test_commands_default_unselected_single
+  def test_cmds_def_unselected_single
     aaa_a_service = AaaAuthorizationService.new(:commands, 'default')
     aaa_a_service.groups_method_set(tacacs_groups[0], :unselected)
 
@@ -552,7 +579,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commands_default_unselected_multi
+  def test_cmds_def_unselected_multi
     aaa_a_service = AaaAuthorizationService.new(:commands, 'default')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :unselected)
 
@@ -560,7 +587,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commands_default_local_multi
+  def test_cmds_def_local_multi
     aaa_a_service = AaaAuthorizationService.new(:commands, 'default')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :local)
 
@@ -568,7 +595,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commands_default_all_default
+  def test_cmds_def_all_def
     aaa_a_service = AaaAuthorizationService.new(:commands, 'default')
     method = aaa_a_service.default_method
     groups = aaa_a_service.default_groups
@@ -578,7 +605,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commands_console_unselected_single
+  def test_cmds_con_unselected_single
     aaa_a_service = AaaAuthorizationService.new(:commands, 'console')
     aaa_a_service.groups_method_set(tacacs_groups[0], :unselected)
 
@@ -586,7 +613,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commands_console_unselected_multi
+  def test_cmds_con_unselected_multi
     aaa_a_service = AaaAuthorizationService.new(:commands, 'console')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :unselected)
 
@@ -594,7 +621,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commands_console_local_multi
+  def test_cmds_con_local_multi
     aaa_a_service = AaaAuthorizationService.new(:commands, 'console')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :local)
 
@@ -602,7 +629,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commans_console_all_default
+  def test_cmds_con_all_def
     aaa_a_service = AaaAuthorizationService.new(:commands, 'console')
     method = aaa_a_service.default_method
     groups = aaa_a_service.default_groups
@@ -612,7 +639,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_default_unselected_single
+  def test_cfg_cmds_def_unselected_single
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'default')
     aaa_a_service.groups_method_set(tacacs_groups[0], :unselected)
 
@@ -620,7 +647,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_default_unselected_multi
+  def test_cfg_cmds_def_unselected_multi
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'default')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :unselected)
 
@@ -628,7 +655,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_default_local_multi
+  def test_cfg_cmds_def_local_multi
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'default')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :local)
 
@@ -636,7 +663,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_default_all_default
+  def test_cfg_cmds_def_all_def
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'default')
 
     method = aaa_a_service.default_method
@@ -647,7 +674,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_console_unselected_single
+  def test_cfg_cmds_con_unselected_single
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'console')
     aaa_a_service.groups_method_set(tacacs_groups[0], :unselected)
 
@@ -655,7 +682,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_console_unselected_multi
+  def test_cfg_cmds_con_unselected_multi
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'console')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :unselected)
 
@@ -663,7 +690,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_console_local_multi
+  def test_cfg_cmds_con_local_multi
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'console')
     aaa_a_service.groups_method_set(tacacs_groups[0..2], :local)
 
@@ -671,7 +698,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_config_commands_console_all_default
+  def test_cfg_cmds_con_all_def
     aaa_a_service = AaaAuthorizationService.new(:config_commands, 'console')
     method = aaa_a_service.default_method
     groups = aaa_a_service.default_groups
@@ -681,7 +708,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     assert_show_match(command: show_cmd, pattern: p)
   end
 
-  def test_commands_invalid_groups_method_set_groups
+  def test_cmds_grps_method_set_inv
     # Commands, with service default
     type = :commands
     service = 'default'
@@ -725,7 +752,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     aaa_a_service.destroy
   end
 
-  def test_config_commands_invalid_set_groups
+  def test_cfg_cmds_set_grps_inv
     # Commands, with service default
     type = :config_commands
     service = 'default'
@@ -769,7 +796,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     aaa_a_service.destroy
   end
 
-  def test_commands_invalid_method
+  def test_cmds_method_inv
     # Commands, with service default
     type = :commands
     service = 'default'
@@ -807,7 +834,7 @@ class TestAaaAuthorizationService < CiscoTestCase
     aaa_a_service.destroy
   end
 
-  def test_config_commands_invalid_method
+  def test_cfg_cmds_method_inv
     # Commands, with service default
     type = :config_commands
     service = 'default'