refactor:moved to general check

Author: veenaskumar-cisco

aci-preupgrade-validation-script.py

@@ -6027,25 +6027,20 @@ def apic_downgrade_compat_warning_check(cversion, tversion, **kwargs):
 
 
 @check_wrapper(check_title="svccoreCtrlr or svccoreNode excessive entries check")
-def svccoreCtrlr_or_svccoreNode_excessive_entries_check(tversion, **kwargs):
+def svccoreCtrlr_or_svccoreNode_excessive_entries_check(**kwargs):
     result = PASS
     headers = ['svccoreCtrlr Object Count','svccoreNode Object Count']
     data = []
     recommended_action = "Contact Cisco TAC for Support before upgrade"
     doc_url = "https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#svccoreCtrlr-or-svccoreNode-excessive-entries-check"
-    if not tversion:
-        return Result(result=MANUAL, msg=TVER_MISSING)
-    if tversion.older_than("6.2(1h)") or tversion.same_as("6.2(1h)"):
-        svccore_classes = icurl('class', 'svccoreCtrlr.json')
-        svccoreNode_classes = icurl('class', 'svccoreNode.json')
-        if(len(svccore_classes) > 240 or len(svccoreNode_classes) > 240):
-            data.append([len(svccore_classes), len(svccoreNode_classes)])
-        if data:
-            result = MANUAL
-        return Result(result=result,headers=headers,data=data,recommended_action=recommended_action,doc_url=doc_url)
-    else:
-        return Result(result=NA, msg=VER_NOT_AFFECTED)
-
+    svccore_classes = icurl('class', 'svccoreCtrlr.json')
+    svccoreNode_classes = icurl('class', 'svccoreNode.json')
+    if(len(svccore_classes) > 240 or len(svccoreNode_classes) > 240):
+        data.append([len(svccore_classes), len(svccoreNode_classes)])
+    if data:
+        result = MANUAL
+    return Result(result=result,headers=headers,data=data,recommended_action=recommended_action,doc_url=doc_url)
+    
 # ---- Script Execution ----
 
 

tests/checks/svccore_excessive_class_entries_check/svccore_excessive_class_entries_check.py

@@ -8,34 +8,21 @@
 
 log = logging.getLogger(__name__)
 dir = os.path.dirname(os.path.abspath(__file__))
-test_function = "svccoreCtrlr_excessive_entries_check"
+test_function = "svccoreCtrlr_or_svccoreNode_excessive_entries_check"
 
 # icurl queries
 svccoreClassEntry = 'svccoreCtrlr.json'
 svccoreNodeEntry = 'svccoreNode.json'
 
 @pytest.mark.parametrize(
-    "icurl_outputs, tversion, expected_result",
+    "icurl_outputs, expected_result",
     [
-        #tverson missing
-        (
-            {svccoreClassEntry: read_data(dir, "svccore_positive.json")},
-            None,
-            script.MANUAL
-        ),
-        # tversion not applicable
-        (
-            {svccoreClassEntry: read_data(dir, "svccore_positive.json")},
-            "6.3(2h)",
-            script.NA,
-        ),
         # No excessive class entries
         (
             {
                 svccoreClassEntry: read_data(dir, "svccore_positive.json"),
                 svccoreNodeEntry: read_data(dir, "svccoreNode_positive.json")
             },
-            "5.2(8e)",
             script.PASS,
         ),
         # Excessive class entries found
@@ -44,29 +31,26 @@
                 svccoreClassEntry: read_data(dir, "svccore_negative.json"),
                 svccoreNodeEntry: read_data(dir, "svccoreNode_positive.json")
             },
-            "5.2(8e)",
             script.MANUAL,
         ),
         (
             {
                 svccoreClassEntry: read_data(dir, "svccoreNode_negative.json"),
                 svccoreNodeEntry: read_data(dir, "svccoreNode_negative.json")
             },
-            "5.2(8e)",
             script.MANUAL,
         ),
         (
             {
                 svccoreClassEntry: read_data(dir, "svccore_positive.json"),
                 svccoreNodeEntry: read_data(dir, "svccoreNode_negative.json")
             },
-            "5.2(8e)",
             script.MANUAL,
         )
     ],
 )
 
-def test_logic(run_check,mock_icurl,tversion,expected_result):
-    result = run_check(tversion = script.AciVersion(tversion) if tversion else None)
+def test_logic(run_check,mock_icurl,expected_result):
+    result = run_check()
     assert result.result == expected_result