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

Feat(eos_cli_config_gen): add cvsourceintf flag to TerminAttr #2620

Merged
merged 4 commits into from
Mar 16, 2023

Conversation

noredistribution
Copy link
Contributor

Change Summary

Add support for cvsourceintf (available since TerminAttr 1.23.0+) to replace cvsourceip (which is unique per device)

Related Issue(s)

Fixes #2619

Component(s) name

arista.avd.eos_cli_config_gen

Proposed changes

Added cvsourceintf to TerminAttr flags

How to test

daemon_terminattr:
   cvaddrs: # For single cluster
       - 192.0.2.100:9910
  cvauth:
     method: "token"
     key: "arista"
     token_file: "/tmp/token"
  cvvrf: MGMT
  ingestexclude: "/Sysdb/cell/1/agent,/Sysdb/cell/2/agent"
  smashexcludes: "ale,flexCounter,hardware,kni,pulse,strata"
  cvsourceintf: Loopback10

would result in

daemon TerminAttr
   exec /usr/bin/TerminAttr -cvaddr=192.0.2.100:9910 -cvauth=token,/tmp/token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs -cvsourceintf=Loopback10
   no shutdown

or multi-cluster streaming config:

daemon_terminattr:
  clusters: # For multiple cluster support
    dublin:
        cvaddrs:
        - 192.0.2.100:9910
        - 192.0.2.101:9910
        - 192.0.2.102:9910
        cvauth:
          method: "token"
          token_file: "/tmp/token"
        cvvrf: MGMT
        cvsourceintf: Loopback10
    cvaas:
        cvaddrs:
          - www.arista.io:443
        cvauth:
          method: "token-secure"
          token_file: "/tmp/prod"
        cvvrf: MGMT
        cvsourceintf: Vlan560
  ingestexclude: "/Sysdb/cell/1/agent,/Sysdb/cell/2/agent"
  smashexcludes: "ale,flexCounter,hardware,kni,pulse,strata"

would result in:

daemon TerminAttr
   exec /usr/bin/TerminAttr -cvopt cvaas.addr=www.arista.io:443 -cvopt cvaas.auth=token-secure,/tmp/prod -cvopt cvaas.vrf=MGMT -cvopt cvaas.sourceintf=Vlan560 -cvopt dublin.addr=192.0.2.100:9910,192.0.2.101:9910,192.0.2.102:9910 -cvopt dublin.auth=token,/tmp/token -cvopt dublin.vrf=MGMT -cvopt dublin.sourceintf=Loopback10 -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
   no shutdown

Checklist

User Checklist

  • N/A

Repository Checklist

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

@noredistribution noredistribution requested a review from a team as a code owner March 13, 2023 22:10
@github-actions github-actions bot added role: eos_cli_config_gen issue related to eos_cli_config_gen role role: eos_designs issue related to eos_designs role state: CI Updated CI scenario have been updated in the PR state: Documentation role Updated labels Mar 13, 2023
Copy link
Contributor

@ClausHolbechArista ClausHolbechArista left a comment

Choose a reason for hiding this comment

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

I see a lot of unrelated changes on this PR - most likely caused by missing libyaml support. Try ansible --verison and check for libyaml = True.

@github-actions github-actions bot removed the role: eos_designs issue related to eos_designs role label Mar 14, 2023
Copy link
Contributor

@gmuloc gmuloc left a comment

Choose a reason for hiding this comment

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

Only comment would be to test also in the cluster mode if possible to make sure what is rendered there is correct as well.

@noredistribution
Copy link
Contributor Author

Only comment would be to test also in the cluster mode if possible to make sure what is rendered there is correct as well.

sorry yea, wanted to push it last night but my AIO container was failing, just managed to do it now

@gmuloc gmuloc merged commit ec46c39 into aristanetworks:devel Mar 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rn: Feat(eos_cli_config_gen) role: eos_cli_config_gen issue related to eos_cli_config_gen role state: CI Updated CI scenario have been updated in the PR state: Documentation role Updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat(eos_cli_config_gen): add 'cvsourceintf' flag to daemon TerminAttr config
3 participants