Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-317: Fix NPE when ComputeService.listNodes() 

Follow-up to 222779b
This commit is contained in:
Everett Toews 2014-04-09 09:52:56 -06:00 committed by Andrew Phillips
parent 244e194c72
commit 84e0b91179
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java
View File

@ -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

9
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
View File

@ -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) {