Merge branch 'develop' into feature/alex_162339_make_CLP_not_searchable

Author: alexazarh

package/cloudshell/cp/vcenter/commands/power_manager_vm.py

@@ -30,7 +30,7 @@ def power_off(self, si, logger, session, vcenter_data_model, vm_uuid, resource_f
 
         if vm.summary.runtime.powerState == 'poweredOff':
             logger.info('vm already powered off')
-            task_result = 'already powered off'
+            task_result = 'Already powered off'
         else:
             # hard power off
             logger.info('{0} powering of vm'.format(vcenter_data_model.shutdown_method))
@@ -72,7 +72,7 @@ def power_on(self, si, logger, session, vm_uuid, resource_fullname):
 
         if vm.summary.runtime.powerState == 'poweredOn':
             logger.info('vm already powered on')
-            task_result = 'already powered on'
+            task_result = 'Already powered on'
         else:
             logger.info('powering on vm')
             task = vm.PowerOn()

package/cloudshell/cp/vcenter/common/utilites/command_result.py

@@ -26,6 +26,9 @@ def set_command_result(result, unpicklable=False):
     if result is None:
         return
 
+    if isinstance(result, basestring):
+        return result
+
     json = jsonpickle.encode(result, unpicklable=unpicklable)
     result_for_output = str(json)
     print result_for_output

package/cloudshell/tests/test_commands/test_power_management_vm.py

@@ -27,7 +27,7 @@ def test_power_off_already(self):
                                       resource_fullname=None)
 
         # assert
-        self.assertTrue(res, 'already powered off')
+        self.assertTrue(res, 'Already powered off')
         self.assertFalse(vm.PowerOn.called)
 
     def test_power_on_already(self):
@@ -51,7 +51,7 @@ def test_power_on_already(self):
                                      resource_fullname=None)
 
         # assert
-        self.assertTrue(res, 'already powered on')
+        self.assertTrue(res, 'Already powered on')
         self.assertFalse(vm.PowerOn.called)
 
     def test_power_on(self):