Merge pull request #302 from oracle/WDT-267-Server-Migratable-Target-Attribute-fixes

Wdt 267 server migratable target attribute fixes

Author: rakillen

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

@@ -677,6 +677,8 @@ def __create_clusters_and_servers(self, location):
         # Finally, create/update the servers.
         #
         server_nodes = dictionary_utils.get_dictionary_element(self._topology, SERVER)
+        # There may be a dependency to other servers when the server is in a cluster
+        self.topology_helper.create_placeholder_servers_in_cluster(self._topology)
         if len(server_nodes) > 0:
             self._create_named_mbeans(SERVER, server_nodes, location, log_created=True)
 

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

@@ -98,6 +98,10 @@ def update(self):
 
         self._process_section(self._topology, folder_list, CLUSTER, location)
         self._process_section(self._topology, folder_list, SERVER_TEMPLATE, location)
+
+        # create placeholders for Servers that are in a cluster as /Server/JTAMigratableTarget
+        # can reference "other" servers
+        self._topology_helper.create_placeholder_servers_in_cluster(self._topology)
         self._process_section(self._topology, folder_list, SERVER, location)
 
         self._process_section(self._topology, folder_list, MIGRATABLE_TARGET, location)

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

@@ -67,6 +67,33 @@ def _create_placeholder_coherence_cluster(self, cluster_name):
 
         self.wlst_helper.cd(original_location)
 
+    def create_placeholder_servers_in_cluster(self, topology):
+        """
+        Create a placeholder for servers that are in a cluster, as these are migratable entities that
+        can reference other servers in the cluster.
+        :param topology: The topology model nodes containing the full set of Servers to add for the create / update
+        """
+        _method_name = 'create_placeholder_servers_in_cluster'
+        self.logger.entering(class_name=self.__class_name, method_name=_method_name)
+        original_location = self.wlst_helper.get_pwd()
+        server_location = LocationContext().append_location(SERVER)
+
+        if self.alias_helper.get_wlst_mbean_type(server_location) is not None:
+            existing_names = deployer_utils.get_existing_object_list(server_location, self.alias_helper)
+
+            server_nodes = dictionary_utils.get_dictionary_element(topology, SERVER)
+            for server_name in server_nodes:
+                if server_name not in existing_names and self.is_clustered_server(server_name, server_nodes):
+                    self.logger.info('WLSDPLY-19402', server_name, class_name=self.__class_name,
+                                     method_name=_method_name)
+
+                    server_token = self.alias_helper.get_name_token(server_location)
+                    server_location.add_name_token(server_token, server_name)
+                    deployer_utils.create_and_cd(server_location, existing_names, self.alias_helper)
+
+        self.wlst_helper.cd(original_location)
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+
     def create_placeholder_server_templates(self, topology):
         """
         Create a placeholder server template for each name in the topology.
@@ -133,3 +160,14 @@ def qualify_nm_properties(self, type_name, model_nodes, base_location, model_con
                 value = model_context.get_domain_home() + "/" + keystore_file
                 attribute_setter.set_attribute(location, CUSTOM_IDENTITY_KEYSTORE_FILE, value)
 
+    def is_clustered_server(self, server_name, servers_dictionary):
+        """
+        Return true if the server's Cluster attribute is set.
+        :param server_name: name of the server in the dictionary
+        :param servers_dictionary: model topology section of servers
+        :return: True if a clustered server
+        """
+        server_dictionary = dictionary_utils.get_dictionary_element(servers_dictionary, server_name)
+        if dictionary_utils.is_empty_dictionary_element(server_dictionary, CLUSTER):
+            return False
+        return True

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/MigratableTarget.json

@@ -1,19 +1,20 @@
 {
-    "copyright": "Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.",
     "license": "The Universal Permissive License (UPL), Version 1.0",
     "wlst_type": "MigratableTarget${:s}",
     "version": "[12.1.3,)",
     "child_folders_type": "multiple",
     "folders": {},
     "attributes": {
         "AdditionalMigrationAttempts":  [ {"version": "[12.1.3,)",     "wlst_mode": "both",    "wlst_name": "AdditionalMigrationAttempts",  "wlst_path": "WP001", "value": {"default": 2                    }, "wlst_type": "integer"           } ],
-        "AllCandidateServers":          [ {"version": "[12.1.3,)",     "wlst_mode": "online",  "wlst_name": "AllCandidateServers",          "wlst_path": "WP001", "value": {"default": []                   }, "wlst_type": "jarray",           "get_method": "GET", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean"} ],
+        "AllCandidateServers":          [ {"version": "[12.1.3,)",     "wlst_mode": "online",  "wlst_name": "AllCandidateServers",          "wlst_path": "WP001", "value": {"default": []                   }, "wlst_type": "jarray",           "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean"} ],
         "Cluster":                      [ {"version": "[12.1.3,)",     "wlst_mode": "both",    "wlst_name": "Cluster",                      "wlst_path": "WP001", "value": {"default": "None"               }, "wlst_type": "string",           "get_method": "LSA", "set_method": "MBEAN.set_cluster_mbean", "set_mbean_type": "weblogic.management.configuration.ClusterMBean" } ],
         "ConstrainedCandidateServer":   [ {"version": "[12.1.3,)",     "wlst_mode": "offline", "wlst_name": "ConstrainedCandidateServer",   "wlst_path": "WP001", "value": {"default": "None"               }, "wlst_type": "delimited_string", "get_method": "LSA"},
-                                          {"version": "[12.1.3,)",     "wlst_mode": "online",  "wlst_name": "ConstrainedCandidateServers",  "wlst_path": "WP002", "value": {"default": "None"               }, "wlst_type": "jarray",           "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean" } ],
+                                          {"version": "[12.1.3,)",     "wlst_mode": "online",  "wlst_name": "ConstrainedCandidateServers",  "wlst_path": "WP002", "value": {"default": "None"               }, "wlst_type": "jarray",           "preferred_model_type": "list", "get_method": "GET", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean" } ],
         "Critical":                     [ {"version": "[12.2.0,)",     "wlst_mode": "both",    "wlst_name": "Critical",                     "wlst_path": "WP001", "value": {"default": "false"              }, "wlst_type": "boolean"           } ],
         "DestinationServer":            [ {"version": "[12.1.3,)",     "wlst_mode": "offline", "wlst_name": "DestinationServer",            "wlst_path": "WP001", "value": {"default": "None"               }, "wlst_type": "string",           "get_method": "LSA"} ],
-        "HostingServer":                [ {"version": "[12.1.3,)",     "wlst_mode": "offline", "wlst_name": "HostingServer",                "wlst_path": "WP001", "value": {"default": "None"               }, "wlst_type": "string",           "get_method": "LSA" } ],
+        "HostingServer":                [ {"version": "[12.1.3,)",     "wlst_mode": "offline", "wlst_name": "HostingServer",                "wlst_path": "WP001", "value": {"default": "None"               }, "wlst_type": "string",           "get_method": "LSA" } ,
+                                          {"version": "[12.1.3,)",     "wlst_mode": "online",  "wlst_name": "HostingServer",                "wlst_path": "WP001", "value": {"default": "None"               }, "wlst_type": "string",           "access": "RO", "get_method": "GET", "set_method": "MBEAN.set_server_mbean", "set_mbean_type": "weblogic.management.configuration.ServerMBean"  } ],
         "MigrationPolicy":              [ {"version": "[12.1.3,)",     "wlst_mode": "both",    "wlst_name": "MigrationPolicy",              "wlst_path": "WP001", "value": {"default": "${None:manual}"     }, "wlst_type": "string"            } ],
         "MillisToSleepBetweenAttempts": [ {"version": "[12.1.3,)",     "wlst_mode": "both",    "wlst_name": "MillisToSleepBetweenAttempts", "wlst_path": "WP001", "value": {"default": 300000               }, "wlst_type": "integer"           } ],
         "NonLocalPostAllowed":          [ {"version": "[12.1.3,)",     "wlst_mode": "both",    "wlst_name": "NonLocalPostAllowed",          "wlst_path": "WP001", "value": {"default": "false"              }, "wlst_type": "boolean"           } ],