Skip to content

Commit 9931876

Browse files
committed
fix compile, after rebase to master
1 parent 36146e7 commit 9931876

8 files changed

Lines changed: 483 additions & 21 deletions

File tree

core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,27 @@
1717
package com.cloud.agent.api;
1818

1919
import java.util.List;
20+
21+
import org.apache.cloudstack.storage.to.VolumeObjectTO;
22+
23+
import com.cloud.agent.api.to.DiskTO;
2024
import com.cloud.agent.api.to.VolumeTO;
2125

2226
public class MigrateWithStorageAnswer extends Answer {
2327

24-
List<VolumeTO> volumeTos;
28+
List<VolumeObjectTO> volumeTos;
2529

2630
public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, Exception ex) {
2731
super(cmd, ex);
2832
volumeTos = null;
2933
}
3034

31-
public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, List<VolumeTO> volumeTos) {
35+
public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, List<VolumeObjectTO> volumeTos) {
3236
super(cmd, true, null);
3337
this.volumeTos = volumeTos;
3438
}
3539

36-
public List<VolumeTO> getVolumeTos() {
40+
public List<VolumeObjectTO> getVolumeTos() {
3741
return volumeTos;
3842
}
3943
}

core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,25 @@
1717
package com.cloud.agent.api;
1818

1919
import java.util.List;
20+
21+
import org.apache.cloudstack.storage.to.VolumeObjectTO;
22+
2023
import com.cloud.agent.api.to.VolumeTO;
2124

2225
public class MigrateWithStorageCompleteAnswer extends Answer {
23-
List<VolumeTO> volumeTos;
26+
List<VolumeObjectTO> volumeTos;
2427

2528
public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, Exception ex) {
2629
super(cmd, ex);
2730
volumeTos = null;
2831
}
2932

30-
public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, List<VolumeTO> volumeTos) {
33+
public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, List<VolumeObjectTO> volumeTos) {
3134
super(cmd, true, null);
3235
this.volumeTos = volumeTos;
3336
}
3437

35-
public List<VolumeTO> getVolumeTos() {
38+
public List<VolumeObjectTO> getVolumeTos() {
3639
return volumeTos;
3740
}
3841
}

0 commit comments

Comments
 (0)