Network wireless profile workflow manager dev

plugins/module_utils/network_profiles.py

@@ -57,15 +57,77 @@ def check_site_template(self, each_profile, profile_info):
                         self.get_site_id(site)
                     each_site_response["site_names"] = site
                     site_response.append(each_site_response)
+
+                    child_sites = self.get_child_sites(site)
+                    if child_sites:
+                        site_response.extend(child_sites)
+
                     if not each_site_response["site_exist"]:
                         self.msg = 'Given site {0} not exist in Catalyst Center'.format(site)
                         self.log(self.msg, "ERROR")
                         self.set_operation_result("failed", False, self.msg,
                                                   "ERROR").check_return_status()
 
             if len(site_response) > 0:
+                # Filter duplicate site ids from site response
+                site_response = [dict(final_site)
+                                 for final_site in {frozenset(site.items())
+                                                    for site in site_response}]
+                self.log("Found Site ID(s) list: {0}".format(self.pprint(site_response)), "INFO")
                 profile_info["site_response"] = site_response
 
+    def get_child_sites(self, site_name_hierarchy):
+        """
+        Get all child site mapped for the given site hierarchy
+
+        Parameters:
+            self (object): An instance of a class used for interacting with
+                           Cisco Catalyst Center.
+            site_name_hierarchy (str) - Site name with complete hierarchy
+
+        Returns:
+            child_site_response or None - Any child sites found add the child site id
+            with status and complete hierarchy unless return None.
+        """
+        get_sites_params = {"name_hierarchy": site_name_hierarchy + ".*"}
+        self.log("Parameters for get_sites request: {}".format(get_sites_params), "DEBUG")
+
+        try:
+            response = self.execute_get_request("site_design", "get_sites", get_sites_params)
+            self.log("Response from get_sites request: {}".format(response), "DEBUG")
+
+            if response and isinstance(response, dict):
+                child_sites = response.get("response", [])
+                self.log("Found {0} child sites for site area: '{1}'".format(
+                    len(child_sites), site_name_hierarchy), "DEBUG")
+
+                if child_sites:
+                    child_site_response = []
+                    for child in child_sites:
+                        child_site_id = child.get("id")
+                        child_site_name_hierarchy = child.get("nameHierarchy")
+                        self.log("Received child site: '{0}' with ID: '{1}'".
+                                 format(child_site_name_hierarchy, child_site_id), "DEBUG")
+
+                        if child_site_id:
+                            each_site_response = {}
+                            each_site_response["site_exist"], each_site_response["site_id"] =\
+                                True, child_site_id
+                            each_site_response["site_names"] = child_site_name_hierarchy
+                            child_site_response.append(each_site_response)
+
+                    self.log("All child sites for site area: '{0}': {1}".format(
+                       site_name_hierarchy, self.pprint(child_site_response)), "DEBUG")
+                    return child_site_response
+                else:
+                    return None
+
+        except Exception as e:
+            self.msg = 'An error occurred during get child sites: {0}'.format(str(e))
+            self.log(self.msg, "ERROR")
+            self.set_operation_result("failed", False, self.msg, "ERROR")
+            return None
+
     def get_templates_details(self, template_list):
         """
         This Function used to get the list of templates from Cisco Catalyst Center

plugins/modules/network_switch_profile_workflow_manager.py

@@ -450,11 +450,12 @@ def get_have(self, config):
                         profile_info["profile_name"]), "INFO")
                     site_status = None
                     site_list = self.get_site_lists_for_profile(profile_id)
-                    if site_list and profile_info.get("site_response"):
+                    if site_list:
                         self.log("Received Site List: {0} for config: {1}.".format(
                             site_list, each_profile), "INFO")
                         profile_info["previous_sites"] = site_list
 
+                    if site_list and profile_info.get("site_response"):
                         site_status, unmatch = self.compare_config_with_sites_templates(
                             profile_info["site_response"], site_list, "sites")
                         profile_info["site_compare_stat"] = True
@@ -463,6 +464,11 @@ def get_have(self, config):
                             profile_info["site_compare_stat"] = False
                             profile_info["site_compare_unmatched"] = unmatch
 
+                    if not site_list and not profile_info.get("site_response"):
+                        profile_info["site_compare_stat"] = True
+                        profile_info["site_compare_unmatched"] = None
+                        site_status = True
+
                     if temp_status and site_status:
                         profile_info["profile_compare_stat"] = True
                         profile_info["profile_compare_unmatched"] = None
@@ -831,7 +837,6 @@ def get_diff_merged(self, config):
                                     assign_response.append(self.assign_site_to_network_profile(
                                         profile_id, site))
 
-                        profile_no += 1
                         self.switch.append(profile_response)
                     else:
                         self.not_processed.append(config)
@@ -859,13 +864,15 @@ def get_diff_merged(self, config):
                     if not unmatch_site_stat:
                         for each_have in self.have["switch_profile"]:
                             if each_have.get("profile_name") == each_profile["profile_name"]:
-                                self.log("Found unmatch in the profile, hence updating: {0}".
+                                self.log("Found unmatch site in the profile: {0}".
                                          format(self.pprint(each_profile)), "DEBUG")
                                 sites = each_have.get("previous_sites")
                                 if sites and len(sites) > 0:
                                     for each_site in sites:
                                         unassign_response = self.unassign_site_to_network_profile(
                                             each_have.get("profile_id"), each_site.get("id"))
+                                        self.log("Un assigned the site to update play book sites {0}".format(
+                                            sites), "INFO")
                                         unassign_site_task.append(unassign_response)
 
                                     if len(unassign_site_task) == len(sites):
@@ -886,27 +893,31 @@ def get_diff_merged(self, config):
 
                     self.msg = "Network profile '" +\
                         each_profile["profile_name"] + "' updated successfully"
+                    self.log(self.msg, "INFO")
                     profile_response = dict(profile_name=each_profile["profile_name"],
                                             status= self.msg)
                     if len(update_temp_status) > 0 or len(unassign_site_task) > 0 or\
                         len(assign_site_task) > 0:
                         self.switch.append(profile_response)
                     else:
                         self.not_processed.append(config)
+                profile_no += 1
 
             if len(self.switch) > 0:
                 self.msg = "Switch Profile created/updated successfully for '{0}'.".format(
                     str(self.switch))
+                self.log(self.msg, "INFO")
                 self.changed = True
                 self.status = "success"
 
             if len(self.not_processed) > 0:
                 self.msg = self.msg + "Unable to create Switch profile '{0}'.".format(
                     str(self.not_processed))
+                self.log(self.msg, "DEBUG")
 
             self.log(self.msg, "INFO")
             self.set_operation_result(self.status, self.changed, self.msg, "INFO",
-                                    self.switch).check_return_status()
+                                      self.switch).check_return_status()
 
         return self