Skip to content

Commit

Permalink
resolved circleci config.yml conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
rukapse committed Oct 28, 2024
2 parents 16899c9 + 456572a commit b1d90d7
Show file tree
Hide file tree
Showing 79 changed files with 65,037 additions and 6,470 deletions.
3 changes: 0 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ jobs:
docker:
- image: python:3.8.10
resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main

steps:
- run:
name: Debug information for pre
Expand Down Expand Up @@ -146,7 +145,6 @@ jobs:
docker:
- image: python:3.8.10
resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main

steps:
- run:
name: Create Roles File header
Expand Down Expand Up @@ -362,7 +360,6 @@ jobs:
docker:
- image: python:3.8.10
resource_class: cisco-en-programmability/catalyst-center-ansible-runner-main

steps:
- when:
condition: << pipeline.parameters.run-pnp >>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
git config user.email "${GITHUB_ACTOR}@bots.github.com"
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.7"
- name: Install dependencies
Expand Down
84 changes: 84 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -980,3 +980,87 @@ releases:
- inventory_workflow_manager.py: added attributes resync_device_count and resync_max_timeout
- accesspoint_workflow_manager.py: added attributes 'is_assigned_site_as_location', and other new attributes.
- device_configs_backup_workflow_manager.py. added attribute 'site'.
6.19.0:
release_date: "2024-09-25"
changes:
release_summary: Code changes in workflow manager modules.
minor_changes:
- Added 'fabric_transits_workflow_manager.py' to perform operations on SDA fabric transits.
- Changes in ise_radius_integration_workflow_manager module to check ise certification status.
- Setting dnac versions and compare for version based routing.
- Minor bug fixes in network_compliance_workflow_manager module.
- Changes in network_settings_workflow_manager module to support exception handling.
- Changes in rma_workflow_manager module.
- Changes in sda_extranet_policies_workflow_manager module.
- Changes in swim_workflow_manager module to support CCO image.
- Adding support to update password in user_role_workflow_manager module.
- Unit test automation for worflow_manager modules.
- access_point_workflow_manager module.py: added attributes 'hostname' and 'management_ip_address'.
- device_configs_backup_workflow_manager.py: added attributes 'hostname_list' and 'ip_address_list', 'site_list', 'mac_address_list', 'serial_number_list'.
- device_configs_backup_workflow_manager.py: removed attributes 'hostname', 'ip_address', 'site', 'mac_address' and 'serial_number'.
- fabric_sites_zones_workflow_manager.py: added attribute 'fabric_type'.
- fabric_sites_zones_workflow_manager.py: removed attribute 'site_type'.
- swim_workflow_manager.py: added attribute 'cco_image_details'.
- user_role_workflow_manager: added attribute 'password_update'.
6.20.0:
release_date: "2024-10-03"
changes:
release_summary: Code changes in workflow manager modules.
minor_changes:
- Removing git release workflows.
- Removed sda_extranet_policies_workflow_manager.py module.
- Changes in network_compliance_workflow_manager module.
- Changes in user_role_workflow_manager module.
- Changes in inventory_workflow_manager module.
- network_settings_workflow_manager.py: added attributes 'wired_data_collection', 'wireless_telemetry', and 'netflow_collector'.
- provision_workflow_manager.py: added attribute 'force_provisioning'.
- accesspoint_workflow_manager.py: added attribute 'reboot_aps'.
6.21.0:
release_date: "2024-10-14"
changes:
release_summary: Code changes in workflow manager modules.
minor_changes:
- Added 'lan_automation_workflow_manager' to automate network discovery, deployment, and device configuration with LAN Automation.
- Added 'sda_fabric_devices_workflow_manager' to manage SDA fabric devices.
- Added 'sda_extranet_policies_workflow_manager' to manage SDA Extranet Policies.
- Added 'sda_fabric_virtual_networks_workflow_manager' to configure fabric VLANs, Virtual Networks, and Anycast Gateways.
- Added 'sda_host_port_onboarding_workflow_manager' to manage host port onboarding in SD-Access Fabric.
- Enhancements in swim_workflow_manager module.
- Changes in user_role_workflow_manager module.
- Changes in device_credential_workflow_manager module.
- Changes in accesspoint_workflow_manager module.
- Changes in events_and_notifications_workflow_manager module.
- Changes in sda_fabric_transits_workflow_manager module.
- Changes in inventory_workflow_manager module.
- Changes in ise_radius_integration_workflow_manager module.
- Enhancements in network_settings_workflow_manager module.
- Changes in dnac.py to support common APIs
- device_credential_workflow_manager.py - added attribute 'apply_credentials_to_site'.
- accesspoint_workflow_manager.py - added attribute 'factory_reset_aps'.
- Ansible utils requirement updated.
6.22.0:
release_date: "2024-10-25"
changes:
release_summary: Code changes in workflow manager modules.
minor_changes:
- Added 'lan_automation_workflow_manager' to automate network discovery, deployment, and device configuration with LAN Automation.
- Added 'sda_fabric_devices_workflow_manager' to manage SDA fabric devices.
- Bug fixes in accesspoint_workflow_manager module
- Changes in device_configs_backup_workflow_manager module
- Code enhancements in device_credential_workflow_manager module
- Enhancements in ise_radius_integration_workflow_manager module
- Code changes in network_compliance_workflow_manager module
- Bug fixes in network_settings_workflow_manager module
- Bug fixes in pnp_workflow_manager module
- Code changes in rma_workflow_manager module
- Code changes in sda_fabric_devices_workflow_manager module
- Code changes in sda_fabric_sites_zones_workflow_manager module
- Code changes in sda_fabric_virtual_networks_workflow_manager module
- Code changes in sda_host_port_onboarding_workflow_manager module
- Code changes in site_workflow_manager module
- Code changes in swim_workflow_manager module
- Code change in template_workflow_manager module
- Code change in user_role_manager module
- Changes in dnac.py
- inventory_workflow_manager.py - added attribute hostnames, serial_numbers and mac_addresses
- inventory_workflow_manager.py - Removed attribute hostname_list, serial_number_list and mac_address_list
9 changes: 7 additions & 2 deletions galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
namespace: cisco
name: dnac
version: 6.18.0
version: 6.22.0
readme: README.md
authors:
- Rafael Campos <rcampos@altus.cr>
Expand All @@ -10,6 +10,7 @@ authors:
- Bryan Vargas <bvargas@altus.cr>
- Francisco Muñoz <fmunoz@altus.cr>
- Madhan Sankaranarayanan <madsanka@cisco.com>
- Pawan Singh <pawansi@cisco.com>
- Rishita Chowdhary (@rishitachowdhary)
- Muthu Rakesh Babu <mutbabu@cisco.com>
- Akash Bhaskaran <akabhask@cisco.com>
Expand All @@ -21,6 +22,10 @@ authors:
- Ajith Andrew J <jajandre@cisco.com>
- Syed Khadeer Ahmed <syedkahm@cisco.com>
- A Mohamed Rafeek <mabdulk2@cisco.com>
- Trupti A Shetty <trashett@cisco.com>
- Sonali Deepthi Kesali <skesali@cisco.com>
- Megha Kandari <mekandar@cisco.com>

description: Ansible Modules for Cisco DNA Center
license_file: "LICENSE"
tags:
Expand All @@ -31,7 +36,7 @@ tags:
- networking
- sdn
dependencies:
ansible.utils: ">=2.0.0,<5.0"
ansible.utils: ">=2.0.0,<6.0"
repository: https://github.com/cisco-en-programmability/dnacenter-ansible
documentation: https://cisco-en-programmability.github.io/dnacenter-ansible/
homepage: https://github.com/cisco-en-programmability/dnacenter-ansible
Expand Down
108 changes: 108 additions & 0 deletions playbooks/lan_automation_workflow_manager.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
- hosts: dnac_servers
connection: local
gather_facts: no
vars_files:
- "credentials.yml"
tasks:
- name: Start a LAN Automation session and update LAN Automated devices
cisco.dnac.lan_automation_workflow_manager:
dnac_host: "{{dnac_host}}"
dnac_username: "{{dnac_username}}"
dnac_password: "{{dnac_password}}"
dnac_verify: "{{dnac_verify}}"
dnac_port: "{{dnac_port}}"
dnac_version: "{{dnac_version}}"
dnac_debug: "{{dnac_debug}}"
dnac_log_level: "{{dnac_log_level}}"
dnac_log: true
dnac_log_append: false
config_verify: false
state: deleted
config:
- lan_automation:
discovered_device_site_name_hierarchy: "Global/USA/SAN JOSE"
peer_device_management_ip_address: "91.1.1.2"
primary_device_management_ip_address: "204.1.1.4"
primary_device_interface_names:
- "HundredGigE1/0/2"
- "HundredGigE1/0/29"
- "HundredGigE1/0/35"
- "HundredGigE1/0/33"
- "HundredGigE1/0/31"
ip_pools:
- ip_pool_name: "underlay_sub"
ip_pool_role: "MAIN_POOL"
- ip_pool_name: "underlay_sub_small"
ip_pool_role: "PHYSICAL_LINK_POOL"
multicast_enabled: true
redistribute_isis_to_bgp: true
host_name_prefix: "San-Jose"
isis_domain_pwd: "cisco"
discovery_level: 5
discovery_timeout: 40
discovery_devices:
- device_serial_number: "FJC27172JDX"
device_host_name: "SR-LAN-9300-IM1"
device_site_name_hierarchy: "Global/USA/SAN JOSE/BLD23"
device_management_ip_address: "204.1.1.10"
- device_serial_number: "FJC2721261G"
device_host_name: "SR-LAN-9300-IM2"
device_site_name_hierarchy: "Global/USA/SAN JOSE/BLD20"
device_management_ip_address: "204.1.1.11"
- device_serial_number: "FCW2152L02V"
device_host_name: "SR-LAN-9300-TRANSIT"
device_management_ip_address: "204.1.1.12"
device_site_name_hierarchy: "Global/USA/SAN JOSE/BLD23"
- device_serial_number: "FXS2429Q0WE"
device_host_name: "SR-LAN-9400X-EDGE1"
device_management_ip_address: "204.1.1.13"
device_site_name_hierarchy: "Global/USA/SAN JOSE/BLD20/BLD20_FLOOR1"
- device_serial_number: "FOC2722YGWW"
device_host_name: "SR-LAN-9300X-EDGE2"
device_management_ip_address: "204.1.1.14"
device_site_name_hierarchy: "Global/USA/SAN JOSE/BLD20/BLD20_FLOOR1"
- device_serial_number: "FCW2213G01S"
device_host_name: "SR-LAN-9300-EDGE3"
device_management_ip_address: "204.1.1.15"
device_site_name_hierarchy: "Global/USA/SAN JOSE/BLD23/FLOOR1_LEVEL1"
- device_serial_number: "FJC271915XB"
device_host_name: "SR-LAN-9200CX-AEN1"
device_management_ip_address: "204.1.1.16"
device_site_name_hierarchy: "Global/USA/SAN JOSE/BLD23/FLOOR1_LEVEL1"
launch_and_wait: false
pnp_authorization: false
device_serial_number_authorization:
- "FJC27172JDX"
- "FJC2721261G"
- "FCW2152L02V"
- "FXS2429Q0WE"
- "FOC2722YGWW"
- "FCW2213G01S"
- "FJC271915XB"

- lan_automated_device_update:
loopback_update_device_list:
- device_management_ip_address: "204.1.2.3"
new_loopback0_ip_address: "204.1.1.20"
- device_management_ip_address: "204.1.1.11"
new_loopback0_ip_address: "204.1.1.19"

- lan_automated_device_update:
hostname_update_devices:
- device_management_ip_address: "24.61.1.10"
new_host_name: "SR-LAN-9400X-EDGE1"

- lan_automated_device_update:
link_add:
source_device_management_ip_address: "204.1.1.10"
source_device_interface_name: "TwoGigabitEthernet1/0/20"
destination_device_management_ip_address: "204.1.1.15"
destination_device_interface_name: "GigabitEthernet1/0/20"
ip_pool_name: "underlay_sub"

- lan_automated_device_update:
link_delete:
source_device_management_ip_address: "204.1.1.20"
source_device_interface_name: "TwoGigabitEthernet1/0/20"
destination_device_management_ip_address: "204.1.1.15"
destination_device_interface_name: "GigabitEthernet1/0/20"
Loading

0 comments on commit b1d90d7

Please sign in to comment.