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

Sync the 2.x branch to main (using the sync_0816_2 branch off of the 2.x branch) target 2.x #439

Merged
merged 242 commits into from
Aug 19, 2024

Conversation

kerry-meyer
Copy link
Collaborator

SUMMARY

Sync the 2.x branch to pull in all current content of the "main" branch before the start of 3.x breaking changes.

GitHub Issues

List the GitHub issues impacted by this PR. If no Github issues are affected, please indicate this with "N/A".

GitHub Issue #
N/A
ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

2.x

OUTPUT

N/A

ADDITIONAL INFORMATION

This sync is being done in preparation for merging "breaking" changes into the "main" branch to prepare for the 3.0.0 release. This will provide a fully updated 2.x throttle branch on which future 2.x releases (after 2.5.0) can be based.

Checklist:
  • I have performed a self-review of my own code to ensure there are no formatting, linting, or security issues
  • I have verified that new and existing unit tests pass locally with my changes
  • I have not allowed coverage numbers to degenerate
  • I have maintained at least 90% code coverage
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • I have maintained backward compatibility or have provided any relevant "breaking_changes" descriptions in a "fragment" file in the "changelogs/fragments" directory of this repository.
  • I have provided a summary for this PR in valid "fragment" file format in the "changelogs/fragments" directory of this repository branch. Reference : Ansible Change Log Document
How Has This Been Tested?

Recent "main" branch regression testing is sufficient for verifying this functionality.

kerry-meyer and others added 30 commits September 3, 2022 10:32
* Moved CHANGELOG.rst to meet redhat certification requirements

* Updated changelog path

Co-authored-by: Shade Talabi <[email protected]>
I'm adding an "ignore-2.15.txt" file to the "tests/sanity" directory to allow passing Ansible sanity tests on the new Ansible core 2.15 branch.
* Add SONIC logging ansible module

* Change as resource model changed

* Correct typo in model example

* Address review comments
#120)

* Adding template for CODEOWNERS for DellEmc Enterprise SONiC ansible collections

* Updated review comments

Signed-off-by: kannankvs <[email protected]>

* updated the review comments

Signed-off-by: kannankvs <[email protected]>

Signed-off-by: kannankvs <[email protected]>
* Add PREFER attribute to NTP module

* Add more regression test cases
…ONiC images (#124)

* Allow use of the OC Yang compliant vlan range delimiter ".." in new SONiC images

The l2_interface "facts" facility previously accepted only the "-" character/string
as a vlan "range" delimiter for specifying allowed trunking vlans to be configured
on an interface. Recent SONiC images have modified the implementation to use the
OC Yang compliant ".." string instead. (e.g. The range previously specified as
"5-7" is now specified as "5..7".)

This change set provides a modified, backward compatible implementation for
l2_interface "facts" gathering by allowing and handling either of these
options for the vlan trunking allowed range string delimiter.

* Fix Ansible sanity errors.
The Ansible core team has announced that the Ansible core "2.14" version is stable and should be added to collection workflow test matrices.

This PR is to add it to the Dell enterprise_sonic test matrix.
…ttributes (#130)

* Removed the vxlan co-req restriction for the evpn_nvo and source_ip attribute

* Corrected misnaming

Co-authored-by: Shade Talabi <[email protected]>
* Make NTP minpoll and maxpoll config together

* Change as models changed
* Added docs folder and a commiters guide file within the folder

Signed-off-by: kannankvs <[email protected]>

* updated file permission

Signed-off-by: kannankvs <[email protected]>

* Updated comments as suggested

Signed-off-by: kannankvs <[email protected]>

* addressed errors

Signed-off-by: kannankvs <[email protected]>

Signed-off-by: kannankvs <[email protected]>
* Adding templates for Issue section

Signed-off-by: kannankvs <[email protected]>

* addressed review comments

* Addressed comments in .yml file as suggested

Signed-off-by: kannankvs <[email protected]>

* addressed errors

Signed-off-by: kannankvs <[email protected]>

* Updated review comments

Signed-off-by: kannankvs <[email protected]>

* Addressed comments

Signed-off-by: kannankvs <[email protected]>

Signed-off-by: kannankvs <[email protected]>
* Add interface speed and more attributes

* Address review comments

* More changes

* Address review commit

* Address review comments

* Fix sanity error

* Address review comments

* Add get default interface speed
* Provided workaround for SONiC mgmt vrf bug

* Addressed review comments

Co-authored-by: Shade Talabi <[email protected]>
* Add Enterprise SONiC "dhcp_relay" resource module

* Update sonic_dhcp_relay.py

* Update delete all handling

* Address review comments
* Provide playbook support for vlan trunk ranges in the SONiC l2_interfaces resource module:

- Change the argspec to use a string instead of an integer when specifying a vlan or
a vlan range.
- Add handling to support a "vlan" argument that specifies a vlan range in the form "X-Y".
- provide correct tracking of commands sent to the device after eliminating requested
configuration that is already present on the device.
- Fix bugs causing incorrect reporting of the original playbook command "invocation" and
the final set of commands sent to the device.
- Add regression test cases to cover the possible overlap conditions between trunk vlans
and ranges configured on the device and requested additions or deletions of trunk vlans
and ranges.

* Fix Ansible sanity errors for automatic string format field numbering.

* Fix remaining sanity errors.

* Updated the description of the trunk "vlan" argument to incorporate a vlan range

* Modified trunk vlan argument descriptions, added vlan trunk range examples

* Fix "trailing whitespace" sanity errors.
* Added BGP rd and rt attributes

* Addressed review comments

* Fixed sanity error

* Fixed sanity error

* Fixed sanity error

* Addressed review comments

* Removed extra bgp

Co-authored-by: Shade Talabi <[email protected]>
* Add replaced and overridden states to logging module

* Move send_requests to utils.py

* Fix sanity issue

* To trigger sanity check
* Add replaced and overridden to System module

* Move some lines
* Add port group module

* Change TEST_KEYS
* Add IP neighbor global configuration Ansible module

* Remove not-neccessary TEST_KEYS
* Fixed sanity check error

* Fixed sanity check errors

* Fixed sanity check errors

---------

Co-authored-by: Shade Talabi <[email protected]>
* Support template under docs folder

This PR has been raised, as the original [PR#143](#143) was closed due to deletion of head repository

* updated review comments

updated review comments
…172)

* Fix sanity errors caused by deletion of Ansible Netcommon utility functions.

Ansible recently merged changes in the Ansible Netcommon repo that eliminated the
source functions for several utilities imported into modules in the enterprise_sonic
collection. The affected utility functions are available in the ansible/ansible
(library) repo and have been there since the earliest Ansible core version
that is currently supported. Because of this, the source of the imports
can be changed in the enterprise_sonic collection without introducing any
downward compatibility problems.

* Deleted an unintentional extra line from the change set.
stalabi1 and others added 24 commits June 26, 2024 15:00
* Update check for empty dict.

* Update check if 'config' key is missing from GET result.

* Add check to see if interface has name entry.

* Add changelog for PR.

---------

Co-authored-by: Taavi Ansper <[email protected]>
…nd model files (#413)

* sonic_route_maps: Add 'set tag' functionality and sync argpec/module/model files.

* Add support for the 'set tag' option and synchronize module documentation with argpec and model

* Attempt to fix YAML parsing errors for a mult-line "mutually exclusive" block.

* Attempt to fix YAML parsing errors for a nested "mutually exclusive" list.

* Delete the nested "mutually exclusive" list for BGP communities to eliminate YAML parsing errors.

* Delete all verbatim copies of argspec syntax that cause YAML parsing errrors in a 'module' file.

* Trivial 'module' file change (delete a '.') to trigger a sanity re-run.

* Adding quotes around string list items containing dashes.

* Adding quotes around almost all string list items containing dashes.

* Add missing 'type' for 'set tag', change 'set metric' option keyword back to 'suboptions'.

* Add "set tag" to all applicable EXAMPLE cases.

* Update changelogs/fragments/413-route-maps-set-tag-support-and-doc-updates.yaml

Add a space between the fragment description and the parenthesized URL.

Co-authored-by: stalabi1 <[email protected]>

---------

Co-authored-by: stalabi1 <[email protected]>
* ansible support for versatile hashing feature

* undo changes

* add changelog

* address comments

* remove debug lines

* address more comments

* remove the empty fields

* fix sanity error

* remove a special character
* Add support for replaced and overriddent - bgp_neighbors

* UT changes and handling deleted cases

* Updating examples

* Create 335-replaced-overridden-for-bgp-neighbors-module.yaml

* fixing sanity error

* Changing replaced logic

* Addressing review comments

* Addressing default passive and neighbor delete case

* Addressing review comment

* Addressing replaced state, UT coverage and module examples

* Addressing check_mode changes

* Refactoring overridden and replaced and check_mode

* Addressing replaced and default options
* Add vrrp module

* UT fix

* Adding after(generated) in documentation

* Changing replaced logic

* Addressing review changes

* Addressing replaced review comment

* Addressing check mode changes

* Addressing replace corner cases and check_mode

* Handling replace bug and overridden refactoring

* Refactoring delete cases

* Sanity fix

* Addressing replaced and overridden default cases

* Adding commands for deleted

* Addressing refactoring comments

* Addressing interface normalize

* Minor changes

* Addressing minor review comment

* Update main.yml

---------

Co-authored-by: Santhoshkumar T <T, Santhosh Kumar>
* Add Dell Enterprise SONiC 'ospfv2' module

* Handling default address in passive_interfaces

* Addressing review comments and graceful_restart handling

* Addressing review comments and updating addresses attribute

* Addressing review

* Addressing review changes and updating examples

* Addressing merged state review comment

* Update main.yml

* changing version_added
* Fix GitHub issue#416

* Add fragment file
* Update ut bgp_neighbors

* Adding changelog

* Adding trivial in changelog
* Add support for BGP Asn Notation

* Add changelog for BGP asn notation

* Fix sanity tests

* Rename Bgp asn conversion funcs to convert_xxx()

* Clarify supported Bgp asn notation releases and class method names.
* Add mgmt servers module

* Update UT

* Add missing notes to documentation

* Address review comments

* Update delete test case to increase code coverage

* Update plugins/modules/sonic_mgmt_servers.py

Co-authored-by: Kerry Meyer <[email protected]>

---------

Co-authored-by: Kerry Meyer <[email protected]>
* OSPFv2_interfaces - Add Enterprise SONiC resource module

* Addressing review changes

* Sanity fix

* Correcting address description

* Normalize interface name

* Update main.yml

* Addressing review comments

* Addressing internal review

* Minor changes

Co-authored-by: Arun Saravanan Balachandran <[email protected]>

* Addressing ut

* Addressed bfd alone cases

* Removing after in check_mode

* Adding UT coverage

---------

Co-authored-by: Arun Saravanan Balachandran <[email protected]>
* ospf area resource module initial merged and deleted states

* ospf replaced and overidden states, bugfixes to implementation

* implement handling ospf area's network settings, bug fixes to overridden

* unit tests and fixes

* bug fixes to unit tests

* fixes to processing keys

* initial regression test implementation

* custom check mode handler for area

* regression test fixes

* bug fix failed tests

* add test to regression

* Apply suggestions for comments and null protection

Co-authored-by: Kerry Meyer <[email protected]>

* sanity test fixes

* review feedback

* Apply suggestions from code review

Co-authored-by: Kerry Meyer <[email protected]>

* bug fix deletions not clearing all data

* review feedback

* review feedback and sanity test fix

* fix unit test formatting error

---------

Co-authored-by: Kerry Meyer <[email protected]>
* Add evpn ethernet-segment support for LAG interface

* Address sanity error

* Sanity error

* Sanity error

* Sanity error

* Sanity error

* Sanity error

* Add missing unit test cases

* Address some review comments

* Address more review comments

* Address review comments

* Address review comments

* Address review comments

* Fix sanity errors

* Add unit test cases

* Add more regression test cases

* Fix sanity error

* Fix sanity error

* Address more review comments

* Fix other code sanity error
* Auditd feature support.
Configure audit rules.

* Add changelog and module.

* Add NONE as auditd rules type.:w

* Add testcase to cover audit rules type

* Fix sanity errors.

* Fix format errors.

* Fix formatting

* Update plugins/module_utils/network/sonic/config/system/system.py

Replace the accidentally overwritten "append" for the "load_share_hash_algo" request.

* Update hostname in the script, replacing "_" with "-".
As "_" is not allowed.

---------

Co-authored-by: Kerry Meyer <[email protected]>
…guration (#428)

* Fix l3_interfaces regression failures due to IPv6 default "dad" configuration

* Add a changelog fragment and fix sanity errors.

* Remove quotes in the changelog fragment.

* Remove an invalid colon from the fragment text.
* l3_interfaces - Fix replaced state handling

* Remove unused arguments
* Update documentation and requirements files to prepare for the 2.5.0 release

* Provide updated release note information for the enterprise_sonic 2.5.0 Ansible release

* Add a fragment file for the release note update, fix fragment formatting

* Post an updated 2.5.0 release note to include the final release note updates

* Exclude documentation PRs from the changelog check.
…hangelogs and new module information. (#434)

* Documentation and pylint 2.7 fixes for the 2.5.0 release.

* Add a changelog fragment.

* Corrected the PR number for the changelog fragment

* Add a period to the end of the fragment file.
Copy link
Collaborator

@mingjunzhang2019 mingjunzhang2019 left a comment

Choose a reason for hiding this comment

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

Checked this PR and earlier PR#435, 436, 437 and 438. Look good!

@kerry-meyer kerry-meyer merged commit 11f5ad8 into 2.x Aug 19, 2024
45 checks passed
@kerry-meyer kerry-meyer deleted the 2.x_sync_0816_2 branch August 19, 2024 18:59
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.