Skip to content

Commit c40b30b

Browse files
committed
Remove ImagetransferProgress Command
1 parent 07bca60 commit c40b30b

File tree

8 files changed

+1
-343
lines changed

8 files changed

+1
-343
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ public class ImageTransferResponse extends BaseResponse {
6262
@Param(description = "the image transfer direction: upload / download")
6363
private String direction;
6464

65-
@SerializedName("progress")
66-
@Param(description = "progress in percentage for the upload image transfer")
67-
private Integer progress;
68-
6965
@SerializedName(ApiConstants.CREATED)
7066
@Param(description = "the date created")
7167
private Date created;
@@ -102,10 +98,6 @@ public void setDirection(String direction) {
10298
this.direction = direction;
10399
}
104100

105-
public void setProgress(Integer progress) {
106-
this.progress = progress;
107-
}
108-
109101
public void setCreated(Date created) {
110102
this.created = created;
111103
}

api/src/main/java/org/apache/cloudstack/backup/KVMBackupExportService.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
*/
3939
public interface KVMBackupExportService extends Configurable, PluggableService {
4040

41-
ConfigKey<Long> ImageTransferPollingInterval = new ConfigKey<>("Advanced", Long.class,
42-
"image.transfer.polling.interval",
43-
"10",
44-
"The image transfer progress polling interval in seconds.", true, ConfigKey.Scope.Global);
45-
4641
ConfigKey<Integer> ImageTransferIdleTimeoutSeconds = new ConfigKey<>("Advanced", Integer.class,
4742
"image.transfer.idle.timeout.seconds",
4843
"600",

core/src/main/java/org/apache/cloudstack/backup/GetImageTransferProgressAnswer.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

core/src/main/java/org/apache/cloudstack/backup/GetImageTransferProgressCommand.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

engine/schema/src/main/java/org/apache/cloudstack/backup/ImageTransferVO.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ public class ImageTransferVO implements ImageTransfer {
7575
@Column(name = "signed_ticket_id")
7676
private String signedTicketId;
7777

78-
@Column(name = "progress")
79-
private Integer progress;
80-
8178
@Column(name = "account_id")
8279
Long accountId;
8380

@@ -210,15 +207,6 @@ public void setSignedTicketId(String signedTicketId) {
210207
this.signedTicketId = signedTicketId;
211208
}
212209

213-
public Integer getProgress() {
214-
return progress;
215-
}
216-
217-
public void setProgress(Integer progress) {
218-
this.progress = progress;
219-
this.updated = new Date();
220-
}
221-
222210
@Override
223211
public Class<?> getEntityType() {
224212
return ImageTransfer.class;

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetImageTransferProgressCommandWrapper.java

Lines changed: 0 additions & 95 deletions
This file was deleted.

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/ImageTransferVOToImageTransferConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static ImageTransfer toImageTransfer(ImageTransferVO vo, final Function<L
4242
final String basePath = VeeamControlService.ContextPath.value();
4343
imageTransfer.setId(vo.getUuid());
4444
imageTransfer.setHref(basePath + ImageTransfersRouteHandler.BASE_ROUTE + "/" + vo.getUuid());
45-
imageTransfer.setActive(Boolean.toString(vo.getProgress() != null && vo.getProgress() > 0 && vo.getProgress() < 100));
45+
imageTransfer.setActive(Boolean.toString(org.apache.cloudstack.backup.ImageTransfer.Phase.transferring.equals(vo.getPhase())));
4646
imageTransfer.setDirection(vo.getDirection().name());
4747
imageTransfer.setFormat("cow");
4848
imageTransfer.setInactivityTimeout(Integer.toString(3600));

0 commit comments

Comments
 (0)