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

Fix(eos_config_deploy_cvp): Avoid duplicate AVD configlet #3124

Conversation

ClausHolbechArista
Copy link
Contributor

Change Summary

Avoid duplicate AVD configlet

Related Issue(s)

Fixes #3107

Component(s) name

arista.avd.eos_config_deploy_cvp

Proposed changes

In case a user gives:

cv_configlets:
  devices:
    device1:
      - AVD_device1
      - another_device1_configlet (this is a side configlet already existing in CVP)

Previously the generated assigned configlets would be:

"CVP_VARS":
  "CVP_CONTAINERS": {...}
  "CVP_DEVICES":
     ...
     - "configlets":
       - "AVD_device1"
       - "another_device1_configlet"
       - "AVD_device1"
      "fqdn": "device1"
      "parentContainerName": "XXX"

With this fix the role will avoid adding the generated configlet, if it is already in the list of configlets:

"CVP_VARS":
  "CVP_CONTAINERS": {...}
  "CVP_DEVICES":
     ...
     - "configlets":
       - "AVD_device1"
       - "another_device1_configlet"
      "fqdn": "device1"
      "parentContainerName": "XXX"

How to test

Tested manually.

Checklist

User Checklist

  • N/A

Repository Checklist

  • My code has been rebased from devel before I start
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and documentation have been updated accordingly.
  • I have updated molecule CI testing accordingly. (check the box if not applicable)

@github-actions github-actions bot added the role: eos_config_deploy_cvp issue related to eos_config_deploy_cvp role label Sep 7, 2023
@ClausHolbechArista
Copy link
Contributor Author

@alexeygorbunov could you please test this PR?

Copy link
Contributor

@sugetha24 sugetha24 left a comment

Choose a reason for hiding this comment

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

checked manually!

Copy link
Contributor

@alexeygorbunov alexeygorbunov left a comment

Choose a reason for hiding this comment

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

Hey Claus!
Tested manually - everything worked correctly!

Copy link
Contributor

@JulioPDX JulioPDX left a comment

Choose a reason for hiding this comment

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

LGTM

@JulioPDX JulioPDX merged commit a812d92 into aristanetworks:devel Sep 19, 2023
34 checks passed
@ClausHolbechArista ClausHolbechArista added the cherry-pick-for-3.8.x PR to be cherry-picked to releases/v3.8.x brach later label Sep 25, 2023
@carlbuchmann carlbuchmann removed the cherry-pick-for-3.8.x PR to be cherry-picked to releases/v3.8.x brach later label Sep 26, 2023
ClausHolbechArista added a commit that referenced this pull request Sep 26, 2023
)

Co-authored-by: Claus Holbech <holbech@arista.com>
Co-authored-by: Guillaume Mulocher <gmulocher@arista.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rn: Fix(eos_config_deploy_cvp) role: eos_config_deploy_cvp issue related to eos_config_deploy_cvp role
Projects
None yet
5 participants