Skip to content

Add missing t1-64 EOS templates and enable test topology mark#22695

Open
mattkim25 wants to merge 1 commit intosonic-net:masterfrom
mattkim25:missing_files_for_topo_t1-64
Open

Add missing t1-64 EOS templates and enable test topology mark#22695
mattkim25 wants to merge 1 commit intosonic-net:masterfrom
mattkim25:missing_files_for_topo_t1-64

Conversation

@mattkim25
Copy link

Description of PR

Summary:

This PR fixes t1-64 topology bring-up issues in sonic-mgmt by addressing three problems:

  1. Fixes typo in ansible/vars/topo_t1-64.yml:

    • bp_interfaces -> bp_interface
    • This matches template usage in EOS config generation and prevents key lookup/runtime failures during add-topo.
  2. Adds missing EOS templates for t1-64 by using symlinks:

    • ansible/roles/eos/templates/t1-64-spine.j2 -> t1-lag-spine.j2
    • ansible/roles/eos/templates/t1-64-tor.j2 -> t1-64-lag-tor.j2
  3. Enables COPP test execution on t1-64 by adding t1-64 to topology allowlists in:

    • tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

Fixes Issues:

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Approach

What is the motivation for this PR?

testbed_add_vm_topology on t1-64 failed due to:

  • invalid config key (bp_interfaces)
  • missing EOS template names for t1-64 role resolution

Additionally, COPP conditional marks did not include t1-64, causing unnecessary skips for that topology.

How did you do it?

  • Corrected bp_interfaces to bp_interface in ansible/vars/topo_t1-64.yml.
  • Added EOS template symlinks:
    • t1-64-spine.j2 -> t1-lag-spine.j2
    • t1-64-tor.j2 -> t1-64-lag-tor.j2
  • Updated COPP conditional mark allowlists to include t1-64 in:
    • tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

How did you verify/test it?

I ran t1 sonic-mgmt tests using the t1-64 topology.

Any platform specific information?

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

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Add missing EOS startup-config template entries for t1-64 by introducing
`t1-64-spine.j2` and `t1-64-tor.j2` in `ansible/roles/eos/templates`

Also update `tests_mark_conditions.yaml` to include `t1-64` as a valid
test topoloy.

Signed-off-by: Matthew Kim <mkim@upscaleai.com>
@mattkim25 mattkim25 force-pushed the missing_files_for_topo_t1-64 branch from 477e3c5 to d9d944c Compare March 3, 2026 01:15
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

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.

2 participants