Skip to content

Commit 80ca088

Browse files
weizhouapacheDaanHoogland
authored andcommitted
gson2: fix conflicted SerializedName in ClusterDrsPlanMigrationResponse
1 parent 61d8883 commit 80ca088

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ public class ApiConstants {
302302
public static final String MIN_CPU_NUMBER = "mincpunumber";
303303
public static final String MIN_MEMORY = "minmemory";
304304
public static final String MIGRATION_TYPE = "migrationtype";
305+
public static final String MIGRATION_JOB_ID = "migrationjobid";
306+
public static final String MIGRATION_JOB_STATUS = "migrationjobstatus";
305307
public static final String MIGRATIONS = "migrations";
306308
public static final String MEMORY = "memory";
307309
public static final String MODE = "mode";

api/src/main/java/org/apache/cloudstack/api/response/ClusterDrsPlanMigrationResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ public class ClusterDrsPlanMigrationResponse extends BaseResponse {
5050
@Param(description = "Destination host for VM migration")
5151
String destHostName;
5252

53-
@SerializedName(ApiConstants.JOB_ID)
53+
@SerializedName(ApiConstants.MIGRATION_JOB_ID)
5454
@Param(description = "id of VM migration async job")
5555
private Long migrationJobId;
5656

57-
@SerializedName(ApiConstants.JOB_STATUS)
57+
@SerializedName(ApiConstants.MIGRATION_JOB_STATUS)
5858
@Param(description = "Job status of VM migration async job")
5959
private JobInfo.Status migrationJobStatus;
6060

0 commit comments

Comments
 (0)