Merging upstream version 9.5.1+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 24 insertions, 28 deletions

diff --git a/ansible_collections/cisco/dnac/playbooks/PnP.yml b/ansible_collections/cisco/dnac/playbooks/PnP.yml
index 63bad68e0..31cb11f9b 100644
--- a/ansible_collections/cisco/dnac/playbooks/PnP.yml
+++ b/ansible_collections/cisco/dnac/playbooks/PnP.yml
@@ -66,7 +66,7 @@
             template_name: "Ansible_PNP_Switch"
             image_name: cat9k_iosxe_npe.17.03.07.SPA.bin
             project_name: Onboarding Configuration
-            template_details:
+            template_params:
               hostname: SJC-Switch-1
               interface: TwoGigabitEthernet1/0/2
             device_info:
@@ -108,4 +108,4 @@
           - device_info:
               - serial_number: QD2425L8M7  #Will get deleted
               - serial_number: FTC2320E0HA  #Doesn't exist in the inventory
-              - serial_number: FKC2310E0HB  #Doesn't exist in the inventory
\ No newline at end of file
+              - serial_number: FKC2310E0HB  #Doesn't exist in the inventory
diff --git a/ansible_collections/cisco/dnac/playbooks/PnP_Workflow_Manager_Playbook.yml b/ansible_collections/cisco/dnac/playbooks/PnP_Workflow_Manager_Playbook.yml
index 846ebf3a7..0f1ff25c1 100644
--- a/ansible_collections/cisco/dnac/playbooks/PnP_Workflow_Manager_Playbook.yml
+++ b/ansible_collections/cisco/dnac/playbooks/PnP_Workflow_Manager_Playbook.yml
@@ -66,7 +66,7 @@
             template_name: "Ansible_PNP_Switch"
             image_name: cat9k_iosxe_npe.17.03.07.SPA.bin
             project_name: Onboarding Configuration
-            template_details:
+            template_params:
               hostname: SJC-Switch-1
               interface: TwoGigabitEthernet1/0/2
             device_info:
diff --git a/ansible_collections/cisco/dnac/playbooks/device_details.template b/ansible_collections/cisco/dnac/playbooks/device_details.template
index 38c95c627..bdf58ab61 100644
--- a/ansible_collections/cisco/dnac/playbooks/device_details.template
+++ b/ansible_collections/cisco/dnac/playbooks/device_details.template
@@ -19,25 +19,7 @@ template_details:
     import_template:
       do_version: false
       project_name: 'Onboarding Configuration'
-      payload:
-      - name: 'Platinum-Onboarding-Template-J21'
-        device_types:
-        - product_family: 'Switches and Hubs'
-          productSeries: 'Cisco Catalyst 9300 Series Switches'
-        software_type: 'IOS'
-        language: 'JINJA'
-      - name: 'Platinum-Onboarding-Template-J22'
-        device_types:
-        - product_family: 'Switches and Hubs'
-          productSeries: 'Cisco Catalyst 9300 Series Switches'
-        software_type: 'IOS'
-        language: 'JINJA'
-      - name: 'Platinum-Onboarding-Template-J23'
-        device_types:
-        - product_family: 'Switches and Hubs'
-          productSeries: 'Cisco Catalyst 9300 Series Switches'
-        software_type: 'IOS'
-        language: 'JINJA'
+      template_file: 'JSON template file'
 
 device_details:
   - site_name: 'Global/Chennai/Trill'
diff --git a/ansible_collections/cisco/dnac/playbooks/device_provision_workflow.yml b/ansible_collections/cisco/dnac/playbooks/device_provision_workflow.yml
index 362556a09..acb3249a5 100644
--- a/ansible_collections/cisco/dnac/playbooks/device_provision_workflow.yml
+++ b/ansible_collections/cisco/dnac/playbooks/device_provision_workflow.yml
@@ -16,23 +16,23 @@
       dnac_port: "{{ dnac_port }}"
       dnac_version: "{{ dnac_version }}"
       dnac_debug: "{{ dnac_debug }}"
-      
+
   tasks:
     - name: Provision a wired device to a site
-      cisco.dnac.workflow_manager:
+      cisco.dnac.provision_workflow_manager:
         <<: *dnac_login
         dnac_log: True
         state: merged
         config_verify: True
         config:
           - site_name_hierarchy: Global/USA/San Francisco/BGL_18
-            management_ip_address: 204.1.1.1
+            management_ip_address: 204.1.2.2
 
 
     - name: Unprovision a wired device from a site
-      cisco.dnac.workflow_manager:
+      cisco.dnac.provision_workflow_manager:
         <<: *dnac_login
         dnac_log: True
         state: deleted
         config:
-          - management_ip_address: 204.1.1.1
+          - management_ip_address: 204.1.2.2
diff --git a/ansible_collections/cisco/dnac/playbooks/template_workflow_manager.yml b/ansible_collections/cisco/dnac/playbooks/template_workflow_manager.yml
index 25b0ec797..3cfed07e7 100644
--- a/ansible_collections/cisco/dnac/playbooks/template_workflow_manager.yml
+++ b/ansible_collections/cisco/dnac/playbooks/template_workflow_manager.yml
@@ -13,7 +13,11 @@
         dnac_password: "{{ dnac_password }}"
         dnac_verify: "{{ dnac_verify }}"
         dnac_debug: "{{ dnac_debug }}"
-        dnac_log: true
+        dnac_log: True
+        dnac_log_level: DEBUG
+        dnac_log_append: True
+        dnac_log_file_path: "{{ dnac_log_file_path }}"
+        validate_response_schema: False
         state: "merged"
         config_verify: true
         #ignore_errors: true        #Enable this to continue execution even the task fails
@@ -28,6 +32,16 @@
             software_variant: "{{ item.variant }}"
             device_types:
             - product_family: "{{ item.family }}"
+          export:
+            project:
+              - Ansible_project
+              - Sample Velocity Templates
+            template:
+              - project_name: Onboarding Configuration
+                template_name: AP_Onboarding
+          import:
+            project: "{{ item.import_project }}"
+            template: "{{ item.import_template }}"
       register: template_result
       with_items: '{{ template_details }}'
       tags: