fixed failing tests

Author: alexazarh

common/utilites/command_result.py

@@ -3,12 +3,13 @@
 COMMAND_RESULT_PREFIX = "command_json_result="
 COMMAND_RESULT_POSTFIX = "=command_json_result_end"
 
-def get_result_from_command_output(output):
 
+def get_result_from_command_output(output):
     match = search(COMMAND_RESULT_PREFIX + '(?P<result>.*)' + COMMAND_RESULT_POSTFIX, output)
     if not match:
-        return output
+        return None
     return match.group('result')
 
+
 def set_command_result(output):
-    print COMMAND_RESULT_PREFIX + str(output) + COMMAND_RESULT_POSTFIX
+    print COMMAND_RESULT_PREFIX + str(output) + COMMAND_RESULT_POSTFIX

deployed_app_service/proxy/deployed_app_proxy.py

@@ -100,15 +100,17 @@ def execute_command_on_vcenter_resource(generic_deployed_app_resource_model, com
                                                 inputs,
                                                 True)
 
-        result = get_result_from_command_output(command_result.Output)
-        _logger.info('Command ' + command + ' result: ' + result)
-        return result
+        _logger.info('Command ' + command + ' result: ' + command_result.Output)
+
+        return command_result
 
     @staticmethod
-    def execute_command_on_vcenter_resource_and_passthrough_result(generic_deployed_app_resource_model, command, inputs):
-        result = DeployedAppService.execute_command_on_vcenter_resource(generic_deployed_app_resource_model,
-                                                                        command,
-                                                                        inputs)
+    def execute_command_on_vcenter_resource_and_passthrough_result(generic_deployed_app_resource_model, command,
+                                                                   inputs):
+        command_result = DeployedAppService.execute_command_on_vcenter_resource(generic_deployed_app_resource_model,
+                                                                                command,
+                                                                                inputs)
 
+        result = get_result_from_command_output(command_result.Output)
         _logger.debug('Transferring result to the caller ' + result)
         set_command_result(result)

tests/test_command_executer_service.py

@@ -163,7 +163,7 @@ def test_destroyVirtualMachineCommand(self):
         CommandContextMocker.set_vm_uuid_param(VmContext.VM_UUID)
 
         # act
-        command_executer_service.destroy()
+        command_executer_service.destroy_vm()
 
         # assert
         self.assertTrue(connection_retriever.getVCenterInventoryPathAttributeData.called_with(resource_att))

tests/test_commands/test_power_management_vm.py

@@ -26,7 +26,7 @@ def test_power_on(self):
         power_manager = VirtualMachinePowerManagementCommand(pv_service, synchronous_task_waiter)
 
         # act
-        res = power_manager.power_on(si, vm_uuid)
+        res = power_manager.power_on(si, vm_uuid, None)
 
         # assert
         self.assertTrue(res)
@@ -53,7 +53,7 @@ def test_power_off(self):
         power_manager._get_vm = Mock(return_value=vm)
 
         # act
-        res = power_manager.power_off(si, vm_uuid)
+        res = power_manager.power_off(si, vm_uuid, None)
 
         # assert
         self.assertTrue(res)