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

Enhancement in Catalyst Center logging and intent modules #149

Merged
merged 130 commits into from
Feb 5, 2024
Merged
Changes from 4 commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
a095d6f
Merge pull request #3 from madhansansel/main
rukapse Jan 23, 2024
f2494e0
Added dnac_log_file_path and dnac_logs_append paramter to dnac.py
rukapse Jan 24, 2024
75c6999
Merge pull request #4 from madhansansel/main
rukapse Jan 24, 2024
f9c99d9
latest changes
rukapse Jan 24, 2024
46ac3a1
dnac_log_file_path and dnac_logs_apped parameters added to dnac.py
rukapse Jan 24, 2024
4632e34
Merge pull request #5 from rukapse/dev
rukapse Jan 24, 2024
3b1be6e
sanity test bug fixes
rukapse Jan 24, 2024
e9025d9
sanity test bug fixes
rukapse Jan 24, 2024
eb9bf08
sanity test bug fixes
rukapse Jan 24, 2024
aff02c6
bug fix for older versions
rukapse Jan 25, 2024
d5589a9
bug fix for older versions
rukapse Jan 25, 2024
e8b0656
bug fix for older versions
rukapse Jan 25, 2024
f248515
Merge pull request #6 from madhansansel/main
rukapse Jan 26, 2024
b244e62
bug fix for when dnac_log_level not specified in the playbook
rukapse Jan 26, 2024
d122027
Merge pull request #7 from rukapse/dev
rukapse Jan 26, 2024
91b2c5b
bug fix for when dnac_log_level not specified in the playbook
rukapse Jan 26, 2024
f27c018
Bug fix for modules that dont support dnac_log_level parameter
rukapse Jan 26, 2024
1abb44a
Merge pull request #112 from rukapse/dev
madhansansel Jan 26, 2024
eff6fbf
update any interface details with it's name and device ip, added back…
Abhishek-121 Jan 26, 2024
7780d50
removed unused log import
Abhishek-121 Jan 26, 2024
6c65c5f
Add log level severity in inventory, site and swim module as per codi…
Abhishek-121 Jan 26, 2024
c7783ba
Merge pull request #8 from madhansansel/main
rukapse Jan 26, 2024
1b33b4a
Merge pull request #113 from Abhishek-121/main
madhansansel Jan 27, 2024
deb9edc
add log messages with severity level and more readable for site, swim…
Abhishek-121 Jan 28, 2024
c6ff69c
Merge pull request #114 from Abhishek-121/main
madhansansel Jan 28, 2024
792d703
Merge pull request #115 from cisco-en-programmability/main
madhansansel Jan 28, 2024
0c630e4
Merge pull request #9 from madhansansel/main
rukapse Jan 28, 2024
8ae2f10
Optimized code to not perform validation of paramters at every self.log
rukapse Jan 29, 2024
ba8b667
Optimized code to not perform validation of paramters at every self.log
rukapse Jan 29, 2024
0d4ba4c
Merge pull request #10 from rukapse/dev
rukapse Jan 29, 2024
bd54506
Optimized code to not perform validation of paramters at every self.log
rukapse Jan 29, 2024
ca938a6
Merge pull request #11 from rukapse/dev
rukapse Jan 29, 2024
9b8050b
Optimized code to not perform validation of paramters at every self.log
rukapse Jan 29, 2024
e49c276
Merge pull request #12 from rukapse/dev
rukapse Jan 29, 2024
8b82090
Sanity test bug fix
rukapse Jan 29, 2024
5974e43
Fixed sanity test bugs
rukapse Jan 29, 2024
721e708
Sanity test bug fixes
rukapse Jan 29, 2024
32c7c71
Added the documetation for dnac_log_level to the doc_fragments/intetn…
Jan 29, 2024
6aa1a52
Added the documentation for the dnac_log_level in intent_params.py
Jan 29, 2024
bff8250
Restored the plugins/doc_fragments/intent_params.py
Jan 29, 2024
f96894c
address swim issue of giving default device role, error while untaggi…
Abhishek-121 Jan 29, 2024
06c40ec
Merge pull request #118 from Abhishek-121/main
madhansansel Jan 29, 2024
40f7257
Merge pull request #13 from madhansansel/main
rukapse Jan 29, 2024
8f9c033
Reverted to old logging mechanism
rukapse Jan 30, 2024
d576fde
Adding DNAC log levels for Discovery and PnP
Jan 30, 2024
6e5ab2b
Adding DNAC log levels for Discovery and PnP
Jan 30, 2024
1b85d6d
Handle the case of dump interface name while updating the interface d…
Abhishek-121 Jan 30, 2024
053c75c
Merge pull request #120 from Abhishek-121/main
madhansansel Jan 30, 2024
e0ea781
update keyword in examples for device_updated in inventory module
Abhishek-121 Jan 30, 2024
7bc0b0e
Adding DNAC log levels for Discovery and PnP
Jan 30, 2024
6e22326
Merge pull request #121 from Abhishek-121/main
madhansansel Jan 30, 2024
509fb77
Merge pull request #119 from abimishr/PNP_Code_Abinash
madhansansel Jan 30, 2024
66fdc60
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Jan 30, 2024
621a8a0
Added the dnac_log_level and config_verify in the documentation and e…
Jan 30, 2024
3feaf45
Merge pull request #122 from MUTHU-RAKESH-27/main
madhansansel Jan 30, 2024
c6481bd
Added the dnac_log_level documentation in the intent_params.py
Jan 30, 2024
9a0b020
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Jan 30, 2024
d102c79
Merge pull request #123 from MUTHU-RAKESH-27/main
madhansansel Jan 30, 2024
459843b
Removed the dnac_log_level from the documentation of each module
Jan 30, 2024
bf9ecce
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Jan 30, 2024
45a1f46
Merge pull request #124 from MUTHU-RAKESH-27/main
madhansansel Jan 30, 2024
92a3463
Merge pull request #14 from madhansansel/main
rukapse Jan 30, 2024
f7b0818
Implemented class variable and logging without with open
rukapse Jan 31, 2024
c3ebb93
sanity test bug fix
rukapse Jan 31, 2024
b2b115e
changed log
rukapse Jan 31, 2024
a1e3f3d
Provide the support to perform all operation using device hostname, s…
Abhishek-121 Jan 31, 2024
89270f0
Addressed the issue of Swim for importing image from local having 2 e…
Abhishek-121 Jan 31, 2024
3cbb290
Merge pull request #125 from Abhishek-121/main
madhansansel Jan 31, 2024
6d667a4
Merge pull request #15 from madhansansel/main
rukapse Jan 31, 2024
a035bd1
Merge pull request #111 from rukapse/main
madhansansel Jan 31, 2024
91c86e4
defined setup_logger
rukapse Feb 1, 2024
08cc255
Merge pull request #16 from madhansansel/main
rukapse Feb 1, 2024
df16312
defined setup_logger
rukapse Feb 1, 2024
1ff182f
defined setup_logger
rukapse Feb 1, 2024
05647b0
defined setup_logger
rukapse Feb 1, 2024
d808ffa
Removing config_verify, dnac_log_level from code along with fixing is…
Feb 1, 2024
9ef7277
Removing config_verify, dnac_log_level from code along with fixing is…
Feb 1, 2024
0ae93ac
Address the issue of editing the management IP of a device that alrea…
Abhishek-121 Feb 1, 2024
6bfd135
Merge branch 'main' into main
Abhishek-121 Feb 1, 2024
b7bad3e
Merge pull request #126 from rukapse/main
madhansansel Feb 1, 2024
5811444
Merge branch 'main' into main
Abhishek-121 Feb 1, 2024
b10c79c
removed extra self.status, add IP in single quote
Abhishek-121 Feb 1, 2024
3c57c5f
Merge branch 'main' of https://github.com/Abhishek-121/dnacenter-ansible
Abhishek-121 Feb 1, 2024
95330eb
Merge pull request #128 from Abhishek-121/main
madhansansel Feb 1, 2024
d7a7b53
Removing dnac_log_level from code along with fixing issues related to…
abimishr Feb 1, 2024
1c75af9
Merge pull request #127 from abimishr/PNP_Code_Abinash
madhansansel Feb 1, 2024
bbccba5
Changes the log message printing format
Feb 2, 2024
0fe8a40
Merge pull request #130 from MUTHU-RAKESH-27/main
madhansansel Feb 2, 2024
0097802
Merge pull request #129 from cisco-en-programmability/main
madhansansel Feb 2, 2024
4bd9a15
validation of SWIM image importing, golden tagging status of image, i…
Abhishek-121 Feb 2, 2024
e6032c0
add seperate API for each swim verify operation validation and make l…
Abhishek-121 Feb 2, 2024
1c41aeb
Merge pull request #131 from Abhishek-121/main
madhansansel Feb 2, 2024
d71b273
Changes for typos, fixed CIDR issue and added delete all feature
abimishr Feb 2, 2024
8c6192b
Added the compatibility to update specific credential/info of list of…
Abhishek-121 Feb 2, 2024
a8306c3
Merge pull request #133 from Abhishek-121/main
madhansansel Feb 2, 2024
d60966e
Restructured the log messages
Feb 2, 2024
80ce79a
Changes for typos, fixed CIDR issue and added delete all feature
abimishr Feb 3, 2024
e015c82
Changes for typos, fixed CIDR issue and added delete all feature
abimishr Feb 3, 2024
01cad9a
Added the new parameter to the template file and addressed the review…
Feb 3, 2024
986878f
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 3, 2024
4992b40
Changed the documentation for the dnac_log_file_path
Feb 3, 2024
0dbcbce
Changed the documentation
Feb 3, 2024
db18f4f
Changes the dnac_log_level list
Feb 3, 2024
b8c9176
Merge pull request #134 from MUTHU-RAKESH-27/main
madhansansel Feb 3, 2024
c6a4737
Changes for typos, fixed CIDR issue and added delete all feature
abimishr Feb 3, 2024
ea58168
Merge pull request #132 from abimishr/PNP_Code_Abinash
madhansansel Feb 3, 2024
881830e
Added the documentation part for dnac_log_file_path, dnac_log_append
Feb 4, 2024
364c78d
Merge pull request #135 from MUTHU-RAKESH-27/main
madhansansel Feb 4, 2024
38d59d0
Added the examples for tasks in swim and inventory, added code for Id…
Abhishek-121 Feb 4, 2024
068736c
Added the dnac_log_file_path, dnac_log_append common intent documenta…
Feb 4, 2024
1dbdd40
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 4, 2024
57d8da2
Changes in documentation
Feb 4, 2024
7b4860a
Changes in documentation
Feb 4, 2024
79fc68f
Merge pull request #136 from Abhishek-121/main
madhansansel Feb 4, 2024
6fd5130
Merge pull request #137 from MUTHU-RAKESH-27/main
madhansansel Feb 4, 2024
1af297a
Changes in document
madhansansel Feb 5, 2024
5cc73c7
Add the device with snmp_mode (AUTHNOPRIV, NOAUTHNOPRIV) in Inventory…
Abhishek-121 Feb 5, 2024
e28b298
Changes in the dnac_log documentation
Feb 5, 2024
6672f7e
Merge branch 'madhansansel:main' into main
Abhishek-121 Feb 5, 2024
11830ee
Add the check while updating device if cli_transport is ssh2 then mak…
Abhishek-121 Feb 5, 2024
1730ce5
Merge pull request #138 from Abhishek-121/main
madhansansel Feb 5, 2024
05eb080
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 5, 2024
1b11f05
Changes in the dnac_log documentation
Feb 5, 2024
dd4301e
Merge pull request #139 from MUTHU-RAKESH-27/main
madhansansel Feb 5, 2024
2cefbd0
Removed the documentation part of dnac_log_file_path and dnac_log_append
Feb 5, 2024
bab6575
Make the netconf port to retain previous value while updating device …
Abhishek-121 Feb 5, 2024
a35c4d1
Addressed the review comments
Feb 5, 2024
74f14b2
Merge pull request #140 from MUTHU-RAKESH-27/main
madhansansel Feb 5, 2024
babeaba
Merge pull request #141 from Abhishek-121/main
madhansansel Feb 5, 2024
e2784a4
Enhancements in Cisco Catalyst Center logging
madhansansel Feb 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion plugins/modules/inventory_intent.py
Original file line number Diff line number Diff line change
@@ -2731,7 +2731,10 @@ def get_diff_merged(self, config):
device_data = device_details[device_ip]

if not playbook_params['cliTransport']:
playbook_params['cliTransport'] = device_data['protocol']
if device_data['protocol'] == "ssh2":
playbook_params['cliTransport'] = "ssh"
else:
playbook_params['cliTransport'] = device_data['protocol']
if not playbook_params['snmpPrivProtocol']:
playbook_params['snmpPrivProtocol'] = device_data['snmpv3_privacy_type']

@@ -2897,6 +2900,15 @@ def get_diff_merged(self, config):
if not device_params['snmpPrivProtocol']:
device_params['snmpPrivProtocol'] = "AES128"

if device_params['snmpMode'] == "NOAUTHNOPRIV":
device_params.pop('snmpAuthPassphrase', None)
device_params.pop('snmpPrivPassphrase', None)
device_params.pop('snmpPrivProtocol', None)
device_params.pop('snmpAuthProtocol', None)
elif device_params['snmpMode'] == "AUTHNOPRIV":
device_params.pop('snmpPrivPassphrase', None)
device_params.pop('snmpPrivProtocol', None)

self.mandatory_parameter().check_return_status()
try:
response = self.dnac._exec(