Skip to content

simulator: fix travis failure after merging volume destroy/recover #3880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 3 commits into from
Feb 13, 2020
Merged

simulator: fix travis failure after merging volume destroy/recover #3880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
769c79a
test: do not associate public ip in test while deploy vm
ustcweizhou Feb 11, 2020
1375b40
simulator: remove template/volume only if it exist
ustcweizhou Feb 12, 2020
db4a7f1
simulator: fix build error
ustcweizhou Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions ...s/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.apache.cloudstack.storage.command.UploadStatusAnswer;
import org.apache.cloudstack.storage.command.UploadStatusAnswer.UploadStatus;
import org.apache.cloudstack.storage.command.UploadStatusCommand;
import org.apache.cloudstack.storage.to.VolumeObjectTO;

import com.cloud.agent.api.Answer;
import com.cloud.agent.api.AttachIsoCommand;
Expand Down Expand Up @@ -823,12 +822,7 @@ public Answer Delete(DeleteCommand cmd) {
try {
txn.start();
MockVolumeVO template = _mockVolumeDao.findByStoragePathAndType(cmd.getData().getPath());
if (template == null) {
if(!((VolumeObjectTO)cmd.getData()).getName().startsWith("ROOT-")) {
return new Answer(cmd, false, "can't find object to delete:" + cmd.getData()
.getPath());
}
} else {
if (template != null) {
_mockVolumeDao.remove(template.getId());
}
txn.commit();
Expand Down
1 change: 0 additions & 1 deletion test/integration/smoke/test_vm_life_cycle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,6 @@ def test_11_destroy_vm_and_volumes(self):
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.small_offering.id,
mode=self.services["mode"]
)
vol1 = Volume.create(
self.apiclient,
Expand Down