catch ro users

Author: monrog2

aci-preupgrade-validation-script.py

@@ -5271,9 +5271,10 @@ def apic_database_size_check(cversion, **kwargs):
         recommended_action = 'Contact Cisco TAC to investigate all flagged large DB sizes'
         for id in apic_id_to_name:
             collect_stats_cmd = "acidiag dbsize --topshard --apic " + id + " -f json"
-            collect_shard_stats_data = run_cmd(collect_stats_cmd, splitlines=False)
-            if collect_shard_stats_data is None:
-                return Result(result=NA, msg="acidiag command not available to current user")
+            try:
+                collect_shard_stats_data = run_cmd(collect_stats_cmd, splitlines=False)
+            except subprocess.CalledProcessError:
+                return Result(result=MANUAL, msg="acidiag command not available to current user")
             top_db_stats = json.loads(collect_shard_stats_data)
 
             for db_stats in top_db_stats['dbs']:

tests/apic_database_size_check/test_apic_database_size_check.py

@@ -296,3 +296,37 @@ def test_logic(mock_icurl, mock_run_cmd, cversion, expected_result):
     cver = script.AciVersion(cversion) if cversion else None
     result = script.apic_database_size_check(1, 1, cver)
     assert result == expected_result
+
+
+@pytest.mark.parametrize(
+    "icurl_outputs, cmd_outputs, cversion, expected_result",
+    [
+        # If user does not have permissions to run acidiag, flag MANUAL
+        (
+            {apic_node_api: read_data(dir, 'infraWiNode_4.json')},
+            {
+                apic1_acidiag: {"CalledProcessError": True},
+                apic2_acidiag: {"CalledProcessError": True},
+                apic3_acidiag: {"CalledProcessError": True},
+            },
+            "6.1(3f)",
+            script.MANUAL,
+        ),
+        # If user has permissions to run acidiag but command fails, flag ERROR
+        (
+            {apic_node_api: read_data(dir, 'infraWiNode_4.json')},
+            {
+                apic1_acidiag: {"CalledProcessError": True},
+                apic2_acidiag: {"CalledProcessError": True},
+                apic3_acidiag: {"CalledProcessError": True},
+                apic4_acidiag: {"CalledProcessError": True},
+            },
+            "6.1(3f)",
+            script.MANUAL,
+        ),
+    ],
+)
+def test_permission_logic(mock_icurl, mock_run_cmd, cversion, expected_result):
+    cver = script.AciVersion(cversion) if cversion else None
+    result = script.apic_database_size_check(1, 1, cver)
+    assert result == expected_result

tests/conftest.py

@@ -3,6 +3,7 @@
 import pytest
 import logging
 import importlib
+from subprocess import CalledProcessError
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 PROJECT_DIR = os.path.dirname(TEST_DIR)
@@ -213,8 +214,10 @@ def _mock_run_cmd(cmd, splitlines=False):
         if details is None:
             log.error("Command `%s` not found in test data", cmd)
             return ""
-        splitlines = details.get("splitlines", False)
+        if details.get("CalledProcessError"):
+            raise CalledProcessError(127, cmd)
 
+        splitlines = details.get("splitlines", False)
         output = details.get("output")
         if output is None:
             log.error("Output for cmd `%s` not found in test data", cmd)