invalid_fex_rs_check; check fex_ id >= 101 (#146)

* invalid_fex_rs_check; check fex_ id >= 101 * review changes
datacenter · Aug 8, 2024 · 7a39ee6 · 7a39ee6
1 parent a872016
commit 7a39ee6
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 2 deletions.
diff --git a/aci-preupgrade-validation-script.py b/aci-preupgrade-validation-script.py
@@ -3491,10 +3491,11 @@ def invalid_fex_rs_check(index, total_checks, **kwargs):
 
     for rs in infraRsHPathAtt:
         dn = rs["infraRsHPathAtt"]["attributes"]["dn"]
-        m = re.search(r'eth(?P<fex>\d+)\/\d\/\d', dn)
+        m = re.search(r'eth(?P<fex>\d{3})\/\d\/\d', dn)
         if m:
             fex_id = m.group('fex')
-            data.append([fex_id, dn])
+            if int(fex_id) >= 101:
+                data.append([fex_id, dn])
 
     if data:
         result = FAIL_UF

diff --git a/tests/invalid_fex_rs_check/infraRsHPathAtt_neg.json b/tests/invalid_fex_rs_check/infraRsHPathAtt_neg.json
@@ -42,5 +42,49 @@
               "userdom": ""
           }
       }
+  },
+  {
+    "infraRsHPathAtt": {
+        "attributes": {
+            "annotation": "",
+            "childAction": "",
+            "dn": "uni/infra/hpaths-105_eth198_1_7/rsHPathAtt-[topology/pod-1/paths-105/pathep-[eth100/1/7]]",
+            "extMngdBy": "",
+            "forceResolve": "yes",
+            "lcOwn": "local",
+            "modTs": "2021-10-23T08:33:12.722+09:00",
+            "rType": "mo",
+            "state": "unformed",
+            "stateQual": "none",
+            "status": "",
+            "tCl": "fabricPathEp",
+            "tDn": "topology/pod-1/paths-105/pathep-[eth198/1/7]",
+            "tType": "mo",
+            "uid": "15374",
+            "userdom": ""
+        }
+    }
+  },
+  {
+    "infraRsHPathAtt": {
+        "attributes": {
+            "annotation": "",
+            "childAction": "",
+            "dn": "uni/infra/hpaths-105_eth198_1_7/rsHPathAtt-[topology/pod-1/paths-105/pathep-[eth1/30/11]]",
+            "extMngdBy": "",
+            "forceResolve": "yes",
+            "lcOwn": "local",
+            "modTs": "2021-10-23T08:33:12.722+09:00",
+            "rType": "mo",
+            "state": "unformed",
+            "stateQual": "none",
+            "status": "",
+            "tCl": "fabricPathEp",
+            "tDn": "topology/pod-1/paths-105/pathep-[eth198/1/7]",
+            "tType": "mo",
+            "uid": "15374",
+            "userdom": ""
+        }
+    }
   }
 ]
diff --git a/tests/invalid_fex_rs_check/infraRsHPathAtt_pos.json b/tests/invalid_fex_rs_check/infraRsHPathAtt_pos.json
@@ -21,6 +21,28 @@
           }
       }
   },
+  {
+    "infraRsHPathAtt": {
+        "attributes": {
+            "annotation": "",
+            "childAction": "",
+            "dn": "uni/infra/hpaths-105_eth198_1_7/rsHPathAtt-[topology/pod-1/paths-105/pathep-[eth101/1/20]]",
+            "extMngdBy": "",
+            "forceResolve": "yes",
+            "lcOwn": "local",
+            "modTs": "2021-10-23T08:33:12.722+09:00",
+            "rType": "mo",
+            "state": "unformed",
+            "stateQual": "none",
+            "status": "",
+            "tCl": "fabricPathEp",
+            "tDn": "topology/pod-1/paths-105/pathep-[eth198/1/7]",
+            "tType": "mo",
+            "uid": "15374",
+            "userdom": ""
+        }
+    }
+},
   {
       "infraRsHPathAtt": {
           "attributes": {
@@ -42,5 +64,49 @@
               "userdom": ""
           }
       }
+  },
+  {
+    "infraRsHPathAtt": {
+        "attributes": {
+            "annotation": "",
+            "childAction": "",
+            "dn": "uni/infra/hpaths-105_eth198_1_7/rsHPathAtt-[topology/pod-1/paths-105/pathep-[eth13/1/4]]",
+            "extMngdBy": "",
+            "forceResolve": "yes",
+            "lcOwn": "local",
+            "modTs": "2021-10-23T08:33:12.722+09:00",
+            "rType": "mo",
+            "state": "unformed",
+            "stateQual": "none",
+            "status": "",
+            "tCl": "fabricPathEp",
+            "tDn": "topology/pod-1/paths-105/pathep-[eth198/1/7]",
+            "tType": "mo",
+            "uid": "15374",
+            "userdom": ""
+        }
+    }
+  },
+  {
+    "infraRsHPathAtt": {
+        "attributes": {
+            "annotation": "",
+            "childAction": "",
+            "dn": "uni/infra/hpaths-105_eth198_1_7/rsHPathAtt-[topology/pod-1/paths-105/pathep-[eth1/11/11]]",
+            "extMngdBy": "",
+            "forceResolve": "yes",
+            "lcOwn": "local",
+            "modTs": "2021-10-23T08:33:12.722+09:00",
+            "rType": "mo",
+            "state": "unformed",
+            "stateQual": "none",
+            "status": "",
+            "tCl": "fabricPathEp",
+            "tDn": "topology/pod-1/paths-105/pathep-[eth198/1/7]",
+            "tType": "mo",
+            "uid": "15374",
+            "userdom": ""
+        }
+    }
   }
 ]