http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java index 053feeb..3e7167d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java @@ -24,7 +24,6 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.openstack.nova.v2_0.domain.BackupType; @@ -64,8 +63,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"suspend\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean suspend(@PathParam("id") String id); + void suspend(@PathParam("id") String id); /** * Resume a server. @@ -76,8 +74,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"resume\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean resume(@PathParam("id") String id); + void resume(@PathParam("id") String id); /** * Migrate a server. @@ -88,8 +85,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"migrate\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean migrate(@PathParam("id") String id); + void migrate(@PathParam("id") String id); /** * Lock a server. @@ -100,8 +96,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"lock\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean lock(@PathParam("id") String id); + void lock(@PathParam("id") String id); /** * Unlock a server. @@ -112,8 +107,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"unlock\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean unlock(@PathParam("id") String id); + void unlock(@PathParam("id") String id); /** * Reset network of a server. @@ -124,8 +118,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"resetNetwork\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean resetNetwork(@PathParam("id") String id); + void resetNetwork(@PathParam("id") String id); /** * Create backup of a server. @@ -156,8 +149,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"pause\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean pause(@PathParam("id") String id); + void pause(@PathParam("id") String id); /** * Unpause a server. @@ -168,8 +160,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"unpause\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean unpause(@PathParam("id") String id); + void unpause(@PathParam("id") String id); /** * Live migrate a server. @@ -180,8 +171,7 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @WrapWith("os-migrateLive") - @Fallback(FalseOnNotFoundOr404.class) - Boolean liveMigrate(@PathParam("id") String id, @PayloadParam("host") String host, + void liveMigrate(@PathParam("id") String id, @PayloadParam("host") String host, @PayloadParam("block_migration") boolean blockMigration, @PayloadParam("disk_over_commit") boolean diskOverCommit); @@ -194,6 +184,5 @@ public interface ServerAdminApi { @POST @Produces(MediaType.APPLICATION_JSON) @Payload("{\"injectNetworkInfo\":null}") - @Fallback(FalseOnNotFoundOr404.class) - Boolean injectNetworkInfo(@PathParam("id") String id); + void injectNetworkInfo(@PathParam("id") String id); }
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java index 943fe4b..01ae826 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApi.java @@ -132,8 +132,7 @@ public interface VolumeTypeApi { @Path("/{id}/extra_specs") @Produces(MediaType.APPLICATION_JSON) @MapBinder(BindToJsonPayload.class) - @Fallback(FalseOnNotFoundOr404.class) - boolean updateExtraSpecs(@PathParam("id") String id, @PayloadParam("extra_specs") Map<String, String> specs); + void updateExtraSpecs(@PathParam("id") String id, @PayloadParam("extra_specs") Map<String, String> specs); /** * Retrieve a single extra spec value @@ -161,8 +160,7 @@ public interface VolumeTypeApi { @Path("/{id}/extra_specs/{key}") @Produces(MediaType.APPLICATION_JSON) @Payload("%7B\"{key}\":\"{value}\"%7D") - @Fallback(FalseOnNotFoundOr404.class) - boolean updateExtraSpec(@PathParam("id") String id, + void updateExtraSpec(@PathParam("id") String id, @PathParam("key") @PayloadParam("key") String key, @PayloadParam("value") String value); http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java index 6d151a6..d9e1498 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/FlavorApi.java @@ -119,8 +119,6 @@ public interface FlavorApi { @POST @Unwrap @Produces(MediaType.APPLICATION_JSON) - @Fallback(NullOnNotFoundOr404.class) - @Nullable Flavor create(@WrapWith("flavor") Flavor flavor); /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java index 025af01..1258c79 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ImageApi.java @@ -117,9 +117,7 @@ public interface ImageApi { /** * Delete the specified image * - * @param id - * id of the image - * @return server or null if not found + * @param id id of the image */ @Named("image:delete") @DELETE @@ -156,7 +154,6 @@ public interface ImageApi { @SelectJson("metadata") @Produces(MediaType.APPLICATION_JSON) @MapBinder(BindToJsonPayload.class) - @Fallback(EmptyMapOnNotFoundOr404.class) Map<String, String> setMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata); /** @@ -174,7 +171,6 @@ public interface ImageApi { @SelectJson("metadata") @Produces(MediaType.APPLICATION_JSON) @MapBinder(BindToJsonPayload.class) - @Fallback(EmptyMapOnNotFoundOr404.class) Map<String, String> updateMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata); /** @@ -210,7 +206,6 @@ public interface ImageApi { @Path("/{id}/metadata/{key}") @ResponseParser(OnlyMetadataValueOrNull.class) @MapBinder(BindMetadataToJsonPayload.class) - @Fallback(NullOnNotFoundOr404.class) @Nullable String updateMetadata(@PathParam("id") String id, @PathParam("key") @PayloadParam("key") String key, @PathParam("value") @PayloadParam("value") String value); http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java index 80f1d9e..42ab1c7 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/features/ServerApi.java @@ -335,7 +335,6 @@ public interface ServerApi { @Path("/{id}/metadata") @SelectJson("metadata") @Produces(MediaType.APPLICATION_JSON) - @Fallback(EmptyMapOnNotFoundOr404.class) @MapBinder(BindToJsonPayload.class) Map<String, String> setMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata); @@ -355,7 +354,6 @@ public interface ServerApi { @Produces(MediaType.APPLICATION_JSON) @SelectJson("metadata") @MapBinder(BindToJsonPayload.class) - @Fallback(EmptyMapOnNotFoundOr404.class) Map<String, String> updateMetadata(@PathParam("id") String id, @PayloadParam("metadata") Map<String, String> metadata); http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java index 3fbe817..a163f02 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java @@ -127,22 +127,6 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); } - public void testListServersWhenReponseIs404IsEmpty() throws Exception { - HttpRequest listServers = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/detail";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listServersResponse = HttpResponse.builder().statusCode(404).build(); - - ComputeService apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, listServers, listServersResponse); - - assertTrue(apiWhenNoServersExist.listNodes().isEmpty()); - } - HttpRequest list = HttpRequest .builder() .method("GET") http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java index 356a849..ae59b3b 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java @@ -17,8 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; import java.net.URI; @@ -29,8 +27,6 @@ import org.jclouds.http.HttpResponse; import org.jclouds.openstack.nova.v2_0.domain.BackupType; import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiExpectTest; import org.jclouds.openstack.nova.v2_0.options.CreateBackupOfServerOptions; -import org.jclouds.rest.AuthorizationException; -import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; @@ -50,31 +46,6 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.suspend("1")); - } - - public void testSuspendFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "suspend").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.suspend("1")); - } - - @Test(expectedExceptions = AuthorizationException.class) - public void testSuspendFailsNotAuthorized() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "suspend").build(), - HttpResponse.builder().statusCode(403).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - api.suspend("1"); } @@ -87,31 +58,6 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.resume("1")); - } - - public void testResumeFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "resume").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.resume("1")); - } - - @Test(expectedExceptions = AuthorizationException.class) - public void testResumeFailsNotAuthorized() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "resume").build(), - HttpResponse.builder().statusCode(403).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - api.resume("1"); } @@ -124,19 +70,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.lock("1")); - } - - public void testLockFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "lock").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.lock("1")); + api.lock("1"); } public void testUnlock() { @@ -148,19 +82,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.unlock("1")); - } - - public void testUnlockFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "unlock").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.unlock("1")); + api.unlock("1"); } public void testPause() { @@ -172,19 +94,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.pause("1")); - } - - public void testPauseFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "pause").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.pause("1")); + api.pause("1"); } public void testUnpause() { @@ -196,19 +106,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.unpause("1")); - } - - public void testUnpauseFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "unpause").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.unpause("1")); + api.unpause("1"); } public void testMigrateServer() { @@ -220,20 +118,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.migrate("1")); - } - - - public void testMigrateServerFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "migrate").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.migrate("1")); + api.migrate("1"); } public void testResetNetworkOfServer() { @@ -245,19 +130,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.resetNetwork("1")); - } - - public void testResetNetworkOfServerFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "resetNetwork").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.resetNetwork("1")); + api.resetNetwork("1"); } public void testInjectNetworkInfoIntoServer() { @@ -269,19 +142,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.injectNetworkInfo("1")); - } - - public void testInjectNetworkInfoIntoServerFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "injectNetworkInfo").build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.injectNetworkInfo("1")); + api.injectNetworkInfo("1"); } public void testBackupServer() { @@ -297,20 +158,6 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { assertEquals(imageId, "1976b3b3-409a-468d-b16c-a9172c341b46"); } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testBackupServerFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).method("POST") - .payload(payloadFromStringWithContentType("{\"createBackup\":{\"backup_type\":\"weekly\",\"rotation\":3,\"name\":\"mybackup\",\"metadata\":{\"some\":\"data or other\"}}}", MediaType.APPLICATION_JSON)).build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - api.createBackup("1", "mybackup", BackupType.WEEKLY, 3, CreateBackupOfServerOptions.Builder.metadata(ImmutableMap.of("some", "data or other"))); - } - public void testLiveMigrateServer() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); ServerAdminApi api = requestsSendResponses( @@ -321,20 +168,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(202).build() ).getServerAdminApi("az-1.region-a.geo-1").get(); - assertTrue(api.liveMigrate("1", "bighost", true, false)); - } - - public void testLiveMigrateServerFailsNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action";); - ServerAdminApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - standardActionRequestBuilderVoidResponse(endpoint, "GONNAOVERWRITE") - .payload(payloadFromStringWithContentType("{\"os-migrateLive\":{\"host\":\"bighost\",\"block_migration\":true,\"disk_over_commit\":false}}", MediaType.APPLICATION_JSON)).build(), - HttpResponse.builder().statusCode(404).build() - ).getServerAdminApi("az-1.region-a.geo-1").get(); - - assertFalse(api.liveMigrate("1", "bighost", true, false)); + api.liveMigrate("1", "bighost", true, false); } protected HttpRequest.Builder<?> standardActionRequestBuilderVoidResponse(URI endpoint, String actionName) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiLiveTest.java index 99b2d62..adc8e46 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiLiveTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiLiveTest.java @@ -106,14 +106,14 @@ public class AdminActionsApiLiveTest extends BaseNovaApiLiveTest { fail("Resumed an active server!"); } catch (HttpResponseException e) { } - assertTrue(api.suspend(testServerId)); + api.suspend(testServerId); blockUntilServerInState(testServerId, serverApi, Status.SUSPENDED); try { api.suspend(testServerId); fail("Suspended an already suspended server!"); } catch (HttpResponseException e) { } - assertTrue(api.resume(testServerId)); + api.resume(testServerId); blockUntilServerInState(testServerId, serverApi, Status.ACTIVE); try { api.resume(testServerId); @@ -128,20 +128,20 @@ public class AdminActionsApiLiveTest extends BaseNovaApiLiveTest { ServerAdminApi api = apiOption.get(); // TODO should we be able to double-lock (as it were) - assertTrue(api.unlock(testServerId)); - assertTrue(api.unlock(testServerId)); - assertTrue(api.lock(testServerId)); - assertTrue(api.lock(testServerId)); - assertTrue(api.unlock(testServerId)); - assertTrue(api.unlock(testServerId)); + api.unlock(testServerId); + api.unlock(testServerId); + api.lock(testServerId); + api.lock(testServerId); + api.unlock(testServerId); + api.unlock(testServerId); } public void testResetNetworkAndInjectNetworkInfo() { skipOnAdminExtensionAbsent(); ServerAdminApi api = apiOption.get(); - assertTrue(api.resetNetwork(testServerId)); - assertTrue(api.injectNetworkInfo(testServerId)); + api.resetNetwork(testServerId); + api.injectNetworkInfo(testServerId); } @Test @@ -155,14 +155,14 @@ public class AdminActionsApiLiveTest extends BaseNovaApiLiveTest { fail("Unpaused active server!"); } catch (HttpResponseException e) { } - assertTrue(api.pause(testServerId)); + api.pause(testServerId); blockUntilServerInState(testServerId, serverApi, Status.PAUSED); try { api.pause(testServerId); fail("paused a paused server!"); } catch (HttpResponseException e) { } - assertTrue(api.unpause(testServerId)); + api.unpause(testServerId); blockUntilServerInState(testServerId, serverApi, Status.ACTIVE); try { api.unpause(testServerId); http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java index f6960cb..d939948 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java @@ -84,21 +84,6 @@ public class AvailabilityZoneApiExpectTest extends BaseNovaApiExpectTest { assertTrue(zone.get().getState().isAvailable(), "Zone: " + zone.get().getName() + " is not available."); } - public void testListAvailabilityZonesWhenResponseIs404() throws Exception { - HttpRequest list = HttpRequest.builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-availability-zone";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess, - extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse); - - assertTrue(apiWhenNoServersExist.getAvailabilityZoneApi("az-1.region-a.geo-1").get().listAvailabilityZones().isEmpty()); - } - public void testListInDetail() throws Exception { HttpRequest list = HttpRequest .builder() @@ -139,18 +124,4 @@ public class AvailabilityZoneApiExpectTest extends BaseNovaApiExpectTest { "Expected Updated time: " + new Date(1436509815000L) + " does match Updated time : " + hostService.getUpdated()); } - public void testListInDetailWhenResponseIs404() throws Exception { - HttpRequest list = HttpRequest.builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-availability-zone/detail";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess, - extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse); - - assertTrue(apiWhenNoServersExist.getAvailabilityZoneApi("az-1.region-a.geo-1").get().listInDetail().isEmpty()); - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApiMockTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApiMockTest.java index 9a5263f..838ebfe 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApiMockTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ConsolesApiMockTest.java @@ -19,7 +19,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static com.google.common.collect.Iterables.getFirst; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import static org.testng.Assert.fail; import org.jclouds.openstack.nova.v2_0.NovaApi; import org.jclouds.openstack.nova.v2_0.domain.Console; @@ -51,34 +50,18 @@ public class ConsolesApiMockTest extends BaseOpenStackMockTest<NovaApi> { getConsole(Console.Type.NOVNC, "/novnc_console.json", new ParseNOVNCConsoleTest().expected()); } - public void getNOVNCConsoleWhenResponseIs404NotFound() throws Exception { - getConsoleWhenResponseIs404NotFound(Console.Type.NOVNC); - } - public void getXVPVNCConsole() throws Exception { getConsole(Console.Type.XVPVNC, "/xvpvnc_console.json", new ParseXVPVNCConsoleTest().expected()); } - public void getXVPVNCConsoleWhenResponseIs404NotFound() throws Exception { - getConsoleWhenResponseIs404NotFound(Console.Type.XVPVNC); - } - public void getSPICEConsole() throws Exception { getConsole(Console.Type.SPICE_HTML5, "/spice_console.json", new ParseSPICEConsoleTest().expected()); } - public void getSPICEConsoleWhenResponseIs404NotFound() throws Exception { - getConsoleWhenResponseIs404NotFound(Console.Type.SPICE_HTML5); - } - public void getRDPConsole() throws Exception { getConsole(Console.Type.RDP_HTML5, "/rdp_console.json", new ParseRDPConsoleTest().expected()); } - public void getRDPConsoleWhenResponseIs404NotFound() throws Exception { - getConsoleWhenResponseIs404NotFound(Console.Type.RDP_HTML5); - } - private void getConsole(Console.Type consoleType, String responseResource, Console expected) throws Exception { String serverId = "5f64fca7-879b-4173-bf9c-8fa88330a4dc"; @@ -105,40 +88,4 @@ public class ConsolesApiMockTest extends BaseOpenStackMockTest<NovaApi> { } } - private void getConsoleWhenResponseIs404NotFound(Console.Type consoleType) throws Exception { - String serverId = "5f64fca7-879b-4173-bf9c-8fa88330a4dc"; - - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json")))); - server.enqueue(addCommonHeaders(new MockResponse() - .setStatus("HTTP/1.1 404 Not Found") - .setBody("{\"itemNotFound\":" + "{\"message\":\"Instance " + serverId - + " could not be found.\",\"code\":404}}") - .setHeader("Content-Type", "application/json; charset=UTF-8"))); - - try { - NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); - - String regionId = getFirst(novaApi.getConfiguredRegions(), "RegionTwo"); - - ConsolesApi consolesApi = novaApi.getConsolesApi(regionId).get(); - - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertEquals(server.takeRequest().getRequestLine(), - "GET /v2/da0d12be20394afb851716e10a49e4a7/extensions HTTP/1.1"); - - try { - consolesApi.getConsole(serverId, consoleType); - fail("expected a ResourceNotFoundException"); - } catch (org.jclouds.rest.ResourceNotFoundException e) { - // expected - } - - } finally { - server.shutdown(); - } - } - } http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java index 8b90de6..7d8b907 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java @@ -17,8 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import java.net.URI; @@ -49,18 +47,6 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest { assertEquals(api.getMetadata("9"), ImmutableMap.of("test", "value1")); } - public void testGetAllExtraSpecsFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/9/os-extra_specs";); - FlavorExtraSpecsApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getFlavorExtraSpecsApi("az-1.region-a.geo-1").get(); - - assertTrue(api.getMetadata("9").isEmpty()); - } - public void testSetAllExtraSpecs() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/9/os-extra_specs";); FlavorExtraSpecsApi api = requestsSendResponses( @@ -72,7 +58,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(200).build() ).getFlavorExtraSpecsApi("az-1.region-a.geo-1").get(); - assertTrue(api.updateMetadata("9", ImmutableMap.of("test1", "somevalue"))); + api.updateMetadata("9", ImmutableMap.of("test1", "somevalue")); } public void testSetExtraSpec() { @@ -86,7 +72,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest { HttpResponse.builder().statusCode(200).build() ).getFlavorExtraSpecsApi("az-1.region-a.geo-1").get(); - assertTrue(api.updateMetadataEntry("5", "test1", "somevalue")); + api.updateMetadataEntry("5", "test1", "somevalue"); } public void testGetExtraSpec() { @@ -101,18 +87,6 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest { assertEquals(api.getMetadataKey("5", "test1"), "another value"); } - public void testGetExtraSpecFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1";); - FlavorExtraSpecsApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getFlavorExtraSpecsApi("az-1.region-a.geo-1").get(); - - assertNull(api.getMetadataKey("5", "test1")); - } - public void testDeleteExtraSpec() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1";); FlavorExtraSpecsApi api = requestsSendResponses( @@ -125,16 +99,4 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest { assertTrue(api.deleteMetadataKey("5", "test1")); } - public void testDeleteExtraSpecFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1";); - FlavorExtraSpecsApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).method("DELETE").build(), - HttpResponse.builder().statusCode(404).build() - ).getFlavorExtraSpecsApi("az-1.region-a.geo-1").get(); - - assertFalse(api.deleteMetadataKey("5", "test1")); - } - } http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiLiveTest.java index d1ed7c2..e189c1c 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiLiveTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiLiveTest.java @@ -74,7 +74,7 @@ public class FlavorExtraSpecsApiLiveTest extends BaseNovaApiLiveTest { assertNotNull(before); Map<String, String> specs = Maps.newHashMap(before); specs.putAll(testSpecs); - assertTrue(api.updateMetadata(testFlavor.getId(), specs)); + api.updateMetadata(testFlavor.getId(), specs); assertEquals(api.getMetadata(testFlavor.getId()), specs); for (Map.Entry<String, String> entry : specs.entrySet()) { assertEquals(api.getMetadataKey(testFlavor.getId(), entry.getKey()), entry.getValue()); @@ -104,7 +104,7 @@ public class FlavorExtraSpecsApiLiveTest extends BaseNovaApiLiveTest { if (apiOption.isPresent()) { FlavorExtraSpecsApi api = apiOption.get(); for (String key : testSpecs.keySet()) { - assertTrue(api.updateMetadataEntry(testFlavor.getId(), key, "new value")); + api.updateMetadataEntry(testFlavor.getId(), key, "new value"); } for (String key : testSpecs.keySet()) { assertEquals(api.getMetadataKey(testFlavor.getId(), key), "new value"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java index 7bec68e..a606a69 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java @@ -18,7 +18,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import org.jclouds.http.HttpRequest; @@ -89,22 +88,6 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest { .toString(), new ParseFloatingIPListTest().expected().toString()); } - public void testListFloatingIPsWhenResponseIs404() throws Exception { - HttpRequest list = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse); - - assertTrue(apiWhenNoServersExist.getFloatingIPApi("az-1.region-a.geo-1").get().list().isEmpty()); - } - public void testGetFloatingIPWhenResponseIs2xx() throws Exception { HttpRequest get = HttpRequest .builder() @@ -123,22 +106,6 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest { .toString(), new ParseFloatingIPTest().expected().toString()); } - public void testGetFloatingIPWhenResponseIs404() throws Exception { - HttpRequest get = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips/1";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse getResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, get, getResponse); - - assertNull(apiWhenNoServersExist.getFloatingIPApi("az-1.region-a.geo-1").get().get("1")); - } - public void testAllocateWhenResponseIs2xx() throws Exception { HttpRequest createFloatingIP = HttpRequest .builder() @@ -160,24 +127,6 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest { } - public void testAllocateWhenResponseIs404() throws Exception { - HttpRequest createFloatingIP = HttpRequest - .builder() - .method("POST") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken) - .payload(payloadFromStringWithContentType("{}", "application/json")).build(); - - HttpResponse createFloatingIPResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createFloatingIP, - createFloatingIPResponse); - - assertNull(apiWhenNoServersExist.getFloatingIPApi("az-1.region-a.geo-1").get().create()); - } - public void testAllocateWithPoolNameWhenResponseIs2xx() throws Exception { HttpRequest createFloatingIP = HttpRequest .builder() http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApiExpectTest.java index 200e1d7..36dcf28 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPPoolApiExpectTest.java @@ -77,19 +77,4 @@ public class FloatingIPPoolApiExpectTest extends BaseNovaApiExpectTest { .toString(), new ParseFloatingIPPoolListTest().expected().toString()); } - public void testListFloatingIPsWhenResponseIs404() throws Exception { - HttpRequest list = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ip-pools";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse); - - assertTrue(apiWhenNoServersExist.getFloatingIPPoolApi("az-1.region-a.geo-1").get().list().isEmpty()); - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java index 6d94d94..13928d3 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java @@ -30,7 +30,6 @@ import org.jclouds.http.HttpResponse; import org.jclouds.openstack.nova.v2_0.domain.Host; import org.jclouds.openstack.nova.v2_0.domain.HostResourceUsage; import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiExpectTest; -import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -99,21 +98,6 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest { assertTrue(api.enable("ubuntu")); } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testEnableHostFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu";); - HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - HttpRequest.builder().method("PUT") - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken) - .payload(payloadFromStringWithContentType("{\"status\":\"enable\"}", MediaType.APPLICATION_JSON)) - .endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404) - .build()).getHostAdministrationApi("az-1.region-a.geo-1").get(); - api.enable("ubuntu"); - } - public void testEnableHostFailNotEnabled() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu";); HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, @@ -187,18 +171,6 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest { assertTrue(api.startup("ubuntu")); } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testStartupHostFailNotFound() { - HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - HttpRequest.builder().method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu/startup";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(), - HttpResponse.builder().statusCode(404).build()).getHostAdministrationApi("az-1.region-a.geo-1").get(); - assertTrue(api.startup("ubuntu")); - } - public void testStartupHostFailWrongActionInProgress() { HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java index 7080c74..dc1de3f 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java @@ -17,8 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import java.net.URI; @@ -65,16 +63,6 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest { assertEquals(api.get("1"), exampleHostAggregateWithHost()); } - public void testGetFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1";); - HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build()).getHostAggregateApi("az-1.region-a.geo-1").get(); - - assertNull(api.get("1")); - } - public void testCreateAggregate() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates";); HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, @@ -98,16 +86,6 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest { assertTrue(api.delete("1")); } - public void testDeleteAggregateFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1";); - HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).method("DELETE").build(), - HttpResponse.builder().statusCode(404).build()).getHostAggregateApi("az-1.region-a.geo-1").get(); - - assertFalse(api.delete("1")); - } - public void testUpdateName() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1";); HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApiMockTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApiMockTest.java index b09ddd7..07acabc 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApiMockTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HypervisorApiMockTest.java @@ -101,19 +101,6 @@ public class HypervisorApiMockTest extends BaseOpenStackMockTest<NovaApi> { assertRequests(server, 3, "/os-hypervisors"); } - public void testListHypervisorWhenResponseIs404(Method method) throws Exception { - MockWebServer server = servers.get(method.getName()); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); - assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree")); - - assertTrue(novaApi.getHypervisorApi("RegionOne").get().list().isEmpty()); - - assertRequests(server, 3, "/os-hypervisors"); - } - public void testListInDetail(Method method) throws Exception { MockWebServer server = servers.get(method.getName()); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json")))); @@ -163,19 +150,6 @@ public class HypervisorApiMockTest extends BaseOpenStackMockTest<NovaApi> { assertRequests(server, 3, "/os-hypervisors/detail"); } - public void testListInDetailWhenResponseIs404(Method method) throws Exception { - MockWebServer server = servers.get(method.getName()); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list_full.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - NovaApi novaApi = api(server.getUrl("/").toString(), "openstack-nova"); - assertEquals(novaApi.getConfiguredRegions(), ImmutableSet.of("RegionOne", "RegionTwo", "RegionThree")); - - assertTrue(novaApi.getHypervisorApi("RegionOne").get().listInDetail().isEmpty()); - - assertRequests(server, 3, "/os-hypervisors/detail"); - } - private void assertRequests(MockWebServer server, int requestCount, String requestPath) throws InterruptedException { assertEquals(server.getRequestCount(), requestCount); assertAuthentication(server); http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java index ea719e5..88e2262 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java @@ -18,7 +18,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertNull; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; @@ -57,23 +56,6 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest { new ParseKeyPairListTest().expected().toString()); } - public void testListKeyPairsWhenResponseIs404() throws Exception { - HttpRequest list = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse); - - assertTrue(apiWhenNoServersExist.getKeyPairApi("az-1.region-a.geo-1").get().list().isEmpty()); - - } - public void testCreateKeyPair() throws Exception { HttpRequest create = HttpRequest .builder() @@ -157,19 +139,4 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest { new ParseKeyPairTest().expected()); } - public void testGetKeyPairWhenResponseIs404() throws Exception { - HttpRequest get = HttpRequest - .builder() - .method("GET") - .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs/testkeypair";) - .addHeader("Accept", "application/json") - .addHeader("X-Auth-Token", authToken).build(); - - HttpResponse getResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoKeyPairExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, get, getResponse); - - assertNull(apiWhenNoKeyPairExists.getKeyPairApi("az-1.region-a.geo-1").get().get("testkeypair")); - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java index 0350128..f6772ff 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import java.net.URI; @@ -28,7 +27,6 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.openstack.nova.v2_0.domain.Quota; import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiExpectTest; -import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; /** @@ -47,15 +45,6 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest { assertEquals(api.getByTenant("demo"), getTestQuotas()); } - public void testGetQuotasFailsTenantNotFound() throws Exception { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo";); - QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build()).getQuotaApi("az-1.region-a.geo-1").get(); - assertNull(api.getByTenant("demo")); - } - public void testGetDefaultQuotas() throws Exception { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo/defaults";); QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, @@ -66,16 +55,6 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest { assertEquals(api.getDefaultsForTenant("demo"), getTestQuotas()); } - public void testGetDefaultQuotasFailsTenantNotFound() throws Exception { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo/defaults";); - QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build()).getQuotaApi("az-1.region-a.geo-1").get(); - assertNull(api.getDefaultsForTenant("demo")); - } - - public void testUpdateQuotas() throws Exception { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo";); QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, @@ -90,21 +69,6 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest { assertTrue(api.updateQuotaOfTenant(getTestQuotas(), "demo")); } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testUpdateQuotasFailsNotFound() throws Exception { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo";); - QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - HttpRequest.builder().endpoint(endpoint).method("PUT") - .addHeader("X-Auth-Token", authToken) - .addHeader("Accept", "application/json") - .payload(payloadFromResourceWithContentType("/quotas.json", MediaType.APPLICATION_JSON)) - .build(), - HttpResponse.builder().statusCode(404).build()).getQuotaApi("az-1.region-a.geo-1").get(); - - api.updateQuotaOfTenant(getTestQuotas(), "demo"); - } - public static Quota getTestQuotas() { return Quota.builder() .metadataItems(128) http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java index ae108ac..8d8374b 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import java.net.URI; @@ -61,22 +60,6 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest { .list().toString(), new ParseSecurityGroupListTest().expected().toString()); } - public void testListSecurityGroupsWhenReponseIs404IsEmpty() throws Exception { - HttpRequest listListSecurityGroups = HttpRequest.builder().method("GET").endpoint( - URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups";)).headers( - ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token", - authToken).build()).build(); - - HttpResponse listListSecurityGroupsResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listListSecurityGroups, - listListSecurityGroupsResponse); - - assertTrue(apiWhenNoSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get() - .list().isEmpty()); - } - public void testGetSecurityGroupWhenResponseIs2xx() throws Exception { HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint( @@ -95,23 +78,6 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest { .get("0").toString(), new ParseSecurityGroupTest().expected().toString()); } - public void testGetSecurityGroupWhenResponseIs404() throws Exception { - HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint( - URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/0";)).headers( - ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token", - authToken).build()).build(); - - HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(404).build(); - - NovaApi apiWhenNoSecurityGroupsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getSecurityGroup, - getSecurityGroupResponse); - - assertNull(apiWhenNoSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get() - .get("0")); - - } - public void testCreateSecurityGroupWhenResponseIs2xx() throws Exception { HttpRequest create = HttpRequest.builder().method("POST").endpoint( URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups";)).headers( http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java index c528b9e..b47bf67 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; import java.net.URI; @@ -47,15 +46,4 @@ public class ServerWithSecurityGroupsApiExpectTest extends BaseNovaApiExpectTest assertEquals(server.getId(), "8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"); assertEquals(server.getSecurityGroupNames(), ImmutableSet.of("default", "group1")); } - - public void testGetServerWithSecurityGroupsFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb";); - ServerWithSecurityGroupsApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getServerWithSecurityGroupsApi("az-1.region-a.geo-1").get(); - assertNull(api.get("8d0a6ca5-8849-4b3d-b86e-f24c92490ebb")); - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java index 48e6aef..2af43bc 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; import java.net.URI; @@ -48,15 +47,4 @@ public class VirtualInterfaceApiExpectTest extends BaseNovaApiExpectTest { assertEquals(vif.getMacAddress(), "fa:16:3e:09:71:34"); } - public void testListVirtualInterfacesFailNotFound() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/os-virtual-interfaces";); - VirtualInterfaceApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getVirtualInterfaceApi("az-1.region-a.geo-1").get(); - - assertTrue(api.listOnServer("1").isEmpty()); - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/d83282ca/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java index fde97ee..a382d95 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java @@ -17,8 +17,6 @@ package org.jclouds.openstack.nova.v2_0.extensions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import java.net.URI; @@ -35,8 +33,6 @@ import org.jclouds.openstack.nova.v2_0.domain.VolumeSnapshot; import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiExpectTest; import org.jclouds.openstack.nova.v2_0.options.CreateVolumeOptions; import org.jclouds.openstack.nova.v2_0.options.CreateVolumeSnapshotOptions; -import org.jclouds.rest.AuthorizationException; -import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; @@ -62,19 +58,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(volumes, ImmutableSet.of(testVolume())); } - public void testListVolumesFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - Set<? extends Volume> volumes = api.list().toSet(); - assertTrue(volumes.isEmpty()); - } - public void testListVolumesInDetail() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/detail";); VolumeApi api = requestsSendResponses( @@ -88,19 +71,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(volumes, ImmutableSet.of(testVolume())); } - public void testListVolumesInDetailFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/detail";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - Set<? extends Volume> volumes = api.listInDetail().toSet(); - assertTrue(volumes.isEmpty()); - } - public void testCreateVolume() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes";); VolumeApi api = requestsSendResponses( @@ -117,23 +87,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(volume, testVolume()); } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateVolumeFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint) - .endpoint(endpoint) - .method("POST") - .payload(payloadFromStringWithContentType("{\"volume\":{\"display_name\":\"jclouds-test-volume\",\"display_description\":\"description of test volume\",\"size\":1}}", MediaType.APPLICATION_JSON)) - .build(), - HttpResponse.builder().statusCode(404).payload(payloadFromResource("/volume_details.json")).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - api.create(1, CreateVolumeOptions.Builder.name("jclouds-test-volume").description("description of test volume")); - } - public void testGetVolume() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1";); VolumeApi api = requestsSendResponses( @@ -154,18 +107,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(Iterables.getOnlyElement(volume.getAttachments()), testAttachment()); } - public void testGetVolumeFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - assertNull(api.get("1")); - } - public void testDeleteVolume() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1";); VolumeApi api = requestsSendResponses( @@ -178,18 +119,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertTrue(api.delete("1")); } - public void testDeleteVolumeFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).method("DELETE").build(), - HttpResponse.builder().statusCode(404).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - assertFalse(api.delete("1")); - } - public void testListSnapshots() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots";); VolumeApi api = requestsSendResponses( @@ -203,19 +132,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(snapshots, ImmutableSet.of(testSnapshot())); } - public void testListSnapshotsFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - Set<? extends VolumeSnapshot> snapshots = api.listSnapshots().toSet(); - assertTrue(snapshots.isEmpty()); - } - public void testGetSnapshot() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1";); VolumeApi api = requestsSendResponses( @@ -229,18 +145,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(snapshot, testSnapshot()); } - public void testGetSnapshotFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - assertNull(api.getSnapshot("1")); - } - public void testListSnapshotsInDetail() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/detail";); VolumeApi api = requestsSendResponses( @@ -263,19 +167,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(snappy.getSize(), 1); } - public void testListSnapshotsInDetailFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/detail";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).build(), - HttpResponse.builder().statusCode(404).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - Set<? extends VolumeSnapshot> snapshots = api.listSnapshotsInDetail().toSet(); - assertTrue(snapshots.isEmpty()); - } - public void testCreateSnapshot() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots";); VolumeApi api = requestsSendResponses( @@ -292,22 +183,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertEquals(snapshot, testSnapshot()); } - @Test(expectedExceptions = AuthorizationException.class) - public void testCreateSnapshotFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint) - .method("POST") - .payload(payloadFromStringWithContentType("{\"snapshot\":{\"display_name\":\"jclouds-live-test\",\"volume_id\":\"13\",\"display_description\":\"jclouds live test snapshot\",\"force\":\"true\"}}", MediaType.APPLICATION_JSON)) - .build(), - HttpResponse.builder().statusCode(401).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - api.createSnapshot("13", CreateVolumeSnapshotOptions.Builder.name("jclouds-live-test").description("jclouds live test snapshot").force()); - } - public void testDeleteSnapshot() { URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1";); VolumeApi api = requestsSendResponses( @@ -320,19 +195,6 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest { assertTrue(api.deleteSnapshot("1")); } - @Test(expectedExceptions = AuthorizationException.class) - public void testDeleteSnapshotFail() { - URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1";); - VolumeApi api = requestsSendResponses( - keystoneAuthWithUsernameAndPasswordAndTenantName, - responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, - authenticatedGET().endpoint(endpoint).method("DELETE").build(), - HttpResponse.builder().statusCode(401).build() - ).getVolumeApi("az-1.region-a.geo-1").get(); - - api.deleteSnapshot("1"); - } - protected Volume testVolume() { return Volume.builder().status(Volume.Status.IN_USE).description("This is a test volume").zone("nova").name("test") .attachments(ImmutableSet.of(testAttachment())).size(1).id("1").created(dateService.iso8601SecondsDateParse("2012-04-23 12:16:45")).build();
