Skip to content

Commit

Permalink
Merge branch 'ansible-collections:main' into ip_neighbor
Browse files Browse the repository at this point in the history
  • Loading branch information
stalabi1 authored Sep 30, 2024
2 parents bc67701 + 9c46aa7 commit a0bbd9c
Show file tree
Hide file tree
Showing 42 changed files with 1,528 additions and 956 deletions.
128 changes: 64 additions & 64 deletions README.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions changelogs/fragments/423-syslog-over-TLS.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- sonic_logging - Add TLS protocol in sonic_logging module(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/423)
2 changes: 2 additions & 0 deletions changelogs/fragments/424-remote-audit-log.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- sonic_logging - Add audit message-type in sonic_logging module(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/424)
5 changes: 5 additions & 0 deletions changelogs/fragments/440-bgp-aann-support-merged-fix.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
breaking_changes:
- sonic_bgp_communities - Change 'aann' option as a suboption of 'members' and update its type from string to list of strings (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/440).
bugfixes:
- sonic_bgp_communities - Fix issues in merged state for standard community-lists (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/440).
3 changes: 3 additions & 0 deletions changelogs/fragments/446-README-documentation-links-fix.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
trivial:
- README - Update all links to module documentation to use the new Ansible documentation web site on the galaxy.ansible.com domain(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/446).
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- sonic_interfaces - add new unreliable-los option to interface resource module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/453)
4 changes: 4 additions & 0 deletions changelogs/fragments/455-fix-vrrp-regression-failure.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
bugfixes:
- sonic_vrrp - Update delete handling to fix regression failure (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/455).
- Update 'update_url' method to handle multiple interface names (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/455).
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
trivial:
- tests - Skip Ansible 2.19 checking for a module correspnding to the sonic.py action plugin to avoid invalid sanity failures (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/456).
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,37 @@ class Bgp_communitiesArgs(object): # pylint: disable=R0903
def __init__(self, **kwargs):
pass

argument_spec = {'config': {'elements': 'dict',
'options': {'aann': {'type': 'str'},
'local_as': {'type': 'bool'},
'match': {'choices': ['ALL', 'ANY'],
'default': 'ANY',
'type': 'str'},
'members': {'options': {'regex': {'elements': 'str',
'type': 'list'}},
'type': 'dict'},
'name': {'required': True, 'type': 'str'},
'no_advertise': {'type': 'bool'},
'no_export': {'type': 'bool'},
'no_peer': {'type': 'bool'},
'permit': {'type': 'bool'},
'type': {'choices': ['standard', 'expanded'],
'default': 'standard',
'type': 'str'}},
'type': 'list'},
'state': {'choices': ['merged', 'deleted', 'replaced', 'overridden'],
'default': 'merged',
'type': 'str'}} # pylint: disable=C0301
argument_spec = {
"config": {
"elements": "dict",
"options": {
"local_as": {"type": "bool"},
"match": {
"choices": ["ALL", "ANY"],
"type": "str"
},
"members": {
"options": {
"aann": {"elements": "str", "type": "list"},
"regex": {"elements": "str", "type": "list"}
},
"type": "dict"
},
"name": {"required": True, "type": "str"},
"no_advertise": {"type": "bool"},
"no_export": {"type": "bool"},
"no_peer": {"type": "bool"},
"permit": {"type": "bool"},
"type": {
"choices": ["standard", "expanded"],
"type": "str"
}
},
"type": "list"
},
"state": {
"choices": ["merged", "deleted", "replaced", "overridden"],
"default": "merged",
"type": "str"
}
} # pylint: disable=C0301
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ def __init__(self, **kwargs):
"FEC_FC",
"FEC_DISABLED",
"FEC_DEFAULT",
"FEC_AUTO"]}
"FEC_AUTO"]},
"unreliable_los": {"type": "str",
"choices": ["UNRELIABLE_LOS_MODE_ON",
"UNRELIABLE_LOS_MODE_OFF",
"UNRELIABLE_LOS_MODE_AUTO"]}
},
"type": "list"
},
Expand Down
4 changes: 2 additions & 2 deletions plugins/module_utils/network/sonic/argspec/logging/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ def __init__(self, **kwargs):
'options': {
'host': {'required': True,
'type': 'str'},
'message_type': {'choices': ['log', 'event'],
'message_type': {'choices': ['log', 'event', 'audit'],
'type': 'str'},
'remote_port': {'type': 'int'},
'source_interface': {'type': 'str'},
'vrf': {'type': 'str'},
'protocol': {'choices': ['TCP', 'UDP'],
'protocol': {'choices': ['TCP', 'UDP', 'TLS'],
'type': 'str'},
},
'type': 'list'
Expand Down
Loading

0 comments on commit a0bbd9c

Please sign in to comment.