You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/04/09 20:28:56 UTC
[2/2] git commit: JCLOUDS-317: Fix NPE when ComputeService.listNodes()
JCLOUDS-317: Fix NPE when ComputeService.listNodes()
Follow-up to f4aaf70
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5b9f6b76
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5b9f6b76
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5b9f6b76
Branch: refs/heads/1.7.x
Commit: 5b9f6b76465249d6b51a5820130258cfd0a52256
Parents: 19e58f6
Author: Everett Toews <ev...@rackspace.com>
Authored: Wed Apr 9 09:52:56 2014 -0600
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Apr 9 14:27:37 2014 -0400
----------------------------------------------------------------------
.../config/NovaComputeServiceContextModule.java | 39 ++++++++++++--------
.../ServerInZoneToNodeMetadataTest.java | 9 ++++-
2 files changed, 32 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5b9f6b76/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java
index 311d4ab..cd00ce1 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java
@@ -236,21 +236,30 @@ public class NovaComputeServiceContextModule extends
@VisibleForTesting
public static final Map<Server.Status, NodeMetadata.Status> toPortableNodeStatus = ImmutableMap
- .<Server.Status, NodeMetadata.Status> builder().put(Server.Status.ACTIVE, NodeMetadata.Status.RUNNING)//
- .put(Server.Status.SUSPENDED, NodeMetadata.Status.SUSPENDED)//
- .put(Server.Status.DELETED, NodeMetadata.Status.TERMINATED)//
- .put(Server.Status.PAUSED, NodeMetadata.Status.SUSPENDED)//
- .put(Server.Status.RESIZE, NodeMetadata.Status.PENDING)//
- .put(Server.Status.VERIFY_RESIZE, NodeMetadata.Status.PENDING)//
- .put(Server.Status.REVERT_RESIZE, NodeMetadata.Status.PENDING)//
- .put(Server.Status.BUILD, NodeMetadata.Status.PENDING)//
- .put(Server.Status.PASSWORD, NodeMetadata.Status.PENDING)//
- .put(Server.Status.REBUILD, NodeMetadata.Status.PENDING)//
- .put(Server.Status.ERROR, NodeMetadata.Status.ERROR)//
- .put(Server.Status.REBOOT, NodeMetadata.Status.PENDING)//
- .put(Server.Status.HARD_REBOOT, NodeMetadata.Status.PENDING)//
- .put(Server.Status.UNKNOWN, NodeMetadata.Status.UNRECOGNIZED)//
- .put(Server.Status.UNRECOGNIZED, NodeMetadata.Status.UNRECOGNIZED).build();
+ .<Server.Status, NodeMetadata.Status> builder()
+ .put(Server.Status.ACTIVE, NodeMetadata.Status.RUNNING)
+ .put(Server.Status.BUILD, NodeMetadata.Status.PENDING)
+ .put(Server.Status.DELETED, NodeMetadata.Status.TERMINATED)
+ .put(Server.Status.ERROR, NodeMetadata.Status.ERROR)
+ .put(Server.Status.HARD_REBOOT, NodeMetadata.Status.PENDING)
+ .put(Server.Status.MIGRATING, NodeMetadata.Status.PENDING)
+ .put(Server.Status.PASSWORD, NodeMetadata.Status.PENDING)
+ .put(Server.Status.PAUSED, NodeMetadata.Status.SUSPENDED)
+ .put(Server.Status.REBOOT, NodeMetadata.Status.PENDING)
+ .put(Server.Status.REBUILD, NodeMetadata.Status.PENDING)
+ .put(Server.Status.RESCUE, NodeMetadata.Status.PENDING)
+ .put(Server.Status.RESIZE, NodeMetadata.Status.PENDING)
+ .put(Server.Status.REVERT_RESIZE, NodeMetadata.Status.PENDING)
+ .put(Server.Status.SHELVED, NodeMetadata.Status.SUSPENDED)
+ .put(Server.Status.SHELVED_OFFLOADED, NodeMetadata.Status.SUSPENDED)
+ .put(Server.Status.SHUTOFF, NodeMetadata.Status.SUSPENDED)
+ .put(Server.Status.SOFT_DELETED, NodeMetadata.Status.TERMINATED)
+ .put(Server.Status.STOPPED, NodeMetadata.Status.SUSPENDED)
+ .put(Server.Status.SUSPENDED, NodeMetadata.Status.SUSPENDED)
+ .put(Server.Status.UNKNOWN, NodeMetadata.Status.UNRECOGNIZED)
+ .put(Server.Status.UNRECOGNIZED, NodeMetadata.Status.UNRECOGNIZED)
+ .put(Server.Status.VERIFY_RESIZE, NodeMetadata.Status.PENDING)
+ .build();
@Singleton
@Provides
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5b9f6b76/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
index 7ef9fa7..72b82d5 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
@@ -196,7 +196,14 @@ public class ServerInZoneToNodeMetadataTest {
assertEquals(convertedNodeMetadata.getPublicAddresses(), ImmutableSet.of("67.23.10.132", "67.23.10.131", "76.32.1.231"));
}
- // TODO: clean up this syntax
+ @Test
+ public void testPortableNodeStatusNotNull() {
+ for (Server.Status serverStatus: Server.Status.values()) {
+ assertNotNull(NovaComputeServiceContextModule.toPortableNodeStatus.get(serverStatus));
+ }
+ }
+
+ // TODO: clean up this syntax
private void checkHardwareAndImageStatus(Hardware expectedHardware, Hardware existingHardware,
String expectedImageId, OperatingSystem expectedOs, Image existingImage) {