Juniper

CIS/Junos/6_system/6_1_accounting/rule_6_1_1_ensure_accounting_destination_is_configured.py

@@ -4,7 +4,7 @@
 @medium(
       name='rule_6_1_1_ensure_accounting_destination_is_configured',
       platform=['juniper_junos'],
-      commands=dict(chk_cmd='')
+      commands=dict(chk_cmd1='show configuration system accounting destination | match "server" | count')
 )
 def rule_6_1_1_ensure_accounting_destination_is_configured(commands, ref):
-    assert '' in commands.chk_cmd, ref
+    assert int(commands.chk_cmd1.strip()) >= 1, ref

CIS/Junos/6_system/6_1_accounting/rule_6_1_2_ensure_accounting_of_logins.py

@@ -4,7 +4,7 @@
 @medium(
       name='rule_6_1_2_ensure_accounting_of_logins',
       platform=['juniper_junos'],
-      commands=dict(chk_cmd='')
+      commands=dict(chk_cmd1='show configuration system accounting')
 )
 def rule_6_1_2_ensure_accounting_of_logins(commands, ref):
-    assert '' in commands.chk_cmd, ref
+    assert 'events login;' in commands.chk_cmd1, ref

tests/CIS/Cisco_ios/11_local_authentication_authorization_and_accounting_rules/rule_1110_set_aaa_accounting_system.yml

@@ -4,18 +4,6 @@ defaults:
 
 tests:
   rule_1110_set_aaa_accounting_system:
-    - outcome: TESTS_FAILED
-      configuration: |
-        hostname not-interesting
-        no aaa new-model
-    - outcome: OK
-      configuration: |
-        aaa new-model
     - outcome: OK
       configuration: |
-        no aab new-model
-
-    - outcome: NO_TESTS_COLLECTED
-      devices:
-        - platform: juniperOS
-          ipaddress: 19
+        aaa accounting system

tests/CIS/Cisco_ios/11_local_authentication_authorization_and_accounting_rules/rule_111_enable_aaa_new_model.yml

@@ -6,16 +6,7 @@ tests:
   rule_111_enable_aaa_new_model:
     - outcome: TESTS_FAILED
       configuration: |
-        hostname not-interesting
         no aaa new-model
     - outcome: OK
       configuration: |
         aaa new-model
-    - outcome: OK
-      configuration: |
-        no aab new-model
-
-    - outcome: NO_TESTS_COLLECTED
-      devices:
-        - platform: juniperOS
-          ipaddress: 19

tests/CIS/Cisco_ios/11_local_authentication_authorization_and_accounting_rules/rule_112_enable_aaa_authentication_login.yml

@@ -6,16 +6,10 @@ tests:
   rule_112_enable_aaa_authentication_login:
     - outcome: TESTS_FAILED
       configuration: |
-        hostname not-interesting
         no aaa new-model
     - outcome: OK
       configuration: |
         aaa authentication login
     - outcome: TESTS_FAILED
       configuration: |
         aaa authentication
-
-    - outcome: NO_TESTS_COLLECTED
-      devices:
-        - platform: juniperOS
-          ipaddress: 19

tests/CIS/Cisco_ios/11_local_authentication_authorization_and_accounting_rules/rule_113_enable_aaa_authentication_enable_default.yml

@@ -4,6 +4,11 @@ defaults:
 
 tests:
   rule_113_enable_aaa_authentication_enable_default:
+    - devices:
+        - platform: cisco_ios
+        - platform: cisco_xe
+      outcome: OK
+
     - outcome: TESTS_FAILED
       configuration: |
         hostname not-interesting
@@ -14,5 +19,7 @@ tests:
 
     - outcome: NO_TESTS_COLLECTED
       devices:
-        - platform: juniperOS
-          ipaddress: 19
+        - platform: juniper_junos
+    - outcome: OK
+      devices:
+        - platform: cisco_ios