Update unit tests

Author: Dany9966

coriolisclient/tests/cli/test_transfer_executions.py

@@ -258,6 +258,7 @@ def test_take_action(
         args = mock.Mock()
         args.transfer = mock.sentinel.transfer
         args.shutdown_instances = mock.sentinel.shutdown_instances
+        args.auto_deploy = mock.sentinel.auto_deploy
         mock_execution = mock.Mock()
         self.mock_app.client_manager.coriolis.transfer_executions.create = \
             mock_execution
@@ -269,7 +270,8 @@ def test_take_action(
             result
         )
         mock_execution.assert_called_once_with(
-            mock.sentinel.transfer, mock.sentinel.shutdown_instances)
+            mock.sentinel.transfer, mock.sentinel.shutdown_instances,
+            mock.sentinel.auto_deploy)
         mock_get_formatted_entity.assert_called_once_with(
             mock_execution.return_value)
 

coriolisclient/tests/cli/test_transfer_schedules.py

@@ -53,7 +53,8 @@ class TransferScheduleFormatterTestCase(test_base.CoriolisBaseTestCase):
 
     def setUp(self):
         super(TransferScheduleFormatterTestCase, self).setUp()
-        self.transfer = transfer_schedules.TransferScheduleFormatter()
+        self.transfer_schedules = (
+            transfer_schedules.TransferScheduleFormatter())
 
     def test_get_sorted_list(self):
         obj1 = mock.Mock()
@@ -64,7 +65,7 @@ def test_get_sorted_list(self):
         obj3.created_at = "date3"
         obj_list = [obj2, obj1, obj3]
 
-        result = self.transfer._get_sorted_list(obj_list)
+        result = self.transfer_schedules._get_sorted_list(obj_list)
 
         self.assertEqual(
             [obj1, obj2, obj3],
@@ -79,7 +80,7 @@ def test_get_formatted_data(self):
         obj.created_at = mock.sentinel.created_at
         obj.expiration_date = mock.sentinel.expiration_date
 
-        result = self.transfer._get_formatted_data(obj)
+        result = self.transfer_schedules._get_formatted_data(obj)
 
         self.assertEqual(
             (
@@ -98,7 +99,8 @@ class TransferScheduleDetailFormatterTestCase(test_base.CoriolisBaseTestCase):
 
     def setUp(self):
         super(TransferScheduleDetailFormatterTestCase, self).setUp()
-        self.transfer = transfer_schedules.TransferScheduleDetailFormatter()
+        self.transfer_schedules = (
+            transfer_schedules.TransferScheduleDetailFormatter())
 
     def test_get_formatted_data(self):
         obj = mock.Mock()
@@ -110,8 +112,9 @@ def test_get_formatted_data(self):
         obj.enabled = False
         obj.expiration_date = mock.sentinel.expiration_date
         obj.shutdown_instance = mock.sentinel.shutdown_instance
+        obj.auto_deploy = mock.sentinel.auto_deploy
 
-        result = self.transfer._get_formatted_data(obj)
+        result = self.transfer_schedules._get_formatted_data(obj)
 
         self.assertEqual(
             (
@@ -122,7 +125,8 @@ def test_get_formatted_data(self):
                 mock.sentinel.updated_at,
                 False,
                 mock.sentinel.expiration_date,
-                mock.sentinel.shutdown_instance
+                mock.sentinel.shutdown_instance,
+                mock.sentinel.auto_deploy,
             ),
             result
         )
@@ -134,15 +138,15 @@ class CreateTransferScheduleTestCase(test_base.CoriolisBaseTestCase):
     def setUp(self):
         self.mock_app = mock.Mock()
         super(CreateTransferScheduleTestCase, self).setUp()
-        self.transfer = transfer_schedules.CreateTransferSchedule(
+        self.transfer_schedules = transfer_schedules.CreateTransferSchedule(
             self.mock_app, mock.sentinel.app_args)
 
     @mock.patch.object(show.ShowOne, 'get_parser')
     def test_get_parser(
         self,
         mock_get_parser
     ):
-        result = self.transfer.get_parser(mock.sentinel.prog_name)
+        result = self.transfer_schedules.get_parser(mock.sentinel.prog_name)
 
         self.assertEqual(
             mock_get_parser.return_value,
@@ -163,14 +167,15 @@ def test_take_action(
         args = mock.Mock()
         args.transfer = mock.sentinel.transfer
         args.disabled = False
-        args.shutdown_instance = mock.sentinel.shutdown_instance
+        args.shutdown_instance = False
+        args.auto_deploy = False
         mock_schedule_group_args = {"minute": mock.sentinel.minute}
         mock_parse_schedule_group_args.return_value = mock_schedule_group_args
         mock_schedule = mock.Mock()
         self.mock_app.client_manager.coriolis.transfer_schedules.create = \
             mock_schedule
 
-        result = self.transfer.take_action(args)
+        result = self.transfer_schedules.take_action(args)
 
         self.assertEqual(
             mock_get_formatted_entity.return_value,
@@ -181,7 +186,8 @@ def test_take_action(
             mock_schedule_group_args,
             True,
             mock_parse_expiration_date.return_value,
-            mock.sentinel.shutdown_instance
+            False,
+            False,
         )
         mock_get_formatted_entity.assert_called_once_with(
             mock_schedule.return_value)
@@ -198,7 +204,7 @@ def test_take_action_no_parsed_schedule(
 
         self.assertRaises(
             exceptions.CoriolisException,
-            self.transfer.take_action,
+            self.transfer_schedules.take_action,
             args
         )
         mock_parse_expiration_date.assert_not_called()
@@ -210,15 +216,15 @@ class ShowTransferScheduleTestCase(test_base.CoriolisBaseTestCase):
     def setUp(self):
         self.mock_app = mock.Mock()
         super(ShowTransferScheduleTestCase, self).setUp()
-        self.transfer = transfer_schedules.ShowTransferSchedule(
+        self.transfer_schedules = transfer_schedules.ShowTransferSchedule(
             self.mock_app, mock.sentinel.app_args)
 
     @mock.patch.object(show.ShowOne, 'get_parser')
     def test_get_parser(
         self,
         mock_get_parser
     ):
-        result = self.transfer.get_parser(mock.sentinel.prog_name)
+        result = self.transfer_schedules.get_parser(mock.sentinel.prog_name)
 
         self.assertEqual(
             mock_get_parser.return_value,
@@ -239,7 +245,7 @@ def test_take_action(
         self.mock_app.client_manager.coriolis.transfer_schedules.get = \
             schedule
 
-        result = self.transfer.take_action(args)
+        result = self.transfer_schedules.take_action(args)
 
         self.assertEqual(
             mock_get_formatted_entity.return_value,
@@ -256,15 +262,15 @@ class UpdateTransferScheduleTestCase(test_base.CoriolisBaseTestCase):
     def setUp(self):
         self.mock_app = mock.Mock()
         super(UpdateTransferScheduleTestCase, self).setUp()
-        self.transfer = transfer_schedules.UpdateTransferSchedule(
+        self.transfer_schedules = transfer_schedules.UpdateTransferSchedule(
             self.mock_app, mock.sentinel.app_args)
 
     @mock.patch.object(show.ShowOne, 'get_parser')
     def test_get_parser(
         self,
         mock_get_parser
     ):
-        result = self.transfer.get_parser(mock.sentinel.prog_name)
+        result = self.transfer_schedules.get_parser(mock.sentinel.prog_name)
 
         self.assertEqual(
             mock_get_parser.return_value,
@@ -288,6 +294,7 @@ def test_take_action(
         args.enabled = True
         args.transfer = mock.sentinel.transfer
         args.id = mock.sentinel.id
+        args.auto_deploy = False
         mock_parse_schedule_group_args.return_value = \
             {"minute": mock.sentinel.minute}
         transfer_schedule = mock.Mock()
@@ -298,9 +305,10 @@ def test_take_action(
             "expiration_date": mock_parse_expiration_date.return_value,
             "shutdown_instance": True,
             "enabled": True,
+            "auto_deploy": False,
         }
 
-        result = self.transfer.take_action(args)
+        result = self.transfer_schedules.take_action(args)
 
         self.assertEqual(
             mock_get_formatted_entity.return_value,
@@ -329,13 +337,14 @@ def test_take_action_no_updated_values(
         args.expires = False
         args.shutdown = None
         args.enabled = None
+        args.auto_deploy = None
         mock_parse_schedule_group_args.return_value = {}
         transfer_schedule = mock.Mock()
         self.mock_app.client_manager.coriolis.transfer_schedules = \
             transfer_schedule
         expected_updated_values = {"expiration_date": None}
 
-        result = self.transfer.take_action(args)
+        result = self.transfer_schedules.take_action(args)
 
         self.assertEqual(
             mock_get_formatted_entity.return_value,
@@ -356,15 +365,15 @@ class DeleteTransferScheduleTestCase(test_base.CoriolisBaseTestCase):
     def setUp(self):
         self.mock_app = mock.Mock()
         super(DeleteTransferScheduleTestCase, self).setUp()
-        self.transfer = transfer_schedules.DeleteTransferSchedule(
+        self.transfer_schedules = transfer_schedules.DeleteTransferSchedule(
             self.mock_app, mock.sentinel.app_args)
 
     @mock.patch.object(command.Command, 'get_parser')
     def test_get_parser(
         self,
         mock_get_parser
     ):
-        result = self.transfer.get_parser(mock.sentinel.prog_name)
+        result = self.transfer_schedules.get_parser(mock.sentinel.prog_name)
 
         self.assertEqual(
             mock_get_parser.return_value,
@@ -380,7 +389,7 @@ def test_take_action(self):
         self.mock_app.client_manager.coriolis.transfer_schedules = \
             transfer_schedule
 
-        self.transfer.take_action(args)
+        self.transfer_schedules.take_action(args)
 
         transfer_schedule.delete.assert_called_once_with(
             mock.sentinel.transfer, mock.sentinel.id)
@@ -392,15 +401,15 @@ class ListTransferScheduleTestCase(test_base.CoriolisBaseTestCase):
     def setUp(self):
         self.mock_app = mock.Mock()
         super(ListTransferScheduleTestCase, self).setUp()
-        self.transfer = transfer_schedules.ListTransferSchedule(
+        self.transfer_schedules = transfer_schedules.ListTransferSchedule(
             self.mock_app, mock.sentinel.app_args)
 
     @mock.patch.object(lister.Lister, 'get_parser')
     def test_get_parser(
         self,
         mock_get_parser
     ):
-        result = self.transfer.get_parser(mock.sentinel.prog_name)
+        result = self.transfer_schedules.get_parser(mock.sentinel.prog_name)
 
         self.assertEqual(
             mock_get_parser.return_value,
@@ -421,7 +430,7 @@ def test_take_action(
         self.mock_app.client_manager.coriolis.transfer_schedules.list = \
             mock_transfer_list
 
-        result = self.transfer.take_action(args)
+        result = self.transfer_schedules.take_action(args)
 
         self.assertEqual(
             mock_list_objects.return_value,

coriolisclient/tests/cli/test_transfers.py

@@ -214,6 +214,8 @@ def test_get_formatted_data(
             mock.sentinel.formatted_executions
         mock_obj.info = mock.sentinel.info
         mock_obj.scenario = mock.sentinel.scenario
+        mock_obj.clone_disks = mock.sentinel.clone_disks
+        mock_obj.skip_os_morphing = mock.sentinel.skip_os_morphing
         expected_result = [
             mock.sentinel.id,
             mock.sentinel.created_at,
@@ -234,8 +236,10 @@ def test_get_formatted_data(
             mock.sentinel.backend_mappings,
             mock.sentinel.default_storage,
             mock.sentinel.user_scripts,
+            mock.sentinel.clone_disks,
+            mock.sentinel.skip_os_morphing,
             mock.sentinel.formatted_executions,
-            mock.sentinel.info
+            mock.sentinel.info,
         ]
 
         result = self.transfer._get_formatted_data(mock_obj)
@@ -293,6 +297,8 @@ def test_take_action(
             {'instance_id': "instance_id1", 'pool_id': "pool_id1"},
             {'instance_id': "instance_id2", 'pool_id': "pool_id2"}
         ]
+        args.clone_disks = True
+        args.skip_os_morphing = False
         mock_endpoints = mock.Mock()
         mock_transfers = mock.Mock()
         self.mock_app.client_manager.coriolis.endpoints = mock_endpoints
@@ -330,7 +336,8 @@ def test_take_action(
             mock.sentinel.destination_minion_pool_id,
             instance_osmorphing_minion_pool_mappings={
                 'instance_id1': 'pool_id1', 'instance_id2': 'pool_id2'},
-            user_scripts=mock_compose_user_scripts.return_value
+            user_scripts=mock_compose_user_scripts.return_value,
+            clone_disks=True, skip_os_morphing=False,
         )
         mock_get_formatted_entity.assert_called_once_with(
             mock_transfers.return_value)
@@ -520,6 +527,8 @@ def test_take_action(
             {"instance_id": "mock_instance1", "pool_id": "mock_pool1"},
             {"instance_id": "mock_instance2", "pool_id": "mock_pool2"}
         ]
+        args.clone_disks = True
+        args.skip_os_morphing = False
         mock_transfer = mock.Mock()
         self.mock_app.client_manager.coriolis.transfers = mock_transfer
         mock_get_option_value_from_args.side_effect = [
@@ -541,7 +550,9 @@ def test_take_action(
             mock.sentinel.destination_minion_pool_id,
             "instance_osmorphing_minion_pool_mappings":
             {"mock_instance1": "mock_pool1", "mock_instance2": "mock_pool2"},
-            "user_scripts": mock.sentinel.user_scripts
+            "user_scripts": mock.sentinel.user_scripts,
+            "clone_disks": True,
+            "skip_os_morphing": False,
         }
 
         result = self.transfer.take_action(args)

coriolisclient/tests/v1/test_transfer_executions.py

@@ -68,13 +68,15 @@ def test_get(self, mock_get):
     @mock.patch.object(transfer_executions.TransferExecutionManager, "_post")
     def test_create(self, mock_post):
         expected_data = {
-            "shutdown_instances": mock.sentinel.shutdown_instances
+            "shutdown_instances": mock.sentinel.shutdown_instances,
+            "auto_deploy": mock.sentinel.auto_deploy,
         }
         expected_data = {"execution": expected_data}
 
         result = self.transfer_execution.create(
             mock.sentinel.transfer,
-            shutdown_instances=mock.sentinel.shutdown_instances
+            shutdown_instances=mock.sentinel.shutdown_instances,
+            auto_deploy=mock.sentinel.auto_deploy,
         )
 
         self.assertEqual(

coriolisclient/tests/v1/test_transfer_schedules.py

@@ -63,15 +63,17 @@ def test_create(self, mock_post):
             "schedule": mock.sentinel.schedule,
             "enabled": True,
             "expiration_date": '2034-11-26T00:00:00Z',
-            "shutdown_instance": mock.sentinel.shutdown_instance
+            "shutdown_instance": mock.sentinel.shutdown_instance,
+            "auto_deploy": mock.sentinel.auto_deploy,
         }
 
         result = self.transfer_schedule.create(
             mock.sentinel.transfer,
             mock.sentinel.schedule,
             True,
             expiration_date,
-            mock.sentinel.shutdown_instance
+            mock.sentinel.shutdown_instance,
+            mock.sentinel.auto_deploy,
         )
 
         self.assertEqual(

coriolisclient/tests/v1/test_transfers.py

@@ -129,6 +129,8 @@ def test_create(self, mock_post):
                 mock.sentinel.destination_minion_pool_id,
             "instance_osmorphing_minion_pool_mappings":
                 mock.sentinel.instance_osmorphing_minion_pool_mappings,
+            "clone_disks": True,
+            "skip_os_morphing": False,
         }
         expected_data = {"transfer": expected_data}
 
@@ -151,6 +153,8 @@ def test_create(self, mock_post):
             mock.sentinel.destination_minion_pool_id,
             instance_osmorphing_minion_pool_mappings=
             mock.sentinel.instance_osmorphing_minion_pool_mappings,
+            clone_disks=True,
+            skip_os_morphing=False,
         )
 
         self.assertEqual(