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

Develop v6.13.3 #165

Merged
merged 44 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
00555cc
Added the new feature for importing a template using JSON file
Apr 3, 2024
327c00e
Resolved the sanity errors
Apr 3, 2024
c1c62f9
Resolved the sanity errors
Apr 3, 2024
fc56739
Resovlved the sanity errors
Apr 3, 2024
b3bcf56
Resolved the sanity errors
Apr 3, 2024
290a2a6
Addressed the review comments
Apr 3, 2024
0e75b43
Addressed the review comments
Apr 3, 2024
c8c8475
Addressed the review commets
Apr 3, 2024
b7ae3c2
Fix the issue of while editing device, 'snmp_rw_community' param is a…
Abhishek-121 Apr 4, 2024
39bbb4d
Merge pull request #210 from Abhishek-121/main
madhansansel Apr 4, 2024
66ce29b
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Apr 4, 2024
7a36b63
Explained the documentation clearly
Apr 4, 2024
bf4a9ce
Addressed the review comments
Apr 5, 2024
9c74eb3
Merge pull request #209 from MUTHU-RAKESH-27/main
madhansansel Apr 5, 2024
a30ca9e
Fix the issue of giving log message clear in case of API failure, int…
Abhishek-121 Apr 5, 2024
a1cc156
update log message for interface id
Abhishek-121 Apr 5, 2024
d99665e
update data type of the parameter serial_number_list
Abhishek-121 Apr 5, 2024
54103fa
addressed review comments and fix the examples parameter 'resync_inte…
Abhishek-121 Apr 5, 2024
9ef63ee
change versions for actions, python, ubuntu on workflows
wastorga Apr 5, 2024
d0a05c5
update log message
Abhishek-121 Apr 5, 2024
4a962b1
Merge pull request #211 from Abhishek-121/main
madhansansel Apr 5, 2024
7be0630
add stable-2.17 because of expected date
wastorga Apr 5, 2024
cc9c3c3
update requires_ansible; Ansible Core 2.14 is EoL on May 31, 2024
wastorga Apr 5, 2024
a3e3067
update dnacentersdk and python plugins' requirements
wastorga Apr 5, 2024
628d4ba
fix ansible compile issues on python 2.7
wastorga Apr 5, 2024
a56bd20
fix ansible compile issues on python 2.7
wastorga Apr 5, 2024
e69e27a
Fix the issue of API timeout while fetching devices associated to sit…
Abhishek-121 Apr 6, 2024
c35cdab
update the condition for checking interface needs update or not and l…
Abhishek-121 Apr 7, 2024
85213f3
remove serial_number from the device params dict
Abhishek-121 Apr 8, 2024
72b7b71
Merge pull request #212 from Abhishek-121/main
madhansansel Apr 8, 2024
9a56ac4
Adding fix for ipAddressList field length should not exceed 255
abimishr Apr 8, 2024
d7927f4
Adding fix for ipAddressList field length should not exceed 255
abimishr Apr 8, 2024
b3f3b3e
Adding fix for ipAddressList field length should not exceed 255
abimishr Apr 8, 2024
e074f26
Merge pull request #213 from abimishr/PNP_Code_Abinash
madhansansel Apr 8, 2024
ac12e7d
Adding fix for Infinite Loop Issue while aborting a discovery
abimishr Apr 8, 2024
40bbc05
Adding fix for Infinite Loop Issue while aborting a discovery
abimishr Apr 8, 2024
5f32ebe
Merge pull request #214 from abimishr/PNP_Code_Abinash
madhansansel Apr 8, 2024
84d41cf
Merge pull request #215 from cisco-en-programmability/main
madhansansel Apr 8, 2024
fd9dcc8
changes in workflow manager modules
madhansansel Apr 8, 2024
cc2f06c
Enhance log messages for device validation, interface details
Abhishek-121 Apr 9, 2024
c645dc4
update log message
Abhishek-121 Apr 9, 2024
e612450
Merge pull request #216 from Abhishek-121/main
madhansansel Apr 9, 2024
209fc66
Merge pull request #163 from cisco-en-programmability/ansible-partner…
fmunozmiranda Apr 10, 2024
7df35eb
Merge pull request #164 from madhansansel/main
fmunozmiranda Apr 10, 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
11 changes: 10 additions & 1 deletion plugins/modules/inventory_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -2725,8 +2725,8 @@ def check_device_update_execution_response(self, response, device_ip):
elif execution_details.get("endTime"):
self.status = "success"
self.result['changed'] = True
self.result['response'] = execution_details
self.msg = "Device '{0}' present in Cisco Catalyst Center and have been updated successfully".format(device_ip)
self.result['response'] = self.msg
self.log(self.msg, "INFO")
break

Expand Down Expand Up @@ -3177,6 +3177,15 @@ def get_diff_merged(self, config):

if not playbook_params['snmpROCommunity']:
playbook_params['snmpROCommunity'] = device_data.get('snmp_community', None)
if not playbook_params['snmpRWCommunity']:
playbook_params['snmpRWCommunity'] = device_data.get('snmp_write_community', None)

if not playbook_params['httpUserName']:
playbook_params['httpUserName'] = device_data.get('http_config_username', None)
if not playbook_params['httpPassword']:
playbook_params['httpPassword'] = device_data.get('http_config_password', None)
if not playbook_params['httpPort']:
playbook_params['httpPort'] = device_data.get('http_port', None)

try:
if playbook_params['updateMgmtIPaddressList']:
Expand Down
11 changes: 10 additions & 1 deletion plugins/modules/inventory_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2718,8 +2718,8 @@ def check_device_update_execution_response(self, response, device_ip):
elif execution_details.get("endTime"):
self.status = "success"
self.result['changed'] = True
self.result['response'] = execution_details
self.msg = "Device '{0}' present in Cisco Catalyst Center and have been updated successfully".format(device_ip)
self.result['response'] = self.msg
self.log(self.msg, "INFO")
break

Expand Down Expand Up @@ -3170,6 +3170,15 @@ def get_diff_merged(self, config):

if not playbook_params['snmpROCommunity']:
playbook_params['snmpROCommunity'] = device_data.get('snmp_community', None)
if not playbook_params['snmpRWCommunity']:
playbook_params['snmpRWCommunity'] = device_data.get('snmp_write_community', None)

if not playbook_params['httpUserName']:
playbook_params['httpUserName'] = device_data.get('http_config_username', None)
if not playbook_params['httpPassword']:
playbook_params['httpPassword'] = device_data.get('http_config_password', None)
if not playbook_params['httpPort']:
playbook_params['httpPort'] = device_data.get('http_port', None)

try:
if playbook_params['updateMgmtIPaddressList']:
Expand Down