Merge 88db0b6 into 1ffa373

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

@@ -114,16 +114,21 @@ def _execute_save_actions_using_pool(self, artifactSaversToActions, cancellation
 
         if self.cs.check_if_cancelled(cancellation_context):
             logger.info('[{0}] Save sandbox was cancelled, rolling back saved apps'.format(thread_id))
-            results = results_before_deploy
-            for param in destroy_params:
-                results.append(self._destroy(param))
-                logger.info('[{0}] Save Sandbox roll back completed'.format(thread_id))
+            results = self._rollback(destroy_params, logger, results, results_before_deploy, thread_id)
 
-        if operation_error:
+        elif operation_error:
             logger.error('[{0}] Save Sandbox operation failed, rolling backed saved apps'.format(thread_id))
+            results = self._rollback(destroy_params, logger, results, results_before_deploy, thread_id)
 
         return results
 
+    def _rollback(self, destroy_params, logger, results, results_before_deploy, thread_id):
+        results = results_before_deploy
+        for param in destroy_params:
+            results.append(self._destroy(param))
+            logger.info('[{0}] Save Sandbox roll back completed'.format(thread_id))
+        return results
+
     def _get_save_params(self, artifactSaver, artifactSaversToActions, cancellation_context, logger):
         return [(artifactSaver, a, cancellation_context, logger) for a in artifactSaversToActions[artifactSaver]]
 
@@ -146,7 +151,7 @@ def _destroy(self, (artifactSaver, action)):
         artifactSaver.destroy(save_action=action)
         return SaveAppResult(action.actionId,
                              success=False,
-                             errorMessage='Save app action {0} was cancelled'.format(action.actionId),
+                             errorMessage='Save app action {0} was rolled back'.format(action.actionId),
                              infoMessage='')
 
     def validate_requested_save_types_supported(self, artifactSaversToActions, logger, results):

package/cloudshell/cp/vcenter/common/vcenter/model_auto_discovery.py

@@ -191,6 +191,18 @@ def _validate_vm_storage(self, si, all_items_in_vc, auto_att, dc_name, attribute
             d_name = attributes[key]
         auto_att.append(AutoLoadAttribute('', key, d_name))
 
+    def _validate_saved_sandbox_storage(self, si, all_items_in_vc, auto_att, dc_name, attributes, key):
+        accepted_types = (vim.Datastore, vim.StoragePod)
+        datastore = self._validate_attribute(si, attributes, accepted_types, key, dc_name)
+        if not datastore:
+            datastore = self._get_default(all_items_in_vc, accepted_types, key)
+            d_name = self.get_full_name(dc_name, datastore)
+            # removing the upper folder
+            d_name = d_name.replace('datastore/', '')
+        else:
+            d_name = attributes[key]
+        auto_att.append(AutoLoadAttribute('', key, d_name))
+
     def _validate_vm_location(self, si, all_items_in_vc, auto_att, dc_name, attributes, key):
         accepted_types = None
         folder = self._validate_attribute(si, attributes, accepted_types, key, dc_name)

package/cloudshell/tests/test_commands/test_save_app.py

@@ -120,12 +120,12 @@ def test_destroy_on_vms_and_folders_if_command_cancelled_during_deploy(self):
         # Assert
         self.assertTrue(result[0].type == 'SaveApp')
         self.assertTrue(result[0].actionId == save_action1.actionId)
-        self.assertTrue(result[0].errorMessage == 'Save app action {0} was cancelled'.format(save_action1.actionId))
+        self.assertTrue(result[0].errorMessage == 'Save app action {0} was rolled back'.format(save_action1.actionId))
         self.assertTrue(not result[0].success)
 
         self.assertTrue(result[1].type == 'SaveApp')
         self.assertTrue(result[1].actionId == save_action2.actionId)
-        self.assertTrue(result[0].errorMessage == 'Save app action {0} was cancelled'.format(save_action2.actionId))
+        self.assertTrue(result[0].errorMessage == 'Save app action {0} was rolled back'.format(save_action2.actionId))
         self.assertTrue(not result[1].success)
 
     def test_nonempty_saved_sandbox_storage_replaces_default_storage(self):
@@ -327,7 +327,7 @@ def test_error_thrown_during_save(self):
         save_action = self._create_arbitrary_save_app_action()
 
         self.save_command.deployer = Mock()
-        error_message = 'Clone VM failed!'
+        error_message = 'Save app action  was rolled back'
         self.save_command.deployer.deploy_clone_from_vm = Mock(side_effect=Exception(error_message))
 
         vcenter_data_model = Mock()

package/version.txt

@@ -1 +1 @@
-1.13.999658
+1.13.0