From f71e1d57807b6aed784e530e8ca8eca9549f754e Mon Sep 17 00:00:00 2001 From: David Ribeiro Alves Date: Thu, 10 May 2012 19:31:50 +0100 Subject: [PATCH] fixed a transient status bug in openstack-nova (working on hpcloud) --- ...eWhenImageInZoneHasActiveStatusPredicateWithResult.java | 7 ++++--- .../compute/HPCloudComputeImageExtensionLivetest.java | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/GetImageWhenImageInZoneHasActiveStatusPredicateWithResult.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/GetImageWhenImageInZoneHasActiveStatusPredicateWithResult.java index fb8f73e83e..ddf0eb5c1c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/GetImageWhenImageInZoneHasActiveStatusPredicateWithResult.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/GetImageWhenImageInZoneHasActiveStatusPredicateWithResult.java @@ -66,13 +66,14 @@ public final class GetImageWhenImageInZoneHasActiveStatusPredicateWithResult imp resultZoneAndId = input; switch (result.getStatus()) { case ACTIVE: - logger.info("<< Image %s is available for use.", input.getId()); + logger.info("<< Image %s is available for use. %s", input.getId(), result); return true; + case UNRECOGNIZED: case SAVING: - logger.debug("<< Image %s is not available yet.", input.getId()); + logger.debug("<< Image %s is not available yet. %s", input.getId(), result); return false; default: - lastFailure = new IllegalStateException("Image was not created: " + input.getId()); + lastFailure = new IllegalStateException("Image " + input.getId() + " was not created. " + result); throw lastFailure; } } diff --git a/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeImageExtensionLivetest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeImageExtensionLivetest.java index 852ce623f5..f632f51cc0 100644 --- a/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeImageExtensionLivetest.java +++ b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeImageExtensionLivetest.java @@ -41,9 +41,4 @@ public class HPCloudComputeImageExtensionLivetest extends BaseImageExtensionLive protected Module getSshModule() { return new SshjSshClientModule(); } - - @Override - public long getSpawnNodeMaxWait() { - return 2400L; - } }