From 769c79ab053196f0250c8ff92f0b049edfb0a7a7 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 11 Feb 2020 22:12:54 +0000 Subject: [PATCH 1/3] test: do not associate public ip in test while deploy vm --- test/integration/smoke/test_vm_life_cycle.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 23aa16110121..3def05346a47 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -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, From 1375b40d34dee0d9eb4780019de688b06024b411 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 12 Feb 2020 17:02:12 +0000 Subject: [PATCH 2/3] simulator: remove template/volume only if it exist --- .../com/cloud/agent/manager/MockStorageManagerImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java index de12f3b433ff..299aed04ff02 100644 --- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -823,12 +823,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(); From db4a7f17dc89e306bd4202e193f32be0d0c57f12 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 12 Feb 2020 19:00:07 +0000 Subject: [PATCH 3/3] simulator: fix build error --- .../java/com/cloud/agent/manager/MockStorageManagerImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java index 299aed04ff02..efa9510a8e1c 100644 --- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -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;