Avoid re-deploying clusters and servers a second time (#820)

* Update type match to use qualified class name for new Jython version

* Issue #819 - Remove deleted clusters and servers, rather than redeploying all of them

Author: rakillen

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2021, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
@@ -50,12 +50,8 @@
 from wlsdeploy.aliases.model_constants import PASSWORD
 from wlsdeploy.aliases.model_constants import PASSWORD_ENCRYPTED
 from wlsdeploy.aliases.model_constants import PRODUCTION_MODE_ENABLED
-from wlsdeploy.aliases.model_constants import RCU_ADMIN_PASSWORD
 from wlsdeploy.aliases.model_constants import RCU_COMP_INFO
-from wlsdeploy.aliases.model_constants import RCU_DB_CONN
 from wlsdeploy.aliases.model_constants import RCU_DB_INFO
-from wlsdeploy.aliases.model_constants import RCU_PREFIX
-from wlsdeploy.aliases.model_constants import RCU_SCHEMA_PASSWORD
 from wlsdeploy.aliases.model_constants import RCU_STG_INFO
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP_TEMPLATE
@@ -626,7 +622,8 @@ def __apply_base_domain_config(self, topology_folder_list):
 
         self.__create_mbeans_used_by_topology_mbeans(location, topology_folder_list)
 
-        self.__create_machines_clusters_and_servers()
+        # these deletions were intentionally skipped when these elements are first created.
+        self.topology_helper.remove_deleted_clusters_and_servers(location, self._topology)
         topology_folder_list.remove(MACHINE)
         topology_folder_list.remove(UNIX_MACHINE)
         topology_folder_list.remove(CLUSTER)

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2021, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from wlsdeploy.aliases.location_context import LocationContext
@@ -97,7 +97,8 @@ def update(self):
         self._process_section(self._topology, folder_list, ADMIN_CONSOLE, location)
         self._process_section(self._topology, folder_list, CDI_CONTAINER, location)
 
-        self.update_machines_clusters_and_servers()
+        # these deletions were intentionally skipped when these elements are first created.
+        self._topology_helper.remove_deleted_clusters_and_servers(location, self._topology)
         folder_list.remove(CLUSTER)
         folder_list.remove(SERVER)
         folder_list.remove(SERVER_TEMPLATE)

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2021, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 
@@ -13,6 +13,7 @@
 from wlsdeploy.aliases.model_constants import CUSTOM_IDENTITY_KEYSTORE_FILE
 from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
 from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
+from wlsdeploy.aliases.model_constants import MIGRATABLE_TARGET
 from wlsdeploy.aliases.model_constants import NM_PROPERTIES
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import SERVER_TEMPLATE
@@ -173,6 +174,27 @@ def clear_jdbc_placeholder_targeting(self, jdbc_names):
                 mbean = self.wlst_helper.get_mbean_for_wlst_path(wlst_path)
                 mbean.setTargets(None)
 
+    def remove_deleted_clusters_and_servers(self, domain_location, model_topology):
+        """
+        Remove clusters, servers, server templates, and migratable targets that were flagged for deletion
+        in the model. The deletions are intentionally skipped when these elements are first created.
+        :param domain_location: the location for the root of the domain
+        :param model_topology: the topology folder from the model
+        """
+        _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]:
+            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)
+
+            for mbean_name in folder_nodes:
+                if model_helper.is_delete_name(mbean_name):
+                    deployer_utils.delete_named_element(location, mbean_name, existing_names, self.aliases)
+
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+
     def qualify_nm_properties(self, type_name, model_nodes, base_location, model_context, attribute_setter):
         """
         For the NM properties MBean, update the keystore file path to be fully qualified with the domain directory.

core/src/main/python/wlsdeploy/tool/validate/validation_utils.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2021, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import re
@@ -126,7 +126,8 @@ def is_compatible_data_type(expected_data_type, actual_data_type):
     elif expected_data_type in ['float', 'double']:
         retval = (actual_data_type in ["<type 'float'>", "<type 'str'>", "<type 'unicode'>"])
     elif expected_data_type == 'properties' or expected_data_type == 'dict':
-        retval = (actual_data_type in ["<type 'PyOrderedDict'>", "<type 'dict'>", "<type 'str'>"])
+        retval = (actual_data_type in ["<type 'PyOrderedDict'>", "<type 'oracle.weblogic.deploy.util.PyOrderedDict'>",
+                                       "<type 'dict'>", "<type 'str'>"])
     elif 'list' in expected_data_type:
         retval = (actual_data_type in ["<type 'list'>", "<type 'str'>", "<type 'unicode'>"])
     elif expected_data_type in ['password', 'credential', 'jarray']: