Various fixes

Author: CarolynRountree

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

@@ -229,19 +229,19 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
 
             if wlst_name not in existing_folder_names:
                 if log_created:
-                    self.logger.info('WLSDPLY-12118', type_name, model_type_subfolder_name, name,
+                    self.logger.info('WLSDPLY-12118', type_name, model_type_subfolder_name, name, create_path,
                                      class_name=self.__class_name, method_name=_method_name)
                 else:
-                    self.logger.fine('WLSDPLY-12118', type_name, model_type_subfolder_name, name,
+                    self.logger.fine('WLSDPLY-12118', type_name, model_type_subfolder_name, name, create_path,
                                      class_name=self.__class_name, method_name=_method_name)
                 self.wlst_helper.cd(create_path)
                 self.wlst_helper.create(wlst_name, wlst_type, wlst_base_provider_type)
             else:
                 if log_created:
-                    self.logger.info('WLSDPLY-12119', type_name, model_type_subfolder_name, name,
+                    self.logger.info('WLSDPLY-12119', type_name, model_type_subfolder_name, name, create_path,
                                      class_name=self.__class_name, method_name=_method_name)
                 else:
-                    self.logger.fine('WLSDPLY-12119', type_name, model_type_subfolder_name, name,
+                    self.logger.fine('WLSDPLY-12119', type_name, model_type_subfolder_name, name, create_path,
                                      class_name=self.__class_name, method_name=_method_name)
 
             attribute_path = self.alias_helper.get_wlst_attributes_path(prov_location)

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

@@ -622,6 +622,8 @@ def set_attribute_with_cmo(self, location, key, value, wlst_value=None, masked=F
                 log_value = '<masked>'
             self.__logger.info('WLSDPLY-20012', key, log_value, class_name=self._class_name, method_name=_method_name)
         else:
+            attrib_path = self.__alias_helper.get_wlst_attributes_path(location)
+            self.__wlst_helper.cd(attrib_path)
             self.__wlst_helper.set_with_cmo(wlst_attr_name, wlst_attr_value, masked=masked)
         return
 

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

@@ -167,7 +167,7 @@ def create(name, folder, base_provider_type=None):
                 result = wlst.create(name, folder, base_provider_type)
     except (wlst.WLSTException, offlineWLSTException), e:
         pwe = exception_helper.create_pywlst_exception('WLSDPLY-00017', name, folder, base_provider_type,
-                                                       _get_exception_mode(e), _format_exception(e), error=e)
+                                                       _get_exception_mode(e), _format_exception(e), get_pwd(), error=e)
         _logger.throwing(class_name=_class_name, method_name=_method_name, error=pwe)
         raise pwe
     _logger.finest('WLSDPLY-00018', name, folder, base_provider_type, result,
@@ -423,14 +423,20 @@ def get_cmo():
     _method_name = 'get_cmo'
     _logger.entering(class_name=_class_name, method_name=_method_name)
 
-    try:
-        wlst.updateCmo()
-    except (wlst.WLSTException, offlineWLSTException), e:
-        pwe = exception_helper.create_pywlst_exception('WLSDPLY-00036', get_pwd(), _get_exception_mode(e),
-                                                       _format_exception(e), error=e)
-        _logger.throwing(class_name=_class_name, method_name='get_cmo', error=pwe)
-        raise pwe
-    _logger.exiting(class_name=_class_name, method_name=_method_name, result=wlst.cmo)
+    if wlst.connected == 'true':
+        if wlst.cmo is None:
+            pwe = exception_helper.create_pywlst_exception('WLSDPLY-00070')
+            _logger.throwing(class_name=_class_name, method_name=_method_name, error=pwe)
+            raise pwe
+    else:
+        try:
+            wlst.updateCmo()
+        except (wlst.WLSTException, offlineWLSTException), e:
+            pwe = exception_helper.create_pywlst_exception('WLSDPLY-00036', get_pwd(), _get_exception_mode(e),
+                                                           _format_exception(e), error=e)
+            _logger.throwing(class_name=_class_name, method_name='get_cmo', error=pwe)
+            raise pwe
+        _logger.exiting(class_name=_class_name, method_name=_method_name, result=wlst.cmo)
     return wlst.cmo
 
 

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

@@ -21,7 +21,7 @@ WLSDPLY-00013=Failed to find the cmo method {0} in {1} mode: {2}
 WLSDPLY-00014=Call to cmo.{0}({1}) in {2} mode failed: {3}
 WLSDPLY-00015=Exiting set_with_cmo({0}, {1})
 WLSDPLY-00016=Entering create({0}, {1}, {2}) method
-WLSDPLY-00017=Unable to create({0}, {1}, {2}) in {3} mode : {4}
+WLSDPLY-00017=Unable to create({0}, {1}, {2}) in {3} mode at location {5} : {4}
 WLSDPLY-00018=Exiting create({0}, {1}, {2}) method with result {3}
 WLSDPLY-00019=Entering delete({0}, {1}) method
 WLSDPLY-00020=Unable to delete({0}, {1}) in {2} mode : {3}
@@ -74,6 +74,7 @@ WLSDPLY-00066=Failed to switch to the domainRuntime MBean tree: {0}
 WLSDPLY-00067=Failed to switch to the custom MBean tree: {0}
 WLSDPLY-00068=Failed to change directories back to the original location {0}: {1}
 WLSDPLY-00069=wlst.undo() failed : {0}
+WLSDPLY-00070=Unexpected exception: the cmo is not valid in online wlst
 
 ###############################################################################
 #                      Util messages (1000 - 3999)                            #
@@ -940,8 +941,8 @@ WLSDPLY-12115=Setting attribute {0} to value {1}
 WLSDPLY-12116=Creating named security provider mbeans for subfolder {0} because location ({1}) supports \
   multiple child MBeans using an artificial type subfolder: {2}
 WLSDPLY-12117=While creating security {0} with name {1}, found {2} model type subfolders when exactly one was expected
-WLSDPLY-12118=Creating {0} of type {1} with name {2}
-WLSDPLY-12119=Updating {0} of type {1} with name {2}
+WLSDPLY-12118=Creating {0} of type {1} with name {2} at location {3}
+WLSDPLY-12119=Updating {0} of type {1} with name {2} at location {3}
 WLSDPLY-12120=Unexpected artificial type folder found in location {0} while creating folder {1} for location {2}
 WLSDPLY-12121=The attribute {0} in model location {1} has value {2} that references a file inside the \
   archive file {3} that does not exist