Repository: jclouds Updated Branches: refs/heads/2.1.x 491911ec1 -> cce23c1f2
JCLOUDS-1418: Add missing PowerState values Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cce23c1f Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cce23c1f Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cce23c1f Branch: refs/heads/2.1.x Commit: cce23c1f27b83173fbfac326cbdfd5700849c8c3 Parents: 491911e Author: Ignasi Barrera <[email protected]> Authored: Tue May 15 15:19:49 2018 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed May 16 12:30:51 2018 +0200 ---------------------------------------------------------------------- .../functions/VirtualMachineToStatus.java | 9 +- .../arm/domain/VirtualMachineInstance.java | 11 +- .../functions/VirtualMachineToStatusTest.java | 158 +++++++++++++++++++ 3 files changed, 174 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/cce23c1f/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java index 9669f50..324e6ea 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatus.java @@ -73,9 +73,14 @@ public class VirtualMachineToStatus implements Function<VirtualMachine, StatusAn .build(), NodeMetadata.Status.UNRECOGNIZED); private static final Function<PowerState, NodeMetadata.Status> POWERSTATE_TO_NODESTATUS = Functions.forMap( - ImmutableMap.<PowerState, NodeMetadata.Status> builder().put(PowerState.RUNNING, NodeMetadata.Status.RUNNING) + ImmutableMap.<PowerState, NodeMetadata.Status> builder() + .put(PowerState.RUNNING, NodeMetadata.Status.RUNNING) + .put(PowerState.STARTING, NodeMetadata.Status.PENDING) .put(PowerState.STOPPED, NodeMetadata.Status.SUSPENDED) - .put(PowerState.UNRECOGNIZED, NodeMetadata.Status.UNRECOGNIZED).build(), + .put(PowerState.STOPPING, NodeMetadata.Status.PENDING) + .put(PowerState.DEALLOCATED, NodeMetadata.Status.SUSPENDED) + .put(PowerState.DEALLOCATING, NodeMetadata.Status.PENDING) + .put(PowerState.UNKNOWN, NodeMetadata.Status.UNRECOGNIZED).build(), NodeMetadata.Status.UNRECOGNIZED); private final AzureComputeApi api; http://git-wip-us.apache.org/repos/asf/jclouds/blob/cce23c1f/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java index 66ef283..47bd5d6 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/VirtualMachineInstance.java @@ -41,13 +41,20 @@ public abstract class VirtualMachineInstance { public static final String PROVISIONING_STATE_PREFIX = "ProvisioningState/"; public static final String POWER_STATE_PREFIX = "PowerState/"; + /** + * @see <a href="https://docs.microsoft.com/en-us/java/api/com.microsoft.azure.management.compute._power_state"; /> + */ public enum PowerState { RUNNING, + STARTING, STOPPED, - UNRECOGNIZED; + STOPPING, + DEALLOCATED, + DEALLOCATING, + UNKNOWN; public static PowerState fromValue(final String text) { - return (PowerState) GetEnumValue.fromValueOrDefault(text, PowerState.UNRECOGNIZED); + return (PowerState) GetEnumValue.fromValueOrDefault(text, PowerState.UNKNOWN); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/cce23c1f/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatusTest.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatusTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatusTest.java new file mode 100644 index 0000000..0fbad7b --- /dev/null +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToStatusTest.java @@ -0,0 +1,158 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.azurecompute.arm.compute.functions; + +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.assertEquals; + +import java.util.Collections; + +import org.jclouds.azurecompute.arm.AzureComputeApi; +import org.jclouds.azurecompute.arm.domain.Status; +import org.jclouds.azurecompute.arm.domain.VirtualMachine; +import org.jclouds.azurecompute.arm.domain.VirtualMachineInstance; +import org.jclouds.azurecompute.arm.domain.VirtualMachineInstance.PowerState; +import org.jclouds.azurecompute.arm.domain.VirtualMachineProperties; +import org.jclouds.azurecompute.arm.domain.VirtualMachineProperties.ProvisioningState; +import org.jclouds.azurecompute.arm.features.VirtualMachineApi; +import org.jclouds.compute.domain.NodeMetadata; +import org.testng.annotations.Test; + +@Test(groups = "unit", testName = "VirtualMachineToStatusTest") +public class VirtualMachineToStatusTest { + + @Test + public void testError() { + assertStatus(ProvisioningState.FAILED, null, NodeMetadata.Status.ERROR); + } + + @Test + public void testUnrecognized() { + assertStatus(ProvisioningState.UNRECOGNIZED, null, NodeMetadata.Status.UNRECOGNIZED); + assertStatus(ProvisioningState.SUCCEEDED, PowerState.UNKNOWN, NodeMetadata.Status.UNRECOGNIZED); + } + + @Test + public void testTerminated() { + assertStatus(ProvisioningState.DELETED, null, NodeMetadata.Status.TERMINATED); + assertStatus(ProvisioningState.CANCELED, null, NodeMetadata.Status.TERMINATED); + } + + @Test + public void testPending() { + assertStatus(ProvisioningState.ACCEPTED, null, NodeMetadata.Status.PENDING); + assertStatus(ProvisioningState.READY, null, NodeMetadata.Status.PENDING); + assertStatus(ProvisioningState.CREATING, null, NodeMetadata.Status.PENDING); + assertStatus(ProvisioningState.RUNNING, null, NodeMetadata.Status.PENDING); + assertStatus(ProvisioningState.UPDATING, null, NodeMetadata.Status.PENDING); + + assertStatus(ProvisioningState.SUCCEEDED, PowerState.STARTING, NodeMetadata.Status.PENDING); + assertStatus(ProvisioningState.SUCCEEDED, PowerState.STOPPING, NodeMetadata.Status.PENDING); + assertStatus(ProvisioningState.SUCCEEDED, PowerState.DEALLOCATING, NodeMetadata.Status.PENDING); + } + + @Test + public void testSuspended() { + assertStatus(ProvisioningState.SUCCEEDED, PowerState.STOPPED, NodeMetadata.Status.SUSPENDED); + assertStatus(ProvisioningState.SUCCEEDED, PowerState.DEALLOCATED, NodeMetadata.Status.SUSPENDED); + } + + @Test + public void testRunning() { + assertStatus(ProvisioningState.SUCCEEDED, PowerState.RUNNING, NodeMetadata.Status.RUNNING); + } + + @Test + public void testPendingWhenInstanceNotFound() { + AzureComputeApi api = createMock(AzureComputeApi.class); + VirtualMachineApi vmApi = createMock(VirtualMachineApi.class); + VirtualMachine vm = createMock(VirtualMachine.class); + VirtualMachineProperties props = createMock(VirtualMachineProperties.class); + + expect(vm.id()).andReturn("/resourceGroups/test/virtualMachines/vm"); + expect(vm.properties()).andReturn(props); + expect(vm.name()).andReturn("vm"); + expect(props.provisioningState()).andReturn(ProvisioningState.SUCCEEDED); + expect(api.getVirtualMachineApi("test")).andReturn(vmApi); + expect(vmApi.getInstanceDetails("vm")).andReturn(null); + replay(props, vm, vmApi, api); + + assertEquals(new VirtualMachineToStatus(api).apply(vm).status(), NodeMetadata.Status.PENDING); + + verify(props, vm, vmApi, api); + } + + @Test + public void testPendingWhenInstanceHasNoPowerState() { + AzureComputeApi api = createMock(AzureComputeApi.class); + VirtualMachineApi vmApi = createMock(VirtualMachineApi.class); + VirtualMachine vm = createMock(VirtualMachine.class); + VirtualMachineProperties props = createMock(VirtualMachineProperties.class); + VirtualMachineInstance instance = createMock(VirtualMachineInstance.class); + + expect(vm.id()).andReturn("/resourceGroups/test/virtualMachines/vm"); + expect(vm.properties()).andReturn(props); + expect(vm.name()).andReturn("vm"); + expect(props.provisioningState()).andReturn(ProvisioningState.SUCCEEDED); + expect(api.getVirtualMachineApi("test")).andReturn(vmApi); + expect(vmApi.getInstanceDetails("vm")).andReturn(instance); + expect(instance.powerState()).andReturn(null); + replay(props, vm, vmApi, api, instance); + + assertEquals(new VirtualMachineToStatus(api).apply(vm).status(), NodeMetadata.Status.PENDING); + + verify(props, vm, vmApi, api, instance); + } + + private void assertStatus(ProvisioningState provisioningState, PowerState powerState, NodeMetadata.Status expected) { + VirtualMachine vm = createMock(VirtualMachine.class); + VirtualMachineProperties props = createMock(VirtualMachineProperties.class); + + expect(vm.id()).andReturn("/resourceGroups/test/virtualMachines/vm"); + expect(vm.properties()).andReturn(props); + expect(props.provisioningState()).andReturn(provisioningState); + + AzureComputeApi api = null; + VirtualMachineApi vmApi = null; + VirtualMachineInstance instance = null; + + if (powerState != null) { + api = createMock(AzureComputeApi.class); + vmApi = createMock(VirtualMachineApi.class); + instance = createMock(VirtualMachineInstance.class); + + expect(vm.name()).andReturn("vm"); + + expect(api.getVirtualMachineApi("test")).andReturn(vmApi); + expect(vmApi.getInstanceDetails("vm")).andReturn(instance); + expect(instance.powerState()).andReturn(powerState).times(2); + expect(instance.statuses()).andReturn(Collections.<Status> emptyList()); + replay(instance, vmApi, api); + } + replay(props, vm); + + assertEquals(new VirtualMachineToStatus(api).apply(vm).status(), expected); + + verify(props, vm); + if (powerState != null) { + verify(instance, vmApi, api); + } + } +}
