Fixonlinedeploy (#372)

* Fix online deploy

* fix sourcepath or planpath that may be null if absolute path is not set.

Author: jshum2479

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

@@ -16,7 +16,6 @@
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import ABSOLUTE_SOURCE_PATH
 from wlsdeploy.aliases.model_constants import APPLICATION
-from wlsdeploy.aliases.model_constants import APP_DEPLOYMENTS
 from wlsdeploy.aliases.model_constants import DEPLOYMENT_ORDER
 from wlsdeploy.aliases.model_constants import LIBRARY
 from wlsdeploy.aliases.model_constants import PARTITION
@@ -215,6 +214,8 @@ def __online_deploy_apps_and_libs(self, base_location):
         existing_libs = existing_lib_refs.keys()
         existing_apps = existing_app_refs.keys()
 
+        # stop the app if the referenced shared library is newer or
+        # if the source path changes
         stop_app_list = list()
         stop_and_undeploy_app_list = list()
         update_library_list = list()
@@ -372,7 +373,8 @@ def __get_existing_apps(self, base_location):
 
         self.wlst_helper.server_config()
         self.wlst_helper.cd(wlst_list_path)
-        apps = self.wlst_helper.get_existing_object_list(APP_DEPLOYMENTS)
+        apps = self.wlst_helper.get_existing_object_list()
+
         self.wlst_helper.domain_runtime()
         #
         # Cannot use ApplicationRuntime since it includes datasources as ApplicationRuntimes
@@ -388,7 +390,24 @@ def __get_existing_apps(self, base_location):
                 attributes_map = self.wlst_helper.lsa()
                 absolute_sourcepath = attributes_map['AbsoluteSourcePath']
                 absolute_planpath = attributes_map['AbsolutePlanPath']
+
+                # There are case in application where absolute source path is not set but sourepath is
+                # if source path is not absolute then we need to add the domain path
+
+                if absolute_planpath is None:
+                    absolute_planpath = attributes_map['PlanPath']
+
+                if absolute_planpath is not None and not os.path.isabs(absolute_planpath):
+                    absolute_planpath = self.model_context.get_domain_home() + '/' + absolute_planpath
+
+                if absolute_sourcepath is None:
+                    absolute_sourcepath = attributes_map['SourcePath']
+
+                if absolute_sourcepath is not None and not os.path.isabs(absolute_sourcepath):
+                    absolute_sourcepath = self.model_context.get_domain_home() + '/' + absolute_sourcepath
+
                 deployment_order = attributes_map['DeploymentOrder']
+
                 app_hash = self.__get_file_hash(absolute_sourcepath)
                 if absolute_planpath is not None:
                     plan_hash = self.__get_file_hash(absolute_planpath)
@@ -436,8 +455,16 @@ def __get_library_references(self, base_location):
                 config_attributes = self.wlst_helper.lsa()
                 config_targets = self.__get_config_targets()
 
-                # TODO(jshum) - Why does the deployment plan not get considered?
+                # There are case in application where absolute source path is not set but sourepath is
+                # if source path is not absolute then we need to add the domain path
+
                 absolute_source_path = config_attributes[ABSOLUTE_SOURCE_PATH]
+                if absolute_source_path is None:
+                    absolute_source_path = config_attributes['SourcePath']
+
+                if absolute_source_path is not None and not os.path.isabs(absolute_source_path):
+                    absolute_source_path = self.model_context.get_domain_home() + '/' + absolute_source_path
+
                 deployment_order = config_attributes[DEPLOYMENT_ORDER]
                 lib_hash = self.__get_file_hash(absolute_source_path)
 
@@ -569,6 +596,8 @@ def __get_file_hash(self, filename):
         _method_name = '__get_file_hash'
 
         try:
+            if filename is None:
+                return None
             hash_value = FileUtils.computeHash(filename)
         except (IOException, NoSuchAlgorithmException), e:
             ex = exception_helper.create_deploy_exception('WLSDPLY-09309', filename, e.getLocalizedMessage(), error=e)
@@ -632,6 +661,10 @@ def __stop_app(self, application_name, partition_name=None, timeout=None):
         progress = self.wlst_helper.stop_application(application_name, partition=partition_name, timeout=timeout)
         while progress.isRunning():
             continue
+        if progress.isFailed():
+            ex = exception_helper.create_deploy_exception('WLSDPLY-09327', application_name, progress.getMessage())
+            self.logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
+            raise ex
         return
 
     def __start_app(self, application_name, partition_name=None):

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

@@ -911,7 +911,7 @@ def redeploy_application(self, application_name, *args, **kwargs):
         _method_name = 'redeploy_application'
 
         try:
-            result = wlst_helper.redeploy_application(application_name, args, kwargs)
+            result = wlst_helper.redeploy_application(application_name, *args, **kwargs)
         except PyWLSTException, pwe:
             ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19138', application_name,
                                                    pwe.getLocalizedMessage(), error=pwe)
@@ -931,7 +931,7 @@ def undeploy_application(self, application_name, *args, **kwargs):
         _method_name = 'undeploy_application'
 
         try:
-            result = wlst_helper.redeploy_application(application_name, args, kwargs)
+            result = wlst_helper.undeploy_application(application_name, *args, **kwargs)
         except PyWLSTException, pwe:
             ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19141', application_name,
                                                    pwe.getLocalizedMessage(), error=pwe)

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -932,6 +932,8 @@ WLSDPLY-09324=Shared library {0} name has been updated to {1} to match the \
   implementation version in the MANIFEST.MF file
 WLSDPLY-09325=Failed to compute name for shared library {0} from archive at {1}: {2}
 WLSDPLY-09326=Deployment order is {0}
+WLSDPLY-09327=Failed to stop application (0): {1}
+
 
 # wlsdeploy/tool/deploy/common_resources_deployer.py
 WLSDPLY-09400=ResourceGroup was specified in the test file but are not supported in WebLogic Server version {0}