Skip to content

Commit

Permalink
Changing danc into dnac
Browse files Browse the repository at this point in the history
  • Loading branch information
madhansansel committed Mar 19, 2024
1 parent 76f3486 commit 923a13c
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,6 @@ releases:
- Fixed management IP updates for devices on SNMP version v2.
- Addressed image un-tagging issues in inherited site settings.
- Provided documentation for EWLC templates in Cisco Catalyst Center version 2.3.7.x.
- Added attributes 'danc_api_task_timeout' and 'dnac_task_poll_interval' in intent and workflow_manager modules.
- Added attributes 'dnac_api_task_timeout' and 'dnac_task_poll_interval' in intent and workflow_manager modules.
- inventory_workflow_manager - Added attributes 'add_user_defined_field', 'update_interface_details', 'export_device_list' and 'admin_status'
- inventory_workflow_manager - Removed attributes 'provision_wireless_device', 'reprovision_wired_device'
2 changes: 1 addition & 1 deletion playbooks/swim_workflow_manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
dnac_log: True
dnac_log_level: DEBUG
config_verify: True
danc_api_task_timeout: 1000
dnac_api_task_timeout: 1000
dnac_task_poll_interval: 1
config:
- import_image_details:
Expand Down
2 changes: 1 addition & 1 deletion plugins/doc_fragments/intent_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class ModuleDocFragment(object):
description: Determines the mode of the file. Set to True for 'append' mode. Set to False for 'write' mode.
type: bool
default: True
danc_api_task_timeout:
dnac_api_task_timeout:
description: Defines the timeout in seconds for API calls to retrieve task details. If the task details
are not received within this period, the process will end, and a timeout notification will be logged.
type: int
Expand Down
2 changes: 1 addition & 1 deletion plugins/doc_fragments/workflow_manager_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class ModuleDocFragment(object):
- Flag for Cisco Catalyst Center SDK to enable the validation of request bodies against a JSON schema.
type: bool
default: true
danc_api_task_timeout:
dnac_api_task_timeout:
description: Defines the timeout in seconds for API calls to retrieve task details. If the task details
are not received within this period, the process will end, and a timeout notification will be logged.
type: int
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/device_credential_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -2583,7 +2583,7 @@ def main():
"dnac_log_file_path": {"type": 'str', "default": 'dnac.log'},
"dnac_log_append": {"type": 'bool', "default": True},
"config_verify": {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
"config": {"type": 'list', "required": True, "elements": 'dict'},
"state": {"default": 'merged', "choices": ['merged', 'deleted']},
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/device_credential_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2582,7 +2582,7 @@ def main():
"dnac_log_file_path": {"type": 'str', "default": 'dnac.log'},
"dnac_log_append": {"type": 'bool', "default": True},
"config_verify": {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
"config": {"type": 'list', "required": True, "elements": 'dict'},
"state": {"default": 'merged', "choices": ['merged', 'deleted']},
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/discovery_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,7 @@ def main():
"dnac_log_append": {"type": 'bool', "default": True},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/discovery_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,7 @@ def main():
"dnac_log_append": {"type": 'bool', "default": True},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/inventory_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -3571,7 +3571,7 @@ def main():
'dnac_log': {'type': 'bool', 'default': False},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {'type': 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/inventory_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -3564,7 +3564,7 @@ def main():
'dnac_log': {'type': 'bool', 'default': False},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {'type': 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/network_settings_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -2190,7 +2190,7 @@ def main():
"dnac_log_file_path": {"type": 'str', "default": 'dnac.log'},
"dnac_log_append": {"type": 'bool', "default": True},
"config_verify": {"type": 'bool', "default": False},
"danc_api_task_timeout": {"type": 'int', "default": 1200},
"dnac_api_task_timeout": {"type": 'int', "default": 1200},
"dnac_task_poll_interval": {"type": 'int', "default": 2},
"config": {"type": 'list', "required": True, "elements": 'dict'},
"state": {"default": 'merged', "choices": ['merged', 'deleted']},
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/network_settings_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2175,7 +2175,7 @@ def main():
"dnac_log_file_path": {"type": 'str', "default": 'dnac.log'},
"dnac_log_append": {"type": 'bool', "default": True},
"config_verify": {"type": 'bool', "default": False},
"danc_api_task_timeout": {"type": 'int', "default": 1200},
"dnac_api_task_timeout": {"type": 'int', "default": 1200},
"dnac_task_poll_interval": {"type": 'int', "default": 2},
"config": {"type": 'list', "required": True, "elements": 'dict'},
"state": {"default": 'merged', "choices": ['merged', 'deleted']},
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/pnp_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ def main():
"dnac_log_append": {"type": 'bool', "default": True},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/pnp_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ def main():
"dnac_log_append": {"type": 'bool', "default": True},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/provision_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ def main():
"dnac_log_file_path": {"type": 'str', "default": 'dnac.log'},
"dnac_log_append": {"type": 'bool', "default": True},
"config_verify": {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'validate_response_schema': {'type': 'bool', 'default': True},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/provision_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ def main():
"dnac_log_file_path": {"type": 'str', "default": 'dnac.log'},
"dnac_log_append": {"type": 'bool', "default": True},
"config_verify": {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'validate_response_schema': {'type': 'bool', 'default': True},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/site_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ def main():
'dnac_log': {'type': 'bool', 'default': False},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {'type': 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/site_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ def main():
'dnac_log': {'type': 'bool', 'default': False},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {'type': 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
8 changes: 4 additions & 4 deletions plugins/modules/swim_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
description: Set to True to verify the Cisco Catalyst Center config after applying the playbook config.
type: bool
default: False
danc_api_task_timeout:
dnac_api_task_timeout:
description: Defines the timeout in seconds for API calls to retrieve task details. If the task details
are not received within this period, the process will end, and a timeout notification will be logged.
type: int
Expand Down Expand Up @@ -332,7 +332,7 @@
post /dna/intent/api/v1/image/distribution,
post /dna/intent/api/v1/image/activation/device,
- Added the parameter 'danc_api_task_timeout', 'dnac_task_poll_interval' options in v6.13.2.
- Added the parameter 'dnac_api_task_timeout', 'dnac_task_poll_interval' options in v6.13.2.
"""

Expand Down Expand Up @@ -1350,7 +1350,7 @@ def check_swim_task_status(self, swim_task_dict, swim_task_name):

for device_ip, task_id in swim_task_dict.items():
start_time = time.time()
max_timeout = self.params.get('danc_api_task_timeout')
max_timeout = self.params.get('dnac_api_task_timeout')

while (True):
end_time = time.time()
Expand Down Expand Up @@ -1884,7 +1884,7 @@ def main():
'dnac_log': {'type': 'bool', 'default': False},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {'type': 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged']}
Expand Down
8 changes: 4 additions & 4 deletions plugins/modules/swim_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
description: Set to True to verify the Cisco Catalyst Center config after applying the playbook config.
type: bool
default: False
danc_api_task_timeout:
dnac_api_task_timeout:
description: Defines the timeout in seconds for API calls to retrieve task details. If the task details
are not received within this period, the process will end, and a timeout notification will be logged.
type: int
Expand Down Expand Up @@ -319,7 +319,7 @@
post /dna/intent/api/v1/image/distribution,
post /dna/intent/api/v1/image/activation/device,
- Added the parameter 'danc_api_task_timeout', 'dnac_task_poll_interval' options in v6.13.2.
- Added the parameter 'dnac_api_task_timeout', 'dnac_task_poll_interval' options in v6.13.2.
"""

Expand Down Expand Up @@ -1339,7 +1339,7 @@ def check_swim_task_status(self, swim_task_dict, swim_task_name):

while (True):
end_time = time.time()
max_timeout = self.params.get('danc_api_task_timeout')
max_timeout = self.params.get('dnac_api_task_timeout')

if (end_time - start_time) >= max_timeout:
self.log("""Max timeout of {0} has reached for the task id '{1}' for the device '{2}' and unexpected
Expand Down Expand Up @@ -1869,7 +1869,7 @@ def main():
'dnac_log': {'type': 'bool', 'default': False},
'validate_response_schema': {'type': 'bool', 'default': True},
'config_verify': {'type': 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/template_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -2767,7 +2767,7 @@ def main():
"dnac_log_append": {"type": 'bool', "default": True},
'validate_response_schema': {'type': 'bool', 'default': True},
"config_verify": {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/template_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2854,7 +2854,7 @@ def main():
"dnac_log_append": {"type": 'bool', "default": True},
'validate_response_schema': {'type': 'bool', 'default': True},
"config_verify": {"type": 'bool', "default": False},
'danc_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_api_task_timeout': {'type': 'int', "default": 1200},
'dnac_task_poll_interval': {'type': 'int', "default": 2},
'config': {'required': True, 'type': 'list', 'elements': 'dict'},
'state': {'default': 'merged', 'choices': ['merged', 'deleted']}
Expand Down

0 comments on commit 923a13c

Please sign in to comment.