issue NewValidation: CSCwn81692 #339
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| [ | ||
| { | ||
| "fabricNode": { | ||
| "attributes": { | ||
| "adSt": "off", | ||
| "address": "10.2.176.64", | ||
| "annotation": "", | ||
| "apicType": "apic", | ||
| "childAction": "", | ||
| "delayedHeartbeat": "no", | ||
| "dn": "topology/pod-1/node-101", | ||
| "extMngdBy": "", | ||
| "fabricSt": "active", | ||
| "id": "101", | ||
| "lastStateModTs": "2026-01-28T22:24:54.843+00:00", | ||
| "lcOwn": "local", | ||
| "modTs": "2026-01-28T22:25:42.207+00:00", | ||
| "model": "N9K-C93180YC-EX", | ||
| "monPolDn": "uni/fabric/monfab-default", | ||
| "name": "SITE2-L101", | ||
| "nameAlias": "", | ||
| "nodeType": "unspecified", | ||
| "role": "leaf", | ||
| "serial": "FDO204520TY", | ||
| "status": "", | ||
| "uid": "0", | ||
| "userdom": "all", | ||
| "vendor": "Cisco Systems, Inc", | ||
| "version": "n9000-15.2(6e)" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "fabricNode": { | ||
| "attributes": { | ||
| "adSt": "off", | ||
| "address": "10.2.176.66", | ||
| "annotation": "", | ||
| "apicType": "apic", | ||
| "childAction": "", | ||
| "delayedHeartbeat": "no", | ||
| "dn": "topology/pod-1/node-102", | ||
| "extMngdBy": "", | ||
| "fabricSt": "active", | ||
| "id": "102", | ||
| "lastStateModTs": "2026-01-28T22:25:45.863+00:00", | ||
| "lcOwn": "local", | ||
| "modTs": "2026-01-28T22:26:42.234+00:00", | ||
| "model": "N9K-C93180YC-EX", | ||
| "monPolDn": "uni/fabric/monfab-default", | ||
| "name": "SITE2-L102", | ||
| "nameAlias": "", | ||
| "nodeType": "unspecified", | ||
| "role": "leaf", | ||
| "serial": "FDO204520SZ", | ||
| "status": "", | ||
| "uid": "0", | ||
| "userdom": "all", | ||
| "vendor": "Cisco Systems, Inc", | ||
| "version": "n9000-15.2(6e)" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "fabricNode": { | ||
| "attributes": { | ||
| "adSt": "off", | ||
| "address": "10.2.176.67", | ||
| "annotation": "", | ||
| "apicType": "apic", | ||
| "childAction": "", | ||
| "delayedHeartbeat": "no", | ||
| "dn": "topology/pod-1/node-103", | ||
| "extMngdBy": "", | ||
| "fabricSt": "active", | ||
| "id": "103", | ||
| "lastStateModTs": "2026-01-28T22:25:45.863+00:00", | ||
| "lcOwn": "local", | ||
| "modTs": "2026-01-28T22:26:42.231+00:00", | ||
| "model": "N9K-C93240YC-FX2", | ||
| "monPolDn": "uni/fabric/monfab-default", | ||
| "name": "SITE2-L103", | ||
| "nameAlias": "", | ||
| "nodeType": "unspecified", | ||
| "role": "leaf", | ||
| "serial": "FDO25210JA1", | ||
| "status": "", | ||
| "uid": "0", | ||
| "userdom": "all", | ||
| "vendor": "Cisco Systems, Inc", | ||
| "version": "n9000-15.3(2f)" | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| [ | ||
| { | ||
| "presListener": { | ||
| "attributes": { | ||
| "childAction": "", | ||
| "dn": "resregistry/resregistry-20/relnholder/rspresClass-[resregistry/resregistry-20/class-4307]/list-[uni/infra/nodecfgcont]", | ||
| "lcOwn": "local", | ||
| "lstDn": "uni/infra/nodecfgcont", | ||
| "modTs": "2026-01-21T01:44:22.201+00:00", | ||
| "status": "" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "presListener": { | ||
| "attributes": { | ||
| "childAction": "", | ||
| "dn": "resregistry/resregistry-20/relnholder/rspresClass-[resregistry/resregistry-20/class-4307]/list-[uni/infra/nodecfgcont/node-102]", | ||
| "lcOwn": "local", | ||
| "lstDn": "uni/infra/nodecfgcont/node-102", | ||
| "modTs": "2026-01-21T16:02:15.685+00:00", | ||
| "status": "" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "presListener": { | ||
| "attributes": { | ||
| "childAction": "", | ||
| "dn": "resregistry/resregistry-20/relnholder/rspresClass-[resregistry/resregistry-20/class-4307]/list-[uni/infra/nodecfgcont/node-101]", | ||
| "lcOwn": "local", | ||
| "lstDn": "uni/infra/nodecfgcont/node-101", | ||
| "modTs": "2026-01-21T16:02:15.685+00:00", | ||
| "status": "" | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| [ | ||
| { | ||
| "presListener": { | ||
| "attributes": { | ||
| "childAction": "", | ||
| "dn": "resregistry/resregistry-20/relnholder/rspresClass-[resregistry/resregistry-20/class-4307]/list-[uni/infra/nodecfgcont]", | ||
| "lcOwn": "local", | ||
| "lstDn": "uni/infra/nodecfgcont", | ||
| "modTs": "2026-01-21T01:44:22.201+00:00", | ||
| "status": "" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "presListener": { | ||
| "attributes": { | ||
| "childAction": "", | ||
| "dn": "resregistry/resregistry-20/relnholder/rspresClass-[resregistry/resregistry-20/class-4307]/list-[uni/infra/nodecfgcont/node-102]", | ||
| "lcOwn": "local", | ||
| "lstDn": "uni/infra/nodecfgcont/node-102", | ||
| "modTs": "2026-01-21T16:02:15.685+00:00", | ||
| "status": "" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "presListener": { | ||
| "attributes": { | ||
| "childAction": "", | ||
| "dn": "resregistry/resregistry-20/relnholder/rspresClass-[resregistry/resregistry-20/class-4307]/list-[uni/infra/nodecfgcont/node-101]", | ||
| "lcOwn": "local", | ||
| "lstDn": "uni/infra/nodecfgcont/node-101", | ||
| "modTs": "2026-01-21T16:02:15.685+00:00", | ||
| "status": "" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "presListener": { | ||
| "attributes": { | ||
| "childAction": "", | ||
| "dn": "resregistry/resregistry-20/relnholder/rspresClass-[resregistry/resregistry-20/class-4307]/list-[uni/infra/nodecfgcont/node-103]", | ||
| "lcOwn": "local", | ||
| "lstDn": "uni/infra/nodecfgcont/node-103", | ||
| "modTs": "2026-01-21T18:39:38.321+00:00", | ||
| "status": "" | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import os | ||
| import pytest | ||
| import logging | ||
| import importlib | ||
| from helpers.utils import read_data | ||
|
|
||
| script = importlib.import_module("aci-preupgrade-validation-script") | ||
|
|
||
| log = logging.getLogger(__name__) | ||
| dir = os.path.dirname(os.path.abspath(__file__)) | ||
|
|
||
| test_function = "pres_listener_mo_check" | ||
|
|
||
| # icurl queries | ||
| # fabricNode = "fabricNode.json" | ||
| # fabricNode += '?query-target-filter=and(eq(fabricNode.role,"leaf"),eq(fabricNode.fabricSt,"active"))' | ||
|
|
||
| presListener = "presListener.json" | ||
|
|
||
| @pytest.mark.parametrize( | ||
| "icurl_outputs, fabric_nodes, tversion, expected_result", | ||
| [ | ||
| # No tVersion, MANUAL | ||
| ( | ||
| {presListener: read_data(dir, "presListener-Pos.json")}, | ||
| [], | ||
| None, | ||
| script.MANUAL | ||
| ), | ||
| # FabricNodes missing, MANUAL | ||
| ( | ||
| {presListener: read_data(dir, "presListener-Pos.json")}, | ||
| [], | ||
| "6.1(3a)", | ||
| script.MANUAL | ||
| ), | ||
| # tVersion newer than 6.1-3f , NA | ||
| ( | ||
| {presListener: read_data(dir, "presListener-Pos.json")}, | ||
| [], | ||
| "6.1(4a)", | ||
| script.NA | ||
| ), | ||
| # PASS TESTS | ||
| # Version can be recovered with testapi (>=6.1-3f) | ||
| ( | ||
| {presListener: read_data(dir, "presListener-Pos.json")}, | ||
| read_data(dir, "fabricNode.json"), | ||
| "6.1(3a)", | ||
| script.PASS, | ||
| ), | ||
| # FAIL_O TESTS | ||
| # Version can be recovered with testapi (>=6.1-3f) | ||
| ( | ||
| {presListener: read_data(dir, "presListener-Neg.json")}, | ||
| read_data(dir, "fabricNode.json"), | ||
| "6.1(3a)", | ||
| script.FAIL_O, | ||
| ), | ||
| ], | ||
| ) | ||
| def test_logic(run_check, mock_icurl, fabric_nodes, tversion, expected_result): | ||
| result = run_check( | ||
| fabric_nodes=fabric_nodes, | ||
| tversion=script.AciVersion(tversion) if tversion else None, | ||
| ) | ||
| assert result.result == expected_result |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
High: This full-class query runs before the target-version guards. Therefore a missing or unaffected target can become
ERRORif collection fails even though the result should beMANUALorN/A, and every run unnecessarily retrieves allpresListenerobjects. Move the guards before collection and use a server-side filter for the relevant class-4307/node entries. Please test thaticurlis not called for missing or unaffected targets.