refactor store model and also store model when update (#421)

Author: jshum2479

core/src/main/python/update.py

@@ -47,6 +47,7 @@
 from wlsdeploy.util.model_context import ModelContext
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
+from wlsdeploy.util import model as model_helper
 
 wlst_extended.wlst_functions = globals()
 
@@ -228,6 +229,9 @@ def __update(model, model_context, aliases):
         __update_online(model, model_context, aliases)
     else:
         __update_offline(model, model_context, aliases)
+
+    if os.environ.has_key('__WLSDEPLOY_STORE_MODEL__'):
+        model_helper.persist_model(model_context, model)
     return
 
 

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

@@ -346,10 +346,7 @@ def __create_domain(self):
         self.library_helper.extract_classpath_libraries()
         self.wlsroles_helper.process_roles()
         if os.environ.has_key('__WLSDEPLOY_STORE_MODEL__'):
-            os.makedirs(self.model_context.get_domain_home() + os.sep + 'wlsdeploy')
-            fh = open(self.model_context.get_domain_home() + os.sep + 'wlsdeploy' + os.sep + 'domain_model.json', 'w')
-            fh.write(str(self.model.get_model()))
-            fh.close()
+            model_helper.persist_model(self.model_context, self.model)
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return

core/src/main/python/wlsdeploy/util/model.py

@@ -5,7 +5,7 @@
 This module serves as a wrapper for the model dictionary.
 It has convenience methods for accessing top-level fields in the model.
 """
-import pprint
+import pprint, os
 
 import oracle.weblogic.deploy.util.PyOrderedDict as OrderedDict
 
@@ -144,3 +144,12 @@ def get_model_top_level_keys():
         get_model_resources_key(),
         get_model_deployments_key()
     ]
+
+
+def persist_model(model_context,model):
+    base_dir = model_context.get_domain_home() + os.sep + 'wlsdeploy'
+    if not os.path.exists(base_dir):
+        os.makedirs(base_dir)
+    fh = open(base_dir + os.sep + 'domain_model.json', 'w')
+    fh.write(str(model.get_model()))
+    fh.close()