From 77f05795dfdc137495956ddcdb493743cba94c20 Mon Sep 17 00:00:00 2001 From: andreisavu Date: Mon, 21 Nov 2011 12:06:13 +0200 Subject: [PATCH 1/2] Defined new predicate to check if a VM is expunged --- .../predicates/VirtualMachineExpunged.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java new file mode 100644 index 0000000000..be81ab6f1b --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java @@ -0,0 +1,60 @@ +/** + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jclouds.cloudstack.predicates; + +import com.google.common.base.Predicate; +import com.google.inject.Inject; +import org.jclouds.cloudstack.CloudStackClient; +import org.jclouds.cloudstack.domain.VirtualMachine; +import org.jclouds.cloudstack.domain.VirtualMachine.State; +import org.jclouds.logging.Logger; + +import javax.annotation.Resource; +import javax.inject.Singleton; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * + * Tests to see if a virtualMachine is expunged from the system + * + * @author Adrian Cole + */ +@Singleton +public class VirtualMachineExpunged implements Predicate { + + private final CloudStackClient client; + + @Resource + protected Logger logger = Logger.NULL; + + @Inject + public VirtualMachineExpunged(CloudStackClient client) { + this.client = client; + } + + public boolean apply(VirtualMachine virtualMachine) { + logger.trace("looking for state on virtualMachine %s", checkNotNull(virtualMachine, "virtualMachine")); + return refresh(virtualMachine) == null; + } + + private VirtualMachine refresh(VirtualMachine virtualMachine) { + return client.getVirtualMachineClient().getVirtualMachine(virtualMachine.getId()); + } +} From eed9501a1ce0a6601b29fcfc350f787adfe16ebb Mon Sep 17 00:00:00 2001 From: andreisavu Date: Tue, 29 Nov 2011 14:01:45 +0200 Subject: [PATCH 2/2] Added unit test for VirtualMachineExpunged predicate --- .../predicates/VirtualMachineExpunged.java | 2 +- .../VirtualMachineExpungedTest.java | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java index be81ab6f1b..3873b1e5a2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java @@ -34,7 +34,7 @@ import static com.google.common.base.Preconditions.checkNotNull; * * Tests to see if a virtualMachine is expunged from the system * - * @author Adrian Cole + * @author Andrei Savu */ @Singleton public class VirtualMachineExpunged implements Predicate { diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java new file mode 100644 index 0000000000..380c022488 --- /dev/null +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java @@ -0,0 +1,56 @@ +/** + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.jclouds.cloudstack.predicates; + +import org.jclouds.cloudstack.CloudStackClient; +import org.jclouds.cloudstack.domain.VirtualMachine; +import org.jclouds.cloudstack.features.VirtualMachineClient; +import org.testng.annotations.Test; + +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.testng.Assert.assertTrue; + +/** + * @author Andrei Savu + */ +@Test(groups = "unit", testName = "VirtualMachineExpungedTest") +public class VirtualMachineExpungedTest { + + @Test + public void testWaitForVirtualMachineToBeExpunged() { + CloudStackClient client = createMock(CloudStackClient.class); + VirtualMachineClient virtualMachineClient = createMock(VirtualMachineClient.class); + + long virtualMachineId = 229; + VirtualMachine virtualMachine = VirtualMachine.builder().id(virtualMachineId).build(); + + expect(client.getVirtualMachineClient()).andReturn(virtualMachineClient); + expect(virtualMachineClient.getVirtualMachine(virtualMachineId)).andReturn(null); + + replay(client, virtualMachineClient); + + assertTrue(new VirtualMachineExpunged(client).apply(virtualMachine)); + + verify(client, virtualMachineClient); + } +}