Derive replica count from DynamicClusterSize or MaximumDynamicServerCount, regardless of WLS version (#957)

Author: rakillen

core/src/main/python/extract_resource.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, Oracle Corporation and/or its affiliates.
+Copyright (c) 2020, 2021, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 The entry point for the extractDomainResource tool.
@@ -71,17 +71,16 @@ def __process_args(args):
     return model_context
 
 
-def __extract_resource(model, model_context, aliases):
+def __extract_resource(model, model_context):
     """
     Offline deployment orchestration
     :param model: the model
     :param model_context: the model context
-    :param aliases: the aliases object
     :raises: DeployException: if an error occurs
     """
     _method_name = '__extract_resource'
 
-    resource_extractor = DomainResourceExtractor(model, model_context, aliases, __logger)
+    resource_extractor = DomainResourceExtractor(model, model_context, __logger)
     resource_extractor.extract()
     return 0
 
@@ -118,7 +117,7 @@ def main(args):
 
     try:
         model = Model(model_dictionary)
-        exit_code = __extract_resource(model, model_context, aliases)
+        exit_code = __extract_resource(model, model_context)
     except DeployException, ex:
         __logger.severe('WLSDPLY-09015', _program_name, ex.getLocalizedMessage(), error=ex,
                         class_name=_class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/tool/extract/domain_resource_extractor.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2020, 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
@@ -64,10 +64,9 @@ class DomainResourceExtractor:
     """
     _class_name = "DomainResourceExtractor"
 
-    def __init__(self, model, model_context, aliases, logger):
+    def __init__(self, model, model_context, logger):
         self._model = model
         self._model_context = model_context
-        self._aliases = aliases
         self._logger = logger
         return
 
@@ -255,7 +254,7 @@ def _update_resource_dictionary(self, resource_dict):
                         server_count = spec_section[REPLICAS]
                     else:
                         server_count = k8s_helper.get_server_count(cluster_name, cluster_values,
-                                                                   self._model.get_model(), self._aliases)
+                                                                   self._model.get_model())
                     cluster_dict = PyOrderedDict()
                     cluster_dict[CLUSTER_NAME] = cluster_name
                     cluster_dict[REPLICAS] = server_count

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

@@ -8,14 +8,12 @@
 import re
 
 from wlsdeploy.aliases import alias_utils
-from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import CLUSTER
 from wlsdeploy.aliases.model_constants import DYNAMIC_CLUSTER_SIZE
 from wlsdeploy.aliases.model_constants import DYNAMIC_SERVERS
 from wlsdeploy.aliases.model_constants import MAX_DYNAMIC_SERVER_COUNT
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import TOPOLOGY
-from wlsdeploy.aliases.validation_codes import ValidationCodes
 from wlsdeploy.util import dictionary_utils
 
 
@@ -41,30 +39,24 @@ def get_dns_name(name):
     return result
 
 
-def get_server_count(cluster_name, cluster_values, model_dictionary, aliases):
+def get_server_count(cluster_name, cluster_values, model_dictionary):
     """
     Determine the number of servers associated with a cluster.
     :param cluster_name: the name of the cluster
     :param cluster_values: the value map for the cluster
     :param model_dictionary: the model dictionary
-    :param aliases: aliases instance for validation
     :return: the number of servers
     """
     if DYNAMIC_SERVERS in cluster_values:
         # for dynamic clusters, return the value of DynamicClusterSize
         dynamic_servers_dict = cluster_values[DYNAMIC_SERVERS]
-        location = LocationContext()
-        location.append_location(CLUSTER)
-        location.add_name_token(aliases.get_name_token(location), 'cluster')
-        location.append_location(DYNAMIC_SERVERS)
-        location.add_name_token(aliases.get_name_token(location), 'server')
-        present, __ = aliases.is_valid_model_attribute_name(location, DYNAMIC_CLUSTER_SIZE)
-        if present == ValidationCodes.VALID:
-            cluster_size_value = dictionary_utils.get_element(dynamic_servers_dict, DYNAMIC_CLUSTER_SIZE)
-        else:
-            cluster_size_value = dictionary_utils.get_element(dynamic_servers_dict, MAX_DYNAMIC_SERVER_COUNT)
-        if cluster_size_value is not None:
-            return alias_utils.convert_to_type('integer', cluster_size_value)
+
+        # model may contain DYNAMIC_CLUSTER_SIZE or MAX_DYNAMIC_SERVER_COUNT
+        cluster_size = dictionary_utils.get_element(dynamic_servers_dict, DYNAMIC_CLUSTER_SIZE)
+        if cluster_size is None:
+            cluster_size = dictionary_utils.get_element(dynamic_servers_dict, MAX_DYNAMIC_SERVER_COUNT)
+        if cluster_size is not None:
+            return alias_utils.convert_to_type('integer', cluster_size)
     else:
         # for other clusters, return the number of servers assigned to this cluster
         count = 0

core/src/main/python/wlsdeploy/tool/util/targets/additional_output_helper.py

@@ -146,7 +146,7 @@ def _build_template_hash(model, model_context, aliases, credential_injector):
         cluster_hash[CLUSTER_NAME] = cluster_name
 
         cluster_values = dictionary_utils.get_dictionary_element(cluster_list, cluster_name)
-        server_count = k8s_helper.get_server_count(cluster_name, cluster_values, model.get_model(), aliases)
+        server_count = k8s_helper.get_server_count(cluster_name, cluster_values, model.get_model())
         cluster_hash[REPLICAS] = str(server_count)
         clusters.append(cluster_hash)