Merge pull request #700 from QualiSystems/develop

Fixing Bug with Linked Clone Deployment

Author: alexazarh

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

@@ -432,22 +432,26 @@ def clone_vm(self, clone_params, logger):
 
         '# set relo_spec'
         placement = self.vim.vm.RelocateSpec()
-        placement.datastore = datastore
         if resource_pool:
             placement.pool = resource_pool
         if host:
             placement.host = host
 
         clone_spec = self.vim.vm.CloneSpec()
+
+        if snapshot:
+            clone_spec.snapshot = snapshot
+            clone_spec.template = False
+            placement.diskMoveType = 'createNewChildDiskBacking'
+        else:
+            placement.datastore = datastore
+
+        # after deployment the vm must be powered off and will be powered on if needed by orchestration driver
         clone_spec.location = placement
         # clone_params.power_on
         # due to hotfix 1 for release 1.0,
-        # after deployment the vm must be powered off and will be powered on if needed by orchestration driver
         clone_spec.powerOn = False
 
-        if snapshot:
-            clone_spec.snapshot = snapshot
-
         logger.info("cloning VM...")
         try:
             task = template.Clone(folder=dest_folder, name=clone_params.vm_name, spec=clone_spec)

package/cloudshell/tests/test_commands/test_command_orchestrator.py

@@ -5,7 +5,6 @@
 from mock import Mock, create_autospec
 
 
-
 class TestCommandOrchestrator(TestCase):
     def setUp(self):
         self.resource = create_autospec(ResourceInfo)
@@ -49,31 +48,34 @@ def test_disconnect_all(self):
 
     def test_disconnect(self):
         # act
-        self.command_orchestrator.disconnect(self.context,  self.ports, 'network')
+        self.command_orchestrator.disconnect(self.context, self.ports, 'network')
         # assert
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)
 
     def test_destroy_vm(self):
         # act
-        self.command_orchestrator.destroy_vm(self.context,  self.ports)
+        self.command_orchestrator.destroy_vm(self.context, self.ports)
         # assert
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)
 
     def test_deploy_from_template(self):
         # act
-        self.command_orchestrator.deploy_from_template(self.context, '{"name": "name", "template_resource_model": {"vcenter_template": ""}}')
+        self.command_orchestrator.deploy_from_template(self.context,
+                                                       '{"name": "name", "template_resource_model": {"vcenter_template": ""}}')
         # assert
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)
 
     def test_deploy_vm_from_vm(self):
         # act
-        self.command_orchestrator.deploy_clone_from_vm(self.context, '{"name": "name", "template_resource_model": {"vcenter_vm": ""}}')
+        self.command_orchestrator.deploy_clone_from_vm(self.context,
+                                                       '{"name": "name", "template_resource_model": {"vcenter_vm": ""}}')
         # assert
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)
 
     def test_deploy_from_snapshot(self):
         # act
-        self.command_orchestrator.deploy_from_linked_clone(self.context, '{"name": "name", "template_resource_model": {"vcenter_vm": "name", "vcenter_vm_snapshot": "snap"}}')
+        self.command_orchestrator.deploy_from_linked_clone(self.context,
+                                                           '{"name": "name", "template_resource_model": {"vcenter_vm": "name", "vcenter_vm_snapshot": "snap"}}')
         # assert
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)
 
@@ -91,7 +93,7 @@ def test_power_off(self):
 
     def test_power_on(self):
         # act
-        self.command_orchestrator.power_on(self.context,  self.ports)
+        self.command_orchestrator.power_on(self.context, self.ports)
         # assert
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)
 

package/cloudshell/tests/test_common/test_utilities/test_command_result.py

@@ -9,8 +9,8 @@
 
 class TestCommandResult(TestCase):
     def test_get_result_from_command_output_with_result(self):
-        result = get_result_from_command_output('{"result":"MY RESULT"}')
-        self.assertEqual(result["result"], 'MY RESULT')
+        result = get_result_from_command_output('{"result":"MY RESULT1"}')
+        self.assertEqual(result["result"], 'MY RESULT1')
 
     def test_command_result_empty(self):
         result = get_result_from_command_output('')