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 options tagged and untagged phone to switchport phone trunk for ethernet interfaces #2832

Merged
merged 3 commits into from
May 19, 2023

Conversation

kmueller68
Copy link
Contributor

@kmueller68 kmueller68 commented May 15, 2023

Change Summary

From EOS 4.30.0F CLI offers two more options for switchport phone trunk:

nac-710p(config-if-Et2)#switchport phone trunk ?
  tagged    Configure the port to send tagged packets
  untagged  Configure the port to send untagged packets
nac-710p(config-if-Et2)#switchport phone trunk tagged ?
  phone  Tagged packets on phone VLAN
  <cr>
nac-710p(config-if-Et2)#switchport phone trunk untagged ?
  phone  Untagged packets on phone VLAN
  <cr>

Related Issue(s)

Fixes #2479

Component(s) name

arista.avd.eos_cli_config_gen

Proposed changes

# Switched Interfaces
ethernet_interfaces:
  <Ethernet_interface_2 >:
    phone:
      trunk: < tagged | tagged phone | untagged | untagged phone >

No changes in eos_cli_config_gen/templates/eos/ethernet-interfaces.j2necessary, since it just takes the pure string value.
Just an extention of the Schema.

How to test

I kept the existing molecule test unchanged.

  - name: Ethernet13
    logging:
      event:
        link_status: false
        congestion_drops: false
        spanning_tree: false
        storm_control: false
    description: interface_in_mode_access_with_voice
    type: switched
    native_vlan: 100
    mode: "trunk phone"
    phone:
      trunk: untagged
      vlan: 70

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)

@kmueller68 kmueller68 requested a review from a team as a code owner May 15, 2023 10:48
@kmueller68 kmueller68 closed this May 15, 2023
@github-actions github-actions bot added role: eos_cli_config_gen issue related to eos_cli_config_gen role state: Documentation role Updated labels May 15, 2023
@kmueller68 kmueller68 changed the title Feat(eos_cli_config_gen): add options tagged and untagged phone to et… Feat(eos_cli_config_gen): add options tagged and untagged phone to switchport phone trunk for ethernet interfaces May 15, 2023
@kmueller68 kmueller68 reopened this May 15, 2023
@ClausHolbechArista ClausHolbechArista requested a review from a team May 16, 2023 18:39
@chetryan
Copy link
Contributor

Ideally the eos_cli_config_gen molecule test should be update to have an example of each of the options. You can refer to the existing example here:

https://github.com/aristanetworks/ansible-avd/blob/58bacf3f7a8b0746221b1a24c87bc81777fe35c1/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml#LL278C22-L278C22

@github-actions github-actions bot added the state: CI Updated CI scenario have been updated in the PR label May 18, 2023
@kmueller68
Copy link
Contributor Author

@chetryan done... hope this meets your expectation.

Copy link
Contributor

@chetryan chetryan left a comment

Choose a reason for hiding this comment

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

LGTM!

@ClausHolbechArista ClausHolbechArista merged commit 0ecda00 into aristanetworks:devel May 19, 2023
35 checks passed
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 new option phone to switchport phone trunk for switched interfaces
3 participants