change to put the atp properties inside the model domainInfo

Author: jshum2479

core/src/main/python/create.py

@@ -6,12 +6,20 @@
 """
 import javaos as os
 import sys
+
 from xml.dom.minidom import parse
 
 from java.io import IOException
 from java.lang import IllegalArgumentException
 from java.lang import IllegalStateException
 from java.lang import String
+from java.io import File
+from java.io import FileInputStream
+from java.io import FileOutputStream
+from java.util.zip import ZipInputStream
+import jarray
+
+
 
 from oracle.weblogic.deploy.create import CreateException
 from oracle.weblogic.deploy.deploy import DeployException
@@ -29,6 +37,7 @@
 # imports from local packages start here
 
 from wlsdeploy.aliases.aliases import Aliases
+from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
@@ -45,6 +54,7 @@
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
+
 _program_name = 'createDomain'
 _class_name = 'create'
 __logger = PlatformLogger('wlsdeploy.create')
@@ -377,6 +387,33 @@ def set_property(DOMTree, prop, name, value):
     prop.appendChild(newline)
 
 
+def unzip_atp_wallet(wallet_file, location):
+
+    if not os.path.exists(location):
+        os.mkdir(location)
+
+    buffer = jarray.zeros(1024, "b")
+    fis = FileInputStream(wallet_file)
+    zis = ZipInputStream(fis)
+    ze = zis.getNextEntry()
+    while ze:
+        fileName = ze.getName()
+        newFile = File(location + File.separator + fileName)
+        File(newFile.getParent()).mkdirs()
+        fos = FileOutputStream(newFile)
+        len = zis.read(buffer)
+        while len > 0:
+            fos.write(buffer, 0, len)
+            len = zis.read(buffer)
+
+        fos.close()
+        zis.closeEntry()
+        ze = zis.getNextEntry()
+    zis.closeEntry()
+    zis.close()
+    fis.close()
+
+
 def main(args):
     """
     The entry point for the create domain tool.
@@ -394,9 +431,6 @@ def main(args):
 
     try:
         model_context = __process_args(args)
-        if model_context.get_atp_properties_file():
-            current_wlst_properties = os.environ.get('WLST_PROPERTIES')
-            os.environ['oracle.net.fanEnabled'] = 'false'
     except CLAException, ex:
         exit_code = ex.getExitCode()
         if exit_code != CommandLineArgUtil.HELP_EXIT_CODE:
@@ -408,6 +442,10 @@ def main(args):
     model_file = model_context.get_model_file()
     try:
         model = FileToPython(model_file, True).parse()
+        if model_context.get_atp_properties_file():
+            os.environ['oracle.net.fanEnabled'] = 'false'
+            unzip_atp_wallet(model_context.get_atp_properties_file(), model[model_constants.DOMAIN_INFO][
+                model_constants.ATP_DB_INFO][model_constants.DRIVER_PARAMS_NET_TNS_ADMIN])
     except TranslateException, te:
         __logger.severe('WLSDPLY-20009', _program_name, model_file, te.getLocalizedMessage(), error=te,
                         class_name=_class_name, method_name=_method_name)
@@ -425,9 +463,6 @@ def main(args):
         __clean_up_temp_files()
         tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
-
-
-
     aliases = Aliases(model_context, wlst_mode=__wlst_mode)
     validate_model(model, model_context, aliases)
 
@@ -438,17 +473,21 @@ def main(args):
     try:
         creator = DomainCreator(model, model_context, aliases)
         creator.create()
-        atp_props_path = model_context.get_atp_properties_file()
 
-        if atp_props_path:
-            rcu_properties_map = variables.load_variables(atp_props_path)
-            atp_creds_path = rcu_properties_map['oracle.net.tns_admin']
+        if model_context.get_atp_properties_file():
+            #print model[model_constants.DOMAIN_INFO][model_constants.ATP_DB_INFO]
+            tns_admin = model[model_constants.DOMAIN_INFO][model_constants.ATP_DB_INFO][
+                model_constants.DRIVER_PARAMS_NET_TNS_ADMIN]
+            keystore_password = model[model_constants.DOMAIN_INFO][model_constants.ATP_DB_INFO][
+                model_constants.DRIVER_PARAMS_KEYSTOREPWD_PROPERTY]
+
+            truststore_password = model[model_constants.DOMAIN_INFO][model_constants.ATP_DB_INFO][
+                model_constants.DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY]
+
             jsp_config = model_context.get_domain_home() + '/config/fmwconfig/jps-config.xml'
             jsp_config_jse = model_context.get_domain_home() + '/config/fmwconfig/jps-config-jse.xml'
-            set_ssl_properties(jsp_config, atp_creds_path, rcu_properties_map['javax.net.ssl.keyStorePassword'],
-                               rcu_properties_map['javax.net.ssl.trustStorePassword'])
-            set_ssl_properties(jsp_config_jse, atp_creds_path, rcu_properties_map['javax.net.ssl.keyStorePassword'],
-                               rcu_properties_map['javax.net.ssl.trustStorePassword'])
+            set_ssl_properties(jsp_config, tns_admin, keystore_password, truststore_password)
+            set_ssl_properties(jsp_config_jse, tns_admin, keystore_password, truststore_password)
 
     except (IOException | CreateException), ex:
         __logger.severe('WLSDPLY-12409', _program_name, ex.getLocalizedMessage(), error=ex,

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

@@ -178,7 +178,8 @@ class AliasEntries(object):
         # be targeted.  The ServerGroup must appear in the domain typedef definition.  If
         # the ServerGroup is not listed in this map, it will be targeted to all managed
         # servers in the domain.
-        'ServerGroupTargetingLimits': 'dict'
+        'ServerGroupTargetingLimits': 'dict',
+        'ATPDbInfo' : 'dict'
     }
 
     __domain_name_token = 'DOMAIN'

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

@@ -17,6 +17,12 @@
 APP_DEPLOYMENTS = 'appDeployments'
 APP_DIR = 'AppDir'
 APPLICATION = 'Application'
+ATP_DB_INFO = 'ATPDbInfo'
+ATP_RCU_PREFIX='rcu_prefix'
+ATP_RCU_SCHEMA_PASSWORD='rcu_schema_password'
+ATP_ADMIN_PASSWORD='rcu_admin_password'
+ATP_TNS_ENTRY='tns.entry'
+
 AUDITOR = 'Auditor'
 AUTHENTICATION_PROVIDER = 'AuthenticationProvider'
 AUTHORIZER = 'Authorizer'
@@ -284,10 +290,6 @@
 DRIVER_PARAMS_NET_SSL_VERSION = 'oracle.net.ssl_version'
 DRIVER_PARAMS_NET_TNS_ADMIN = 'oracle.net.tns_admin'
 DRIVER_PARAMS_NET_FAN_ENABLED = 'oracle.jdbc.fanEnabled'
-ATP_RCU_PREFIX='rcu_prefix'
-ATP_RCU_SCHEMA_PASSWORD='rcu_schema_password'
-ATP_ADMIN_PASSWORD='rcu_admin_password'
-ATP_TNS_ENTRY='tns.entry'
 
 ENABLED = 'Enabled'
 HARVESTED_ATTRIBUTE = 'HarvestedAttribute'

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

@@ -34,6 +34,7 @@
 from wlsdeploy.aliases.model_constants import ATP_ADMIN_PASSWORD
 
 from wlsdeploy.aliases.model_constants import ATP_TNS_ENTRY
+from wlsdeploy.aliases.model_constants import ATP_DB_INFO
 
 from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
 from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS_PROPERTIES
@@ -219,23 +220,14 @@ def __run_rcu(self):
         oracle_home = self.model_context.get_oracle_home()
         java_home = self.model_context.get_java_home()
 
-        props_file = self.model_context.get_atp_properties_file()
+        if self.model_context.get_atp_properties_file():
+            rcu_properties_map = self.model.get_model_domain_info()[ATP_DB_INFO]
 
-        if props_file:
-            try:
-                rcu_properties_map = variables.load_variables(props_file)
-
-                rcu_schema_pass = rcu_properties_map[ATP_RCU_SCHEMA_PASSWORD]
-                rcu_sys_pass = rcu_properties_map[ATP_ADMIN_PASSWORD]
-
-                runner = RCURunner(domain_type, oracle_home, java_home, rcu_schemas, rcu_properties_map)
-                runner.runRcu(rcu_sys_pass, rcu_schema_pass)
-            except VariableException, ex:
-                self.logger.severe('WLSDPLY-20004', __program_name, ex.getLocalizedMessage(), error=ex,
-                                   class_name=__class_name, method_name=_method_name)
-                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
-                raise ex
+            rcu_schema_pass = rcu_properties_map[ATP_RCU_SCHEMA_PASSWORD]
+            rcu_sys_pass = rcu_properties_map[ATP_ADMIN_PASSWORD]
 
+            runner = RCURunner(domain_type, oracle_home, java_home, rcu_schemas, rcu_properties_map)
+            runner.runRcu(rcu_sys_pass, rcu_schema_pass)
         else:
             rcu_db = self.model_context.get_rcu_database()
             rcu_prefix = self.model_context.get_rcu_prefix()
@@ -780,97 +772,88 @@ def __configure_fmw_infra_database(self):
         # For ATP databases :  we need to set all the property for each datasource
         # load atp connection properties from properties file
         #
-        props_file = self.model_context.get_atp_properties_file()
-        if props_file:
-            try:
-                rcu_properties_map = variables.load_variables(props_file)
+        if self.model_context.get_atp_properties_file():
+            rcu_properties_map = self.model.get_model_domain_info()[ATP_DB_INFO]
+
+            # parse the tnsnames.ora file and retrieve the connection string
+            tns_admin = rcu_properties_map[DRIVER_PARAMS_NET_TNS_ADMIN]
 
-                # parse the tnsnames.ora file and retrieve the connection string
-                tns_admin = rcu_properties_map[DRIVER_PARAMS_NET_TNS_ADMIN]
+            rcu_database = self._get_atp_connect_string(tns_admin + os.sep + 'tnsnames.ora', rcu_properties_map[
+                ATP_TNS_ENTRY])
 
-                rcu_database = self._get_atp_connect_string(tns_admin + os.sep + 'tnsnames.ora', rcu_properties_map[
-                    ATP_TNS_ENTRY])
+            rcu_prefix = rcu_properties_map[ATP_RCU_PREFIX]
+            rcu_schema_pwd = rcu_properties_map[ATP_RCU_SCHEMA_PASSWORD]
 
-                rcu_prefix = rcu_properties_map[ATP_RCU_PREFIX]
-                rcu_schema_pwd = rcu_properties_map[ATP_RCU_SCHEMA_PASSWORD]
+            keystore_pwd = rcu_properties_map[DRIVER_PARAMS_KEYSTOREPWD_PROPERTY]
+            truststore_pwd = rcu_properties_map[DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY]
 
-                keystore_pwd = rcu_properties_map[DRIVER_PARAMS_KEYSTOREPWD_PROPERTY]
-                truststore_pwd = rcu_properties_map[DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY]
+            # Need to set for the connection proeprty for each datasource
+
+            fmw_database = self.wls_helper.get_jdbc_url_from_rcu_connect_string(rcu_database)
 
-                # Need to set for the connection proeprty for each datasource
 
-                fmw_database = self.wls_helper.get_jdbc_url_from_rcu_connect_string(rcu_database)
+            location = LocationContext()
+            location.append_location(JDBC_SYSTEM_RESOURCE)
 
+            folder_path = self.alias_helper.get_wlst_list_path(location)
+            self.wlst_helper.cd(folder_path)
+            ds_names = self.wlst_helper.lsc()
 
+            for ds_name in ds_names:
                 location = LocationContext()
                 location.append_location(JDBC_SYSTEM_RESOURCE)
-
-                folder_path = self.alias_helper.get_wlst_list_path(location)
-                self.wlst_helper.cd(folder_path)
-                ds_names = self.wlst_helper.lsc()
-
-                for ds_name in ds_names:
-                    location = LocationContext()
-                    location.append_location(JDBC_SYSTEM_RESOURCE)
-                    token_name = self.alias_helper.get_name_token(location)
-                    location.add_name_token(token_name, ds_name)
-
-
-                    location.append_location(JDBC_RESOURCE)
-                    location.append_location(JDBC_DRIVER_PARAMS)
-                    wlst_path = self.alias_helper.get_wlst_attributes_path(location)
-                    self.wlst_helper.cd(wlst_path)
-
-                    wlst_name, wlst_value = \
-                        self.alias_helper.get_wlst_attribute_name_and_value(location, URL, fmw_database)
-                    self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, ds_name)
-
-                    wlst_name, wlst_value = \
-                        self.alias_helper.get_wlst_attribute_name_and_value(location, PASSWORD_ENCRYPTED,
-                                                                            rcu_schema_pwd, masked=True)
-                    self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, ds_name, masked=True)
-
-                    location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
-                    token_name = self.alias_helper.get_name_token(location)
-                    if token_name is not None:
-                        location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
-
-                    wlst_path = self.alias_helper.get_wlst_attributes_path(location)
-                    self.wlst_helper.cd(wlst_path)
-                    orig_user = self.wlst_helper.get('Value')
-                    stb_user = orig_user.replace('DEV', rcu_prefix)
-                    wlst_name, wlst_value = \
-                        self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_PARAMS_PROPERTY_VALUE,
-                                                                            stb_user)
-                    self.wlst_helper.set_if_needed(wlst_name, wlst_value,
-                                                   JDBC_DRIVER_PARAMS_PROPERTIES, DRIVER_PARAMS_USER_PROPERTY)
-
-                    # need to set other properties
-
-                    location.remove_name_token(DRIVER_PARAMS_USER_PROPERTY)
-
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_kEYSTORE_PROPERTY, tns_admin + os.sep
-                                                       + 'keystore.jks')
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_KEYSTORETYPE_PROPERTY,
-                                                       'JKS')
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_KEYSTOREPWD_PROPERTY, keystore_pwd)
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTORE_PROPERTY, tns_admin + os.sep
-                                                       + 'truststore.jks')
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY,
-                                                       'JKS')
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY, truststore_pwd)
-
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_SSL_VERSION, '1.2')
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_SERVER_DN_MATCH_PROPERTY, 'true')
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_TNS_ADMIN, tns_admin)
-                    self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_FAN_ENABLED, 'false')
-
-            except VariableException, ex:
-                self.logger.severe('WLSDPLY-20004', _program_name, ex.getLocalizedMessage(), error=ex,
-                                   class_name=_class_name, method_name=_method_name)
-                self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
-                raise ex
-
+                token_name = self.alias_helper.get_name_token(location)
+                location.add_name_token(token_name, ds_name)
+
+
+                location.append_location(JDBC_RESOURCE)
+                location.append_location(JDBC_DRIVER_PARAMS)
+                wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+                self.wlst_helper.cd(wlst_path)
+
+                wlst_name, wlst_value = \
+                    self.alias_helper.get_wlst_attribute_name_and_value(location, URL, fmw_database)
+                self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, ds_name)
+
+                wlst_name, wlst_value = \
+                    self.alias_helper.get_wlst_attribute_name_and_value(location, PASSWORD_ENCRYPTED,
+                                                                        rcu_schema_pwd, masked=True)
+                self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, ds_name, masked=True)
+
+                location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
+                token_name = self.alias_helper.get_name_token(location)
+                if token_name is not None:
+                    location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
+
+                wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+                self.wlst_helper.cd(wlst_path)
+                orig_user = self.wlst_helper.get('Value')
+                stb_user = orig_user.replace('DEV', rcu_prefix)
+                wlst_name, wlst_value = \
+                    self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_PARAMS_PROPERTY_VALUE,
+                                                                        stb_user)
+                self.wlst_helper.set_if_needed(wlst_name, wlst_value,
+                                               JDBC_DRIVER_PARAMS_PROPERTIES, DRIVER_PARAMS_USER_PROPERTY)
+
+                # need to set other properties
+
+                location.remove_name_token(DRIVER_PARAMS_USER_PROPERTY)
+
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_kEYSTORE_PROPERTY, tns_admin + os.sep
+                                                   + 'keystore.jks')
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_KEYSTORETYPE_PROPERTY,
+                                                   'JKS')
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_KEYSTOREPWD_PROPERTY, keystore_pwd)
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTORE_PROPERTY, tns_admin + os.sep
+                                                   + 'truststore.jks')
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTORETYPE_PROPERTY,
+                                                   'JKS')
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_TRUSTSTOREPWD_PROPERTY, truststore_pwd)
+
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_SSL_VERSION, '1.2')
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_SERVER_DN_MATCH_PROPERTY, 'true')
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_TNS_ADMIN, tns_admin)
+                self.__set_atp_connection_property(location, DRIVER_PARAMS_NET_FAN_ENABLED, 'false')
         else:
             rcu_database = self.model_context.get_rcu_database()
             if rcu_database is None:

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

@@ -6,6 +6,7 @@
 import wlsdeploy.util.dictionary_utils as dictionary_utils
 
 from wlsdeploy.aliases.model_constants import DOMAIN_LIBRARIES
+from wlsdeploy.aliases.model_constants import ATP_DB_INFO
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.tool.util.alias_helper import AliasHelper
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
@@ -42,7 +43,7 @@ def install_domain_libraries(self):
         domain_info_dict = self.model.get_model_domain_info()
         if DOMAIN_LIBRARIES not in domain_info_dict or len(domain_info_dict[DOMAIN_LIBRARIES]) == 0:
             self.logger.info('WLSDPLY-12213', class_name=self.__class_name, method_name=_method_name)
-        else:
+        elif DOMAIN_LIBRARIES in domain_info_dict:
             domain_libs = dictionary_utils.get_dictionary_element(domain_info_dict, DOMAIN_LIBRARIES)
             if self.archive_helper is None:
                 ex = exception_helper.create_create_exception('WLSDPLY-12214', domain_libs)