Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Macsec profile deploy on peer VM's and DUT for macsec topo pipeline. #16048

Merged
merged 21 commits into from
Feb 8, 2025

Conversation

judyjoseph
Copy link
Contributor

@judyjoseph judyjoseph commented Dec 12, 2024

Approach

What is the motivation for this PR?

To run the macsec pipeline, the peer VM's and the local DUT should have the macsec config. These changes addresses those

Need to run the add-topo and deploy-mg with the options " -e enable_macsec=True -e macsec_profile=MACSEC_PROFILE"

How did you do it?

Following are the changes in this PR:

  1. Update config_sonic_basedon_testbed.yml with steps to generate the golden_config_db with macsec profile passed as input to deploy_mg
  2. Update the script ansible/library/generate_golden_config_db.py to create the golden_config_db for t2
  3. Update ansible/roles/eos/tasks/ceos_config.yml to create the macsec profile in the peer ceos VM
  4. Update the j2 template ceos config file ansible/roles/eos/templates/t2-core.j2 with macsec configuration.
  5. The t2 golden config db template file -- ansible/templates/golden_config_db_t2.j2

How did you verify/test it?

Verified the following commands work fine and macsec sessions comes up after deploy minigraph.

./testbed-cli.sh add-topo vmsvc3-t2-xxx-1 strsvc ../password.txt -e ceos_image_filename=xxx -e ceos_image=xxx -e ceos_image_orig=xxx -e ceosimage_saskey=xxx -e enable_macsec=True -e macsec_profile=MACSEC_PROFILE 


./testbed-cli.sh -t testbed.yaml deploy-mg vmsvc3-t2-xxx-1 strsvc ../password.txt -e enable_macsec=True -e macsec_profile=MACSEC_PROFILE 

Any platform specific information?

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

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@judyjoseph
Copy link
Contributor Author

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@liamkearney-msft
Copy link
Contributor

lgtm - can you also make sure to test with macsec not configured, to make sure that MG deploy works with non-macsec t2 topos.
thanks!

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@judyjoseph
Copy link
Contributor Author

lgtm - can you also make sure to test with macsec not configured, to make sure that MG deploy works with non-macsec t2 topos. thanks!

tried it looks good

@judyjoseph
Copy link
Contributor Author

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

…etup in add-topo/deploy-mg"

This reverts commit 548e6d6.
@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

arlakshm
arlakshm previously approved these changes Feb 5, 2025
Copy link
Contributor

@arlakshm arlakshm left a comment

Choose a reason for hiding this comment

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

lgtm. some comment for future enhancements

ansible/templates/golden_config_db_t2.j2 Show resolved Hide resolved
@mssonicbld
Copy link
Collaborator

/azp run

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@judyjoseph judyjoseph requested a review from arlakshm February 6, 2025 08:36
@judyjoseph judyjoseph enabled auto-merge (squash) February 7, 2025 05:31
Copy link
Contributor

@abdosi abdosi left a comment

Choose a reason for hiding this comment

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

lgtm. we need to handle in single asic LC in another PR

@judyjoseph judyjoseph merged commit a77531c into sonic-net:master Feb 8, 2025
17 checks passed
@judyjoseph
Copy link
Contributor Author

lgtm. we need to handle in single asic LC in another PR

@abdosi I did update the PR earlier : can you check this commit : baecdc2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants