VPC Pair 4.x Implementation#197

Open

sivakasi-cisco wants to merge 52 commits intoCiscoDevNet:developfrom

sivakasi-cisco:vpc_pair_4x_nd

Collaborator

sivakasi-cisco commented Mar 9, 2026 •

edited

Loading

vPC Pair support for ND 4.x

nd_manage_vpc_pair can create, update, delete, override, and gather vPC pairs.
The big module logic was split into focused helper files (query, validation, actions, deploy, etc.)
We added dedicated vPC Pair endpoints/models/schemas and connected them through the orchestrator + state machine flow.
Integration tests were added across all main scenarios (merge/replace/override/delete/gather).

Collaborator Author

sivakasi-cisco commented Mar 10, 2026

Continuation of sivakasi-cisco#1

sivakasi-cisco mentioned this pull request

VPC Pair 4.x Implementation sivakasi-cisco/ansible-nd#1

Open

sivakasi-cisco marked this pull request as ready for review

March 13, 2026 14:22

sivakasi-cisco requested review from akinross, anvitha-jain, gmicol, lhercot, sajagana, samiib and shrsr as code owners

March 13, 2026 14:22

mikewiebe reviewed

View reviewed changes

tests/integration/targets/nd_vpc_pair/tasks/base_tasks.yaml

mikewiebe reviewed

View reviewed changes

tests/integration/targets/nd_vpc_pair/tasks/main.yaml

mikewiebe reviewed

View reviewed changes

plugins/module_utils/models/manage_vpc_pair/vpc_pair_base.py

mikewiebe reviewed

View reviewed changes

plugins/module_utils/endpoints/v1/manage/vpc_pair_base_paths.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/module_utils/endpoints/v1/manage_vpc_pair/vpc_pair_endpoints.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/module_utils/endpoints/v1/manage/vpc_pair_base_paths.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/module_utils/manage_vpc_pair/enums.py

mikewiebe reviewed

View reviewed changes

plugins/module_utils/models/__init__.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/module_utils/orchestrators/nd_vpc_pair_orchestrator.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/modules/nd_manage_vpc_pair.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/modules/nd_manage_vpc_pair.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/modules/nd_manage_vpc_pair.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/modules/nd_manage_vpc_pair.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/modules/nd_manage_vpc_pair.py Outdated

mikewiebe reviewed

View reviewed changes

plugins/modules/nd_manage_vpc_pair.py

sivakasi-cisco changed the title ~~VPC Pair 4.x Implementation~~ [WIP] VPC Pair 4.x Implementation

sivakasi-cisco changed the title ~~[WIP] VPC Pair 4.x Implementation~~ VPC Pair 4.x Implementation

sivakasi-cisco force-pushed the vpc_pair_4x_nd branch 2 times, most recently from 47f5bb0 to ea2e89c Compare

March 25, 2026 17:56

mikewiebe reviewed

View reviewed changes

plugins/modules/nd_manage_vpc_pair.py Outdated

sivakasi-cisco added 23 commits

April 24, 2026 13:31


          Renaming api_timeout to vpc_put_timeout. setting up the query_timeout…

0a6cb41

… to 5s


          Modifying refresh_after_apply with an inversion of suppress_verification

aa6e2df


          Timer changes, pending variables changes

d46bc92


          getting sync status for deploy

48b1652


          Few sanity fixes and cleanups

aa1d6f7


          Fixing sanity failures

d86fb0a


          Addressing the review comments to\

84e328b

- resuse existing mixins without more duplicates\
- Adding type annotations to method signatures
- revisited the required imports and removed others


          Instead of re-exporting with __init__, it is made empty as per guidel…

ca90431

…ines


          Fixing sanity failures

c2f844c


          Fixture for Deploy skip issue

47a88e0


          Integ test changes for sanity and checks

013437d


          Added/addressed the list of items below

42225c7

 - run time inputs for verify instead of suppress_verification
 - verify_option/query timers changed as config_action with retries
 - config_action validation
 - config_save knob along with deploy
 - limited external fabric checks for gathered calls
 - explicit field comparison readded in merge
 - vpc_pair details check extended
 - sanity checks, UT additions


          Integ test changes

8dee386


          Missed files from changes of base branch

c3ddeb0


          Below changes are made as a part of the current commit\

7a9fc31

  1. Allowed overridden state with empty config to delete all vPC pairs
  2. Keep deleted state guard requiring explicit config
  3. Added empty string normalization in VpcPairDetailsDefault
  4. Integration test changes:
      - Probe fabric peering support
      - Used simple vpc_pair_details_delete_safe payload for stable delete-path tests
      - Add TC8 delete: reject empty config for state=deleted
      - Override TC4: verify empty-config purge-all deletes all pairs
  5. Added nd_info pattern for nd_vpc_pair integ test


          utils.py now handle calling fabric save and deploy

dba615f


          Final sanity fixes

f4fb418


          Refactor nd_manage_vpc_pair internals and remove legacy deploy parameter

24918b1


          Replacing old type hints to latest annotations

232b8a9


          Addressing review comments to reduce repetition of some methods and T…

00ce1ca

…ODO additions


          Integ test and related changes after removing deprecated deploy usage

85f1a39


          Adding pre-delay for deployment to reflect and hardened deployment re…

d655694

…lated comparison


          Using modern type annotations

331d602

# Conflicts:
#	plugins/module_utils/nd_state_machine.py
#	plugins/module_utils/orchestrators/base.py
#	plugins/module_utils/orchestrators/local_user.py
#	plugins/module_utils/orchestrators/manage_fabric_ebgp.py
#	plugins/module_utils/orchestrators/manage_fabric_external.py
#	plugins/module_utils/orchestrators/manage_fabric_ibgp.py

sivakasi-cisco force-pushed the vpc_pair_4x_nd branch from 2dd74c7 to 331d602 Compare

April 24, 2026 08:04


          Fixing the merge conflict to use rest_send sender module

54fd840

allenrobel requested changes

View reviewed changes

Collaborator

allenrobel left a comment

Sorry for being so nit-picky Sivakami. Added comments related to removing legacy Optional and Union.

plugins/action/tests/integration/nd_vpc_pair_validate.py Outdated

plugins/action/tests/integration/nd_vpc_pair_validate.py Outdated

plugins/action/tests/integration/nd_vpc_pair_validate.py Outdated

plugins/action/tests/integration/nd_vpc_pair_validate.py Outdated

plugins/action/tests/integration/nd_vpc_pair_validate.py Outdated

plugins/module_utils/models/manage_vpc_pair/vpc_pair_models.py Outdated

plugins/module_utils/models/manage_vpc_pair/vpc_pair_models.py Outdated

plugins/module_utils/models/manage_vpc_pair/vpc_pair_models.py Outdated

plugins/module_utils/models/manage_vpc_pair/vpc_pair_models.py Outdated

plugins/module_utils/models/manage_vpc_pair/vpc_pair_models.py Outdated

Collaborator Author

sivakasi-cisco commented Apr 27, 2026

Sorry for being so nit-picky Sivakami. Added comments related to removing legacy Optional and Union.

No Worries, Allen. Thank you for taking time. Shall make sure that I follow modern annotations


          Use modern type annotations

2aba62d

sivakasi-cisco requested a review from allenrobel

April 27, 2026 12:08

sivakasi-cisco commented

View reviewed changes

Collaborator Author

sivakasi-cisco left a comment

Addressed review comments

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

mikewiebe mikewiebe left review comments

akinross Awaiting requested review from akinross akinross is a code owner

anvitha-jain Awaiting requested review from anvitha-jain anvitha-jain is a code owner

gmicol Awaiting requested review from gmicol gmicol is a code owner

lhercot Awaiting requested review from lhercot lhercot is a code owner

sajagana Awaiting requested review from sajagana sajagana is a code owner

samiib Awaiting requested review from samiib samiib is a code owner

shrsr Awaiting requested review from shrsr shrsr is a code owner

mtarking Awaiting requested review from mtarking mtarking is a code owner

allenrobel Awaiting requested review from allenrobel allenrobel is a code owner

Requested changes must be addressed to merge this pull request.

Labels

None yet