Set staging mode of app or lib during deploy or redeploy (#945)

* Set staging mode of app or lib during deploy or redeploy

* Set staging mode of app or lib during deploy or redeploy

* rename methods to indicate online only

Author: CarolynRountree

core/src/main/python/deploy.py

@@ -132,6 +132,7 @@ def __deploy_online(model, model_context, aliases):
     try:
         model_deployer.deploy_resources(model, model_context, aliases, wlst_mode=__wlst_mode)
         deployer_utils.delete_online_deployment_targets(model, aliases, __wlst_mode)
+        model_deployer.deploy_app_attributes_online(model, model_context, aliases)
     except DeployException, de:
         deployer_utils.release_edit_session_and_disconnect()
         raise de

core/src/main/python/update.py

@@ -162,6 +162,7 @@ def __update_online(model, model_context, aliases):
         topology_updater.update()
         model_deployer.deploy_resources(model, model_context, aliases, wlst_mode=__wlst_mode)
         deployer_utils.delete_online_deployment_targets(model, aliases, __wlst_mode)
+        model_deployer.deploy_app_attributes_online(model, model_context, aliases)
     except DeployException, de:
         deployer_utils.release_edit_session_and_disconnect()
         raise de

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

@@ -372,7 +372,7 @@
 SET_OPTION_JAVA_HOME = 'JavaHome'
 SET_OPTION_SERVER_START_MODE = 'ServerStartMode'
 SOURCE_PATH = 'SourcePath'
-STAGE_MODE = 'StageMode'
+STAGE_MODE = 'StagingMode'
 TAGS = 'Tags'
 TARGETS = 'Targets'
 URL = 'URL'

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

@@ -245,8 +245,8 @@ def __online_deploy_apps_and_libs(self, base_location):
         self.__build_app_deploy_strategy(app_location, model_applications, existing_app_refs,
                                          stop_and_undeploy_app_list)
 
-        # deployed_app_list is list of apps that has been deployed and stareted again
-        # redeploy_app_list is list of apps that needs to be redeplyed
+        # deployed_app_list is list of apps that has been deployed and started again
+        # redeploy_app_list is list of apps that needs to be redeployed
         deployed_app_list = []
         redeploy_app_list = []
 
@@ -903,6 +903,7 @@ def __deploy_model_libraries(self, model_libs, lib_location):
                     src_path = dictionary_utils.get_element(lib_dict, SOURCE_PATH)
                     plan_file = dictionary_utils.get_element(lib_dict, PLAN_PATH)
                     targets = dictionary_utils.get_element(lib_dict, TARGET)
+                    stage_mode = dictionary_utils.get_element(lib_dict, STAGE_MODE)
                     options = _get_deploy_options(model_libs, lib_name, library_module='true')
                     for uses_path_tokens_attribute_name in uses_path_tokens_attribute_names:
                         if uses_path_tokens_attribute_name in lib_dict:
@@ -913,7 +914,7 @@ def __deploy_model_libraries(self, model_libs, lib_location):
                     location.add_name_token(token_name, lib_name)
                     resource_group_template_name, resource_group_name, partition_name = \
                         self.__get_mt_names_from_location(location)
-                    self.__deploy_app_online(lib_name, src_path, targets, plan=plan_file,
+                    self.__deploy_app_online(lib_name, src_path, targets, plan=plan_file, stage_mode=stage_mode,
                                              partition=partition_name, resource_group=resource_group_name,
                                              resource_group_template=resource_group_template_name, options=options)
                     location.remove_name_token(token_name)
@@ -930,6 +931,7 @@ def __deploy_model_applications(self, model_apps, app_location, deployed_applist
                     app_dict = model_apps[app_name]
                     src_path = dictionary_utils.get_element(app_dict, SOURCE_PATH)
                     plan_file = dictionary_utils.get_element(app_dict, PLAN_PATH)
+                    stage_mode = dictionary_utils.get_element(app_dict, STAGE_MODE)
                     targets = dictionary_utils.get_element(app_dict, TARGET)
                     options = _get_deploy_options(model_apps, app_name, library_module='false')
 
@@ -945,7 +947,8 @@ def __deploy_model_applications(self, model_apps, app_location, deployed_applist
                         self.__get_mt_names_from_location(location)
 
                     new_app_name = self.__deploy_app_online(app_name, src_path, targets, plan=plan_file,
-                                                            partition=partition_name, resource_group=resource_group_name,
+                                                            stage_mode=stage_mode, partition=partition_name,
+                                                            resource_group=resource_group_name,
                                                             resource_group_template=resource_group_template_name,
                                                             options=options)
                     location.remove_name_token(token_name)
@@ -973,7 +976,7 @@ def __get_mt_names_from_location(self, app_location):
         dummy_location.pop_location()
         return resource_group_template_name, resource_group_name, partition_name
 
-    def __deploy_app_online(self, application_name, source_path, targets, plan=None, partition=None,
+    def __deploy_app_online(self, application_name, source_path, targets, stage_mode=None, plan=None, partition=None,
                             resource_group=None, resource_group_template=None, options=None):
         """
         Deploy an application or shared library in online mode.
@@ -1039,6 +1042,8 @@ def __deploy_app_online(self, application_name, source_path, targets, plan=None,
             kwargs['resourceGroupTemplate'] = str(resource_group_template)
         if partition is not None:
             kwargs['partition'] = str(partition)
+        if stage_mode is not None:
+            kwargs['stageMode'] = str(stage_mode)
         if options is not None:
             for key, value in options.iteritems():
                 kwargs[key] = value

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

@@ -3,11 +3,18 @@
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
+import copy
 
 from array import array
 from java.lang import Class
 from oracle.weblogic.deploy.util import PyWLSTException
-
+from wlsdeploy.aliases.model_constants import ABSOLUTE_PLAN_PATH
+from wlsdeploy.aliases.model_constants import ABSOLUTE_SOURCE_PATH
+from wlsdeploy.aliases.model_constants import APP_DEPLOYMENTS
+from wlsdeploy.aliases.model_constants import APPLICATION
+from wlsdeploy.aliases.model_constants import PLAN_PATH
+from wlsdeploy.aliases.model_constants import SOURCE_PATH
+from wlsdeploy.aliases.model_constants import TARGET
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.exception import exception_helper
@@ -409,6 +416,30 @@ def __process_archive_entry(self, location, key, value):
         self.logger.exiting(class_name=self._class_name, method_name=_method_name, result=result)
         return result
 
+    def add_application_attributes_online(self, model, location):
+        """
+        Add attributes for online; the attributes that are added are not set during the online
+        deploy WLST call.
+        :param model: dictionary model
+        :param location: current location
+        """
+
+        deploy = dictionary_utils.get_dictionary_element(model.get_model(), APP_DEPLOYMENTS)
+        apps_deploy = dictionary_utils.get_dictionary_element(deploy, APPLICATION)
+        apps = copy.deepcopy(apps_deploy)
+
+        for app in apps:
+            apps_slim = apps[app]
+            deploy_info = [ PLAN_PATH, ABSOLUTE_PLAN_PATH, SOURCE_PATH, ABSOLUTE_SOURCE_PATH, TARGET]
+            new_location = LocationContext(location)
+            new_location.append_location(APPLICATION)
+            new_location.add_name_token(self.aliases.get_name_token(new_location), app)
+            path = self.aliases.get_wlst_attributes_path(new_location)
+            if self.wlst_helper.path_exists(path):
+                self.wlst_helper.cd(path)
+                self.set_attributes(new_location, apps_slim, excludes=deploy_info)
+
+
     def __process_directory_entry(self, path):
         """
         Create the directory (and any parent directories) if it does not already exist.

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

@@ -38,6 +38,11 @@ def deploy_resources(model, model_context, aliases, wlst_mode=WlstModes.OFFLINE)
     return
 
 
+def deploy_app_attributes_online(model, model_context, aliases):
+    applications_deployer = ApplicationsDeployer(model, model_context, aliases, wlst_mode=WlstModes.ONLINE)
+    applications_deployer.add_application_attributes_online(model,LocationContext())
+
+
 def deploy_applications(model, model_context, aliases, wlst_mode=WlstModes.OFFLINE):
     """
     Deploy the applications from the model.