fix merge conflict

Author: CarolynRountree

alias-test/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
-    The Universal Permissive License (UPL), Version 1.0
+    Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+    Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -21,19 +21,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

alias-test/src/test/python/aliastest/verify/verifier_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, 2021, Oracle Corporation and/or its affiliates.
+Copyright (c) 2020, 2022, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 

core/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
-    The Universal Permissive License (UPL), Version 1.0
+    Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

core/src/main/python/wlsdeploy/aliases/alias_constants.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 These constants are internal to the aliases module and should not be used, as they are not part of the public API.
@@ -10,8 +10,8 @@
 ATTRIBUTES = 'attributes'
 CHILD_FOLDERS_TYPE = 'child_folders_type'
 CONTAINS = 'contains'
-DEFAULT = 'default'
 DEFAULT_NAME_VALUE = 'default_name_value'
+DEFAULT_VALUE = 'default_value'
 FLATTENED_FOLDER_DATA = 'flattened_folder_data'
 FOLDERS = 'folders'
 FOLDER_ORDER = 'folder_order'
@@ -31,7 +31,6 @@
 UNRESOLVED_ATTRIBUTES_MAP = '__unresolved_attributes__'
 UNRESOLVED_FOLDERS_MAP = '__unresolved_folders__'
 USES_PATH_TOKENS = 'uses_path_tokens'
-VALUE = 'value'
 # VERSION is used for folder versioning
 VERSION = 'version'
 # VERSION_RAGE is used for attribute versioning
@@ -70,6 +69,9 @@
 ROD = 'ROD'         # Read only but discover
 RW = 'RW'           # Default Read WRITE
 
+# used when DEFAULT_VALUE has curly-brace value that resolves to null
+NULL_VALUE_KEY = '__NULL__'
+
 # attribute wlst_type values
 BOOLEAN = 'boolean'
 COMMA_DELIMITED_STRING = 'delimited_string[comma]'

core/src/main/python/wlsdeploy/aliases/alias_entries.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2021, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import copy
@@ -17,6 +17,7 @@
 from wlsdeploy.aliases.alias_constants import ChildFoldersTypes
 from wlsdeploy.aliases.alias_constants import CONTAINS
 from wlsdeploy.aliases.alias_constants import DEFAULT_NAME_VALUE
+from wlsdeploy.aliases.alias_constants import DEFAULT_VALUE
 from wlsdeploy.aliases.alias_constants import FLATTENED_FOLDER_DATA
 from wlsdeploy.aliases.alias_constants import FOLDER_ORDER
 from wlsdeploy.aliases.alias_constants import FOLDER_PARAMS
@@ -26,6 +27,7 @@
 from wlsdeploy.aliases.alias_constants import MODEL_NAME
 from wlsdeploy.aliases.alias_constants import NAME_VALUE
 from wlsdeploy.aliases.alias_constants import NONE_CHILD_FOLDERS_TYPE
+from wlsdeploy.aliases.alias_constants import NULL_VALUE_KEY
 from wlsdeploy.aliases.alias_constants import PATH_TOKEN
 from wlsdeploy.aliases.alias_constants import SET_MBEAN_TYPE
 from wlsdeploy.aliases.alias_constants import SET_METHOD
@@ -891,7 +893,7 @@ def is_model_location_valid(self, location):
     def get_folders_in_order_for_location(self, location):
         """
         Find the folders that are ordered (greater than zero) at the specified location and
-        return the list in order of the 
+        return the list in ascending order
         :param location:
         :return:
         """
@@ -1468,6 +1470,9 @@ def __resolve_attribute(self, attr_dict):
                 result[key] = self.__resolve_attribute(attr)
             else:
                 result[key] = self._resolve_curly_braces(attr)
+                # resolve null key in curly brace values, such as "${__NULL__,Online}"
+                if key == DEFAULT_VALUE and result[key] == NULL_VALUE_KEY:
+                    result[key] = None
 
         for key in [GET_METHOD, SET_METHOD, GET_MBEAN_TYPE, SET_MBEAN_TYPE]:
             if key in result and len(result[key]) == 0:

core/src/main/python/wlsdeploy/aliases/aliases.py

@@ -16,7 +16,7 @@
 from wlsdeploy.aliases.alias_constants import ALIAS_MAP_TYPES
 from wlsdeploy.aliases.alias_constants import ATTRIBUTES
 from wlsdeploy.aliases.alias_constants import ChildFoldersTypes
-from wlsdeploy.aliases.alias_constants import DEFAULT
+from wlsdeploy.aliases.alias_constants import DEFAULT_VALUE
 from wlsdeploy.aliases.alias_constants import FLATTENED_FOLDER_DATA
 from wlsdeploy.aliases.alias_constants import FOLDERS
 from wlsdeploy.aliases.alias_constants import GET
@@ -38,7 +38,6 @@
 from wlsdeploy.aliases.alias_constants import SET_METHOD
 from wlsdeploy.aliases.alias_constants import STRING
 from wlsdeploy.aliases.alias_constants import USES_PATH_TOKENS
-from wlsdeploy.aliases.alias_constants import VALUE
 from wlsdeploy.aliases.alias_constants import WLST_NAME
 from wlsdeploy.aliases.alias_constants import WLST_READ_TYPE
 from wlsdeploy.aliases.alias_constants import WLST_TYPE
@@ -512,7 +511,7 @@ def get_wlst_attribute_name_and_value(self, location, model_attribute_name, mode
                             model_val = alias_utils.convert_to_type(LIST, model_attribute_value,
                                                                     delimiter=MODEL_LIST_DELIMITER)
 
-                            if uses_path_tokens:
+                            if uses_path_tokens and model_val is not None:
                                 for index, item in enumerate(model_val):
                                     item_value = self._model_context.replace_token_string(str(item))
                                     model_val[index] = item_value
@@ -990,20 +989,21 @@ def get_model_attribute_name_and_value(self, location, wlst_attribute_name, wlst
                                                                     delimiter=delimiter)
 
                 model_attribute_name = attribute_info[MODEL_NAME]
-                default_value = attribute_info[VALUE][DEFAULT]
+                default_value = attribute_info[DEFAULT_VALUE]
 
                 #
                 # The logic below to compare the str() representation of the converted value and the default value
                 # only works for lists/maps if both the converted value and the default value are the same data type...
                 #
                 if (model_type in ALIAS_LIST_TYPES or model_type in ALIAS_MAP_TYPES) \
-                        and not (default_value == '[]' or default_value == 'None'):
+                        and not (default_value == '[]' or default_value is None):
                     # always the model delimiter
                     default_value = alias_utils.convert_to_type(model_type, default_value,
                                                                 delimiter=MODEL_LIST_DELIMITER)
 
                 if attribute_info[WLST_TYPE] == STRING:
-                    default_value = alias_utils.replace_tokens_in_path(location, default_value)
+                    if default_value:
+                        default_value = alias_utils.replace_tokens_in_path(location, default_value)
 
                 if model_type == 'password':
                     if string_utils.is_empty(wlst_attribute_value) or converted_value == default_value:
@@ -1021,7 +1021,7 @@ def get_model_attribute_name_and_value(self, location, wlst_attribute_name, wlst
 
                 elif (model_type in ALIAS_LIST_TYPES or data_type in ALIAS_MAP_TYPES) and \
                         (converted_value is None or len(converted_value) == 0):
-                    if default_value == '[]' or default_value == 'None':
+                    if default_value == '[]' or default_value is None:
                         model_attribute_value = None
 
                 elif self._model_context is not None and USES_PATH_TOKENS in attribute_info:
@@ -1031,6 +1031,10 @@ def get_model_attribute_name_and_value(self, location, wlst_attribute_name, wlst
                         model_attribute_value = self._model_context.tokenize_classpath(converted_value)
                     if model_attribute_value == default_value:
                         model_attribute_value = None
+
+                elif default_value is None:
+                    model_attribute_value = converted_value
+
                 elif str(converted_value) != str(default_value):
                     if _strings_are_empty(converted_value, default_value):
                         model_attribute_value = None
@@ -1199,15 +1203,12 @@ def get_model_attribute_default_value(self, location, model_attribute_name):
             default_value = None
             attribute_info = self._alias_entries.get_alias_attribute_entry_by_model_name(location, model_attribute_name)
             if attribute_info is not None:
-                default_value = attribute_info[VALUE][DEFAULT]
-                if default_value == 'None':
-                    default_value = None
-                else:
-                    data_type, delimiter = \
-                        alias_utils.compute_read_data_type_and_delimiter_from_attribute_info(
-                            attribute_info, default_value)
+                default_value = attribute_info[DEFAULT_VALUE]
+                data_type, delimiter = \
+                    alias_utils.compute_read_data_type_and_delimiter_from_attribute_info(
+                        attribute_info, default_value)
 
-                    default_value = alias_utils.convert_to_type(data_type, default_value, delimiter=delimiter)
+                default_value = alias_utils.convert_to_type(data_type, default_value, delimiter=delimiter)
             self._logger.exiting(class_name=self._class_name, method_name=_method_name, result=default_value)
             return default_value
         except AliasException, ae:

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -298,6 +298,8 @@
 UNIX_MACHINE_ATTRIBUTE = 'PostBindGID'
 UPDATE_MODE = 'UpdateMode'
 USER = 'User'
+USER_ATTRIBUTES = 'UserAttribute'
+VIRTUAL_HOST = 'VirtualHost'
 VIRTUAL_TARGET = 'VirtualTarget'
 VIRTUAL_USER_AUTHENTICATOR = 'VirtualUserAuthenticator'
 WATCH = 'Watch'

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

@@ -1,12 +1,16 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 
 """
 import re
 from xml.dom.minidom import parse
+from wlsdeploy.exception import exception_helper
 
+from wlsdeploy.logging.platform_logger import PlatformLogger
+
+_logger = PlatformLogger('wlsdeploy.create')
 
 def set_ssl_properties(xmlDoc, atp_creds_path, keystore_password, truststore_password):
     '''
@@ -63,7 +67,6 @@ def fix_jps_config(rcu_db_info, model_context):
 
 
 def get_atp_connect_string(tnsnames_ora_path, tns_sid_name):
-
     try:
         f = open(tnsnames_ora_path, "r+")
         try:
@@ -76,17 +79,24 @@ def get_atp_connect_string(tnsnames_ora_path, tns_sid_name):
         pattern = tns_sid_name + '\s*=\s*([(].*\n.*)'
         match = re.search(pattern, text)
         if match:
-            str = match.group(1)
-            tnsConnectString=str.replace('\r','').replace('\n','')
-            str = format_connect_string(tnsConnectString)
-            return str
-    except:
-        pass
-
-    return None
-
-
-def format_connect_string(connect_string):
+            connect_string = match.group(1)
+            tnsConnectString = connect_string.replace('\r','').replace('\n','')
+            connect_string = cleanup_connect_string(tnsConnectString)
+            return connect_string, None
+        else:
+            ex = exception_helper.create_create_exception("WLSDPLY-12563", tns_sid_name)
+            _logger.throwing(ex, class_name='atp_helper', method_name='get_atp_connect_string')
+            raise ex
+    except IOError, ioe:
+        ex = exception_helper.create_create_exception("WLSDPLY-12570", str(ioe))
+        _logger.throwing(ex, class_name='atp_helper', method_name='get_atp_connect_string')
+        raise ex
+    except Exception, ex:
+        ex = exception_helper.create_create_exception("WLSDPLY-12570", str(ex))
+        _logger.throwing(ex, class_name='atp_helper', method_name='get_atp_connect_string')
+        raise ex
+
+def cleanup_connect_string(connect_string):
     """
     Formats connect string for ATP DB by removing unwanted whitespaces.
     Input:
@@ -109,5 +119,5 @@ def format_connect_string(connect_string):
         part3 = match.group(3)
         part4 = match.group(4).replace(' ', '')
         connect_string = "%s%s%s%s" % (part1, part2, part3, part4)
-
+    # if no match then return original one
     return connect_string

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+Copyright (c) 2017, 2022, 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
@@ -70,7 +70,6 @@
 from wlsdeploy.aliases.model_constants import USER
 from wlsdeploy.aliases.model_constants import VIRTUAL_TARGET
 from wlsdeploy.aliases.model_constants import WLS_USER_PASSWORD_CREDENTIAL_MAPPINGS
-from wlsdeploy.aliases.model_constants import WLS_DEFAULT_AUTHENTICATION
 from wlsdeploy.aliases.model_constants import WS_RELIABLE_DELIVERY_POLICY
 from wlsdeploy.aliases.model_constants import WEB_SERVICE_SECURITY
 from wlsdeploy.aliases.model_constants import XML_ENTITY_CACHE
@@ -91,6 +90,7 @@
 from wlsdeploy.tool.util.rcu_helper import RCUHelper
 from wlsdeploy.tool.util.target_helper import TargetHelper
 from wlsdeploy.tool.util.targeting_types import TargetingType
+from wlsdeploy.tool.util.topology_profiles import TopologyProfile
 from wlsdeploy.tool.util.topology_helper import TopologyHelper
 from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import model
@@ -509,6 +509,12 @@ def __create_base_domain_with_select_template(self, domain_home):
         _method_name = '__create_base_domain_with_select_template'
 
         self.logger.entering(domain_home, class_name=self.__class_name, method_name=_method_name)
+
+        topology_profile = self._domain_typedef.get_topology_profile()
+        if topology_profile in TopologyProfile:
+            self.logger.info('WLSDPLY-12569', topology_profile, class_name=self.__class_name, method_name=_method_name)
+            self.wlst_helper.set_topology_profile(topology_profile)
+
         base_template = self._domain_typedef.get_base_template()
         self.logger.info('WLSDPLY-12210', base_template,
                          class_name=self.__class_name, method_name=_method_name)
@@ -634,8 +640,9 @@ def __apply_base_domain_config(self, topology_folder_list):
         self.__create_reliable_delivery_policy(location)
         topology_folder_list.remove(WS_RELIABLE_DELIVERY_POLICY)
 
-        # these deletions were intentionally skipped when these elements are first created.
-        self.topology_helper.remove_deleted_clusters_and_servers(location, self._topology)
+        # this second pass will re-establish any attributes that were changed by templates,
+        # and process deletes and re-adds of named elements in the model order.
+        self.__create_machines_clusters_and_servers()
         topology_folder_list.remove(MACHINE)
         topology_folder_list.remove(UNIX_MACHINE)
         topology_folder_list.remove(CLUSTER)
@@ -961,14 +968,9 @@ def __retrieve_atp_rcudbinfo(self, rcu_db_info, checkAdminPwd=False):
             self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
 
-        rcu_database = atp_helper.get_atp_connect_string(tns_admin + os.sep + 'tnsnames.ora',
+        rcu_database, error = atp_helper.get_atp_connect_string(tns_admin + os.sep + 'tnsnames.ora',
                                                          rcu_db_info.get_atp_entry())
 
-        if rcu_database is None:
-            ex = exception_helper.create_create_exception('WLSDPLY-12563', rcu_db_info.get_atp_entry())
-            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
-            raise ex
-
         keystore_pwd = rcu_db_info.get_keystore_password()
         truststore_pwd = rcu_db_info.get_truststore_password()