delete of clusters and servers references ServerTemplate in invalid version (#930)

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -15,7 +15,6 @@
 from wlsdeploy.aliases.model_constants import SERVER_TEMPLATE
 from wlsdeploy.aliases.model_constants import UNIX_MACHINE
 from wlsdeploy.aliases.wlst_modes import WlstModes
-from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.tool.create.security_provider_creator import SecurityProviderCreator
 from wlsdeploy.tool.deploy import deployer_utils
@@ -101,8 +100,10 @@ def update(self):
         self._topology_helper.remove_deleted_clusters_and_servers(location, self._topology)
         folder_list.remove(CLUSTER)
         folder_list.remove(SERVER)
-        folder_list.remove(SERVER_TEMPLATE)
-        folder_list.remove(MIGRATABLE_TARGET)
+        if SERVER_TEMPLATE in folder_list:
+            folder_list.remove(SERVER_TEMPLATE)
+        if MIGRATABLE_TARGET in folder_list:
+            folder_list.remove(MIGRATABLE_TARGET)
 
         # process remaining top-level folders. copy list to avoid concurrent update in loop
         remaining = list(folder_list)

core/src/main/python/wlsdeploy/tool/util/topology_helper.py

@@ -18,6 +18,7 @@
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import SERVER_TEMPLATE
 from wlsdeploy.util import model_helper
+from wlsdeploy.util.weblogic_helper import WebLogicHelper
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
 
 
@@ -31,7 +32,7 @@ def __init__(self, aliases, exception_type, logger):
         self.logger = logger
         self.aliases = aliases
         self.wlst_helper = WlstHelper(exception_type)
-
+        self.wl_helper = WebLogicHelper(self.logger)
         self._coherence_cluster_elements = [CLUSTER, SERVER, SERVER_TEMPLATE]
 
     def check_coherence_cluster_references(self, type_name, model_nodes):
@@ -184,7 +185,12 @@ def remove_deleted_clusters_and_servers(self, domain_location, model_topology):
         _method_name = 'remove_deleted_clusters_and_servers'
         self.logger.entering(str(domain_location), class_name=self.__class_name, method_name=_method_name)
 
-        for folder_name in [CLUSTER, SERVER_TEMPLATE, SERVER, MIGRATABLE_TARGET]:
+        folder_names = [CLUSTER, SERVER]
+        if self.wl_helper.is_weblogic_version_or_above('12.1.2'):
+            folder_names.append(SERVER_TEMPLATE)
+        if self.wl_helper.is_weblogic_version_or_above('12.1.3'):
+            folder_names.append(MIGRATABLE_TARGET)
+        for folder_name in folder_names:
             location = LocationContext(domain_location).append_location(folder_name)
             existing_names = deployer_utils.get_existing_object_list(location, self.aliases)
             folder_nodes = dictionary_utils.get_dictionary_element(model_topology, folder_name)