Skip to content

Commit 6125641

Browse files
Dev-Sinha13lhercot
authored andcommitted
[ignore] Changed rfc5424-ts to rfc5424_ts
1 parent 3ccff39 commit 6125641

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

plugins/module_utils/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
vmware="VMware",
4848
)
4949

50-
SYSLOG_FORMATS = {"enhanced_log": "rfc5424-ts", "nxos": "nxos", "aci": "aci", "rfc5424-ts": "rfc5424-ts"}
50+
SYSLOG_FORMATS = {"enhanced_log": "rfc5424-ts", "nxos": "nxos", "aci": "aci", "rfc5424_ts": "rfc5424-ts"}
5151

5252
MATCH_TYPE_GROUP_MAPPING = {"all": "ALL", "all_in_pod": "ALL_IN_POD", "range": "range"}
5353

plugins/modules/aci_syslog_group.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,26 @@
4949
description:
5050
- Format of the syslog messages.
5151
- If unset during creation the value defaults to C(aci).
52-
- C(rfc5424-ts) is only available starting from ACI version 5.2(8).
53-
- C(enhanced_log) is only available starting from ACI version 6.0(9d) and is an alias to C(rfc5424-ts).
52+
- C(rfc5424_ts) is only available starting from ACI version 5.2(8).
53+
- C(enhanced_log) is only available starting from ACI version 6.0(9d) and is an alias to C(rfc5424_ts).
5454
type: str
55-
choices: [ aci, nxos, rfc5424-ts, enhanced_log ]
55+
choices: [ aci, nxos, rfc5424_ts, enhanced_log ]
5656
local_file_log_format:
5757
description:
5858
- The format of the local file log messages.
5959
- If unset during creation and O(format) is provided then it is set to the same value as format. If O(format) is not provided it is set to C(aci).
60-
- C(rfc5424-ts) is only available starting from ACI version 5.2(8).
61-
- C(enhanced_log) is only available starting from ACI version 6.0(9d) and is an alias to C(rfc5424-ts).
60+
- C(rfc5424_ts) is only available starting from ACI version 5.2(8).
61+
- C(enhanced_log) is only available starting from ACI version 6.0(9d) and is an alias to C(rfc5424_ts).
6262
type: str
63-
choices: [ aci, nxos, rfc5424-ts, enhanced_log ]
63+
choices: [ aci, nxos, rfc5424_ts, enhanced_log ]
6464
console_log_format:
6565
description:
6666
- Format of the console log messages.
6767
- If unset during creation and O(format) is provided then it is set to the same value as format. If O(format) is not provided it is set to C(aci).
68-
- The option C(rfc5424-ts) is only available in ACI version 5.2(8) or later.
69-
- The option C(enhanced_log) is only available in ACI version 6.0(9d) or later and is an alias to C(rfc5424-ts).
68+
- The option C(rfc5424_ts) is only available in ACI version 5.2(8) or later.
69+
- The option C(enhanced_log) is only available in ACI version 6.0(9d) or later and is an alias to C(rfc5424_ts).
7070
type: str
71-
choices: [ aci, nxos, rfc5424-ts, enhanced_log ]
71+
choices: [ aci, nxos, rfc5424_ts, enhanced_log ]
7272
include_ms:
7373
description:
7474
- Include milliseconds in log timestamps.
@@ -133,8 +133,8 @@
133133
local_file_log_severity: warnings
134134
console_logging: enabled
135135
console_log_severity: critical
136-
local_file_log_format: rfc5424-ts
137-
console_log_format: rfc5424-ts
136+
local_file_log_format: rfc5424_ts
137+
console_log_format: rfc5424_ts
138138
description: syslog group
139139
state: present
140140

tests/integration/targets/aci_syslog_group/tasks/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,19 +291,19 @@
291291
- name: Execute tasks only for non-cloud sites
292292
when: version.current.0.topSystem.attributes.version is version('6', '>=')
293293
block:
294-
# ADD syslog group with rfc5424-ts as format
294+
# ADD syslog group with rfc5424_ts as format
295295
- name: Add syslog new (version >= 6)
296296
cisco.aci.aci_syslog_group:
297297
<<: *aci_info
298298
name: ansible_syslog_new
299299
admin_state: enabled
300-
format: rfc5424-ts
300+
format: rfc5424_ts
301301
local_file_logging: enabled
302302
local_file_log_severity: warnings
303303
console_log_severity: critical
304304
console_logging: enabled
305-
local_file_log_format: rfc5424-ts
306-
console_log_format: rfc5424-ts
305+
local_file_log_format: rfc5424_ts
306+
console_log_format: rfc5424_ts
307307
description: Description for the syslog group
308308
state: present
309309
register: add_syslog_new_format
@@ -312,7 +312,7 @@
312312
ansible.builtin.set_fact:
313313
sorted_new: "{{ add_syslog_new_format.current[0].syslogGroup.children | map('dict2items') | sort(attribute='0.key') | map('items2dict') | list }}"
314314

315-
- name: Verify that the format rfc5424-ts is valid for syslog group and children
315+
- name: Verify that the format rfc5424_ts is valid for syslog group and children
316316
ansible.builtin.assert:
317317
that:
318318
- add_syslog_new_format is changed

0 commit comments

Comments
 (0)