Skip to content

[GCU] [MA] Adding support in existing tests ACL#15188

Merged
judyjoseph merged 12 commits intosonic-net:masterfrom
okaravasi:master-gcu_t2_support_cacl
Apr 28, 2025
Merged

[GCU] [MA] Adding support in existing tests ACL#15188
judyjoseph merged 12 commits intosonic-net:masterfrom
okaravasi:master-gcu_t2_support_cacl

Conversation

@okaravasi
Copy link
Contributor

@okaravasi okaravasi commented Oct 25, 2024

Description of PR

This PR adds changes for adding Multi-ASIC support for generic config updater (GCU) in existing ACL suites.
Original ticket that got splitted: #14070
This change has a dependency on common changes added via #15182

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • [X ] Test case(new/improvement)

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • [ X] 202405

Approach

What is the motivation for this PR?

To add support for Multi-ASIC testing in existing GCU suite generic_config_updater/test_cacl.py.

How did you do it?

How did you verify/test it?

Ran in vs-kvm-t0 testbed.
image

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@okaravasi okaravasi marked this pull request as ready for review October 25, 2024 16:03
@okaravasi
Copy link
Contributor Author

@xincunli-sonic Could you please review?

@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Failed
- hook id: check-ast
- exit code: 1

tests/generic_config_updater/test_cacl.py: failed parsing with CPython 3.10.12:

Traceback (most recent call last):
File "/home/AzDevOps/.cache/pre-commit/repo1liwwghj/py_env-python3/lib/python3.10/site-packages/pre_commit_hooks/check_ast.py", line 21, in main
ast.parse(f.read(), filename=filename)
File "/usr/lib/python3.10/ast.py", line 50, in parse
return compile(source, filename, mode, flags,
File "tests/generic_config_updater/test_cacl.py", line 783
<<<<<<< HEAD
IndentationError: expected an indented block after 'if' statement on line 782

flake8...................................................................Failed
...
[truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@xincunli-sonic
Copy link
Contributor

This PR could be dup with #14098, please double check. Thanks!

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Pull request contains merge conflicts.

@okaravasi okaravasi marked this pull request as draft February 14, 2025 18:01
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@okaravasi okaravasi marked this pull request as ready for review February 19, 2025 18:54
Copy link
Contributor

@xincunli-sonic xincunli-sonic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@judyjoseph
Copy link
Contributor

@okaravasi could you resovle conflicts

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@judyjoseph judyjoseph merged commit f257444 into sonic-net:master Apr 28, 2025
13 checks passed
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
Signed-off-by: Aharon Malkin <amalkin@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants