Parcourir la source

Rename 'DEPLOY_REPLICA_INSTANCE' task to 'DEPLOY_REPLICA_INSTANCE_RESOURCES'.

Nashwan Azhari il y a 5 ans
Parent
commit
969a546d5f

+ 4 - 2
coriolis/conductor/rpc/server.py

@@ -935,8 +935,10 @@ class ConductorServerEndpoint(object):
                     validate_replica_deployment_inputs_task.id])
 
             deploy_replica_task = self._create_task(
-                instance, constants.TASK_TYPE_DEPLOY_REPLICA_INSTANCE,
-                execution, [create_snapshot_task.id])
+                instance,
+                constants.TASK_TYPE_DEPLOY_REPLICA_INSTANCE_RESOURCES,
+                execution,
+                depends_on=[create_snapshot_task.id])
 
             depends_on = [deploy_replica_task.id]
             if not skip_os_morphing:

+ 2 - 1
coriolis/constants.py

@@ -99,7 +99,8 @@ TASK_TYPE_DELETE_REPLICA_SOURCE_RESOURCES = "DELETE_REPLICA_SOURCE_RESOURCES"
 TASK_TYPE_DEPLOY_REPLICA_TARGET_RESOURCES = "DEPLOY_REPLICA_TARGET_RESOURCES"
 TASK_TYPE_DELETE_REPLICA_TARGET_RESOURCES = "DELETE_REPLICA_TARGET_RESOURCES"
 TASK_TYPE_SHUTDOWN_INSTANCE = "SHUTDOWN_INSTANCE"
-TASK_TYPE_DEPLOY_REPLICA_INSTANCE = "DEPLOY_REPLICA_INSTANCE"
+TASK_TYPE_DEPLOY_REPLICA_INSTANCE_RESOURCES = (
+    "DEPLOY_REPLICA_INSTANCE_RESOURCES")
 TASK_TYPE_FINALIZE_REPLICA_INSTANCE_DEPLOYMENT = (
     "FINALIZE_REPLICA_INSTANCE_DEPLOYMENT")
 TASK_TYPE_CLEANUP_FAILED_REPLICA_INSTANCE_DEPLOYMENT = (

+ 2 - 2
coriolis/tasks/factory.py

@@ -60,8 +60,8 @@ _TASKS_MAP = {
         replica_tasks.DeployReplicaSourceResourcesTask,
     constants.TASK_TYPE_DELETE_REPLICA_SOURCE_RESOURCES:
         replica_tasks.DeleteReplicaSourceResourcesTask,
-    constants.TASK_TYPE_DEPLOY_REPLICA_INSTANCE:
-        replica_tasks.DeployReplicaInstanceTask,
+    constants.TASK_TYPE_DEPLOY_REPLICA_INSTANCE_RESOURCES:
+        replica_tasks.DeployReplicaInstanceResourcesTask,
     constants.TASK_TYPE_FINALIZE_REPLICA_INSTANCE_DEPLOYMENT:
         replica_tasks.FinalizeReplicaInstanceDeploymentTask,
     constants.TASK_TYPE_CLEANUP_FAILED_REPLICA_INSTANCE_DEPLOYMENT:

+ 2 - 1
coriolis/tasks/migration_tasks.py

@@ -106,5 +106,6 @@ class DeleteMigrationTargetResourcesTask(
     pass
 
 
-class DeployInstanceResourcesTask(replica_tasks.DeployReplicaInstanceTask):
+class DeployInstanceResourcesTask(
+        replica_tasks.DeployReplicaInstanceResourcesTask):
     pass

+ 1 - 1
coriolis/tasks/replica_tasks.py

@@ -498,7 +498,7 @@ class DeleteReplicaTargetResourcesTask(base.TaskRunner):
             "target_resources_connection_info": None}
 
 
-class DeployReplicaInstanceTask(base.TaskRunner):
+class DeployReplicaInstanceResourcesTask(base.TaskRunner):
 
     @property
     def required_task_info_properties(self):