diff --git a/aci-preupgrade-validation-script.py b/aci-preupgrade-validation-script.py index a6ebc28..1fc71c5 100644 --- a/aci-preupgrade-validation-script.py +++ b/aci-preupgrade-validation-script.py @@ -1816,6 +1816,8 @@ def _icurl_error_handler(imdata): raise error elif "unresolved class for" in imdata[0]['error']['attributes']['text']: raise OldVerClassNotFound('Your current ACI version does not have requested class') + elif "Unknown class" in imdata[0]['error']['attributes']['text']: + raise OldVerClassNotFound('Your current ACI version does not have requested class') elif "not found" in imdata[0]['error']['attributes']['text']: raise OldVerClassNotFound('Your current ACI version does not have requested class') elif "Unable to deliver the message, Resolve timeout" in imdata[0]['error']['attributes']['text']: @@ -6999,9 +7001,7 @@ def make_query(dn_batch): candidate_context_dns.add(ldev_dns[0] + "/lIfCtx-c-Any") ctx_items, oversized_contexts = query_dns( "vnsLIfCtx", candidate_context_dns, - "&query-target=self&rsp-subtree=children" - "&rsp-subtree-class=vnsRsLIfCtxToBD," - "vnsRsLIfCtxToSvcRedirectPol,vnsRsLIfCtxToRemoteSvcRedirectPol") + "&query-target=self&rsp-subtree=children") contexts = {} for item in ctx_items: ctx = item.get("vnsLIfCtx", {}) diff --git a/tests/checks/service_ep_flag_bd_check/test_service_ep_flag_bd_check.py b/tests/checks/service_ep_flag_bd_check/test_service_ep_flag_bd_check.py index 5b95484..de8c50f 100644 --- a/tests/checks/service_ep_flag_bd_check/test_service_ep_flag_bd_check.py +++ b/tests/checks/service_ep_flag_bd_check/test_service_ep_flag_bd_check.py @@ -100,7 +100,8 @@ def fake_icurl(api_type, query, page_size=100000): return [item for item in payload["node_relations"] if item["vnsRsNodeInstToLDevCtx"]["attributes"]["dn"] in dns] if query.startswith("vnsLIfCtx.json?"): - assert "rsp-subtree-class=" in query + assert "rsp-subtree=children" in query + assert "rsp-subtree-class=" not in query dns = requested_dns(query) return [item for item in payload["contexts"] if item["vnsLIfCtx"]["attributes"]["dn"] in dns] diff --git a/tests/test_icurl.py b/tests/test_icurl.py index b70f253..5caf070 100644 --- a/tests/test_icurl.py +++ b/tests/test_icurl.py @@ -156,6 +156,20 @@ def test_icurl(mock_icurl, apitype, query, expected_result): ], script.OldVerClassNotFound, ), + # Unsupported rsp-subtree-class on APIC 5.2. + ( + [ + { + "error": { + "attributes": { + "code": "12", + "text": "Unknown class vnsRsLIfCtxToRemoteSvcRedirectPol", + } + } + } + ], + script.OldVerClassNotFound, + ), # Query timeout (90 sec) - pre-4.1 ( [