You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by de...@apache.org on 2016/02/06 01:03:01 UTC
[3/3] jclouds-labs-openstack git commit: JCLOUDS-691: Remove 404
fallbacks of PUT and POST calls from OpenStack APIs
JCLOUDS-691: Remove 404 fallbacks of PUT and POST calls from OpenStack APIs
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/167312fb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/167312fb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/167312fb
Branch: refs/heads/master
Commit: 167312fb41997b9add33e409f542fc4a4dcd22cd
Parents: 3b49016
Author: Reijhanniel Jearl Campos <de...@gmail.com>
Authored: Fri Feb 5 09:06:55 2016 +0800
Committer: Reijhanniel Jearl Campos <de...@apache.org>
Committed: Sat Feb 6 08:02:16 2016 +0800
----------------------------------------------------------------------
.../v1_0/features/ImageApiExpectTest.java | 175 -----
.../heat/v1/features/ResourceApiMockTest.java | 26 -
.../heat/v1/features/StackApiMockTest.java | 202 -----
.../heat/v1/features/TemplateApiMockTest.java | 40 -
.../openstack/marconi/v1/features/ClaimApi.java | 5 +-
.../marconi/v1/features/MessageApi.java | 2 -
.../openstack/marconi/v1/features/QueueApi.java | 6 +-
.../marconi/v1/features/ClaimApiLiveTest.java | 9 +-
.../marconi/v1/features/ClaimApiMockTest.java | 4 +-
.../marconi/v1/features/MessageApiLiveTest.java | 4 +-
.../marconi/v1/features/QueueApiLiveTest.java | 12 +-
.../marconi/v1/features/QueueApiMockTest.java | 68 +-
.../neutron/v2/extensions/FWaaSApi.java | 7 -
.../neutron/v2/extensions/FloatingIPApi.java | 2 -
.../neutron/v2/extensions/RouterApi.java | 6 -
.../v2/extensions/lbaas/v1/LBaaSApi.java | 8 -
.../neutron/v2/features/NetworkApi.java | 2 -
.../openstack/neutron/v2/features/PortApi.java | 1 -
.../neutron/v2/features/SubnetApi.java | 1 -
.../neutron/v2/extensions/FWaaSApiMockTest.java | 418 +----------
.../v2/extensions/FloatingIPApiMockTest.java | 179 -----
.../v2/extensions/RouterApiMockTest.java | 303 --------
.../v2/extensions/SecurityGroupApiMockTest.java | 298 --------
.../extensions/lbaas/v1/LBaaSApiMockTest.java | 742 +------------------
.../v2/features/ExtensionApiMockTest.java | 56 --
.../neutron/v2/features/NetworkApiMockTest.java | 160 +---
.../neutron/v2/features/PortApiMockTest.java | 195 -----
.../neutron/v2/features/SubnetApiMockTest.java | 189 -----
.../openstack/poppy/v1/features/ServiceApi.java | 2 -
.../poppy/v1/features/ServiceApiMockTest.java | 144 ----
30 files changed, 20 insertions(+), 3246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
index acc9c5e..dddfca4 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
@@ -18,8 +18,6 @@ package org.jclouds.openstack.glance.v1_0.features;
import static org.jclouds.openstack.glance.v1_0.options.CreateImageOptions.Builder.copyFrom;
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 javax.ws.rs.core.MediaType;
@@ -35,8 +33,6 @@ import org.jclouds.openstack.glance.v1_0.options.UpdateImageOptions;
import org.jclouds.openstack.glance.v1_0.parse.ParseImageDetailsTest;
import org.jclouds.openstack.glance.v1_0.parse.ParseImagesInDetailTest;
import org.jclouds.openstack.glance.v1_0.parse.ParseImagesTest;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.ResourceNotFoundException;
import org.jclouds.util.Strings2;
import org.testng.annotations.Test;
@@ -65,21 +61,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImagesTest().expected().toString());
}
- public void testListWhenReponseIs404IsEmpty() throws Exception {
- HttpRequest list = HttpRequest.builder().method("GET")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse listResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- list, listResponse);
-
- assertTrue(apiWhenNoExist.getImageApi("az-1.region-a.geo-1").list().concat().isEmpty());
- }
-
public void testListInDetailWhenResponseIs2xx() throws Exception {
HttpRequest listInDetail = HttpRequest.builder().method("GET")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/detail")
@@ -99,21 +80,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImagesInDetailTest().expected().toString());
}
- public void testListInDetailWhenReponseIs404IsEmpty() throws Exception {
- HttpRequest listInDetail = HttpRequest.builder().method("GET")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/detail")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse listInDetailResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExistInDetail = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- listInDetail, listInDetailResponse);
-
- assertTrue(apiWhenNoExistInDetail.getImageApi("az-1.region-a.geo-1").listInDetail().concat().isEmpty());
- }
-
public void testShowWhenResponseIs2xx() throws Exception {
HttpRequest show = HttpRequest.builder().method("HEAD")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -132,23 +98,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImageDetailsFromHeadersTest().expected().toString());
}
- public void testShowWhenReponseIs404IsNull() throws Exception {
- HttpRequest show = HttpRequest.builder().method("HEAD")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
-
- HttpResponse showResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- show, showResponse);
-
- assertNull(apiWhenNoExist.getImageApi("az-1.region-a.geo-1").get("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
- }
-
-
public void testGetAsStreamWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("GET")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -167,21 +116,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
"foo");
}
- public void testGetAsStreamWhenReponseIs404IsNull() throws Exception {
- HttpRequest get = HttpRequest.builder().method("GET")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse getResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenNoExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, getResponse);
-
- assertNull(apiWhenNoExist.getImageApi("az-1.region-a.geo-1").getAsStream("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
- }
-
public void testCreateWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("POST")
.endpoint("https://glance.jclouds.org:9292/v1.0/images")
@@ -203,27 +137,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = AuthorizationException.class)
- public void testCreateWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("POST")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images")
- .addHeader("x-image-meta-name", "test")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken)
- .payload(payloadFromStringWithContentType("somedata", MediaType.APPLICATION_OCTET_STREAM)).build();
-
- HttpResponse createResponse = HttpResponse.builder().statusCode(403)
- .payload(payloadFromResource("/image.json")).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, createResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1").create("test", new StringPayload("somedata"));
- }
-
public void testImageCreateCopyFrom() throws Exception {
HttpRequest get = HttpRequest.builder().method("POST")
.endpoint("https://glance.jclouds.org:9292/v1.0/images")
@@ -265,26 +178,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
assertEquals(apiWhenExist.getImageApi("az-1.region-a.geo-1").reserve("test"), new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = AuthorizationException.class)
- public void testReserveWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("POST")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images")
- .addHeader("x-image-meta-name", "test")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
- HttpResponse createResponse = HttpResponse.builder().statusCode(403)
- .payload(payloadFromResource("/image.json")).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, createResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1").reserve("test");
- }
-
public void testUpdateMetadataWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("PUT")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -322,32 +215,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testUpdateMetadataWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("PUT")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", MediaType.APPLICATION_JSON)
- .put("X-Image-Meta-Name", "newname")
- .put("X-Image-Meta-Is_public", "true")
- .put("X-Auth-Token", authToken).build())
- .build();
-
- HttpResponse updateResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, updateResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1")
- .update("fcc451d0-f6e4-4824-ad8f-70ec12326d07",
- UpdateImageOptions.Builder.name("newname"),
- UpdateImageOptions.Builder.isPublic(true));
- }
-
public void testUpdateImageWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("PUT")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -395,30 +262,6 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
new StringPayload("somenewdata"), UpdateImageOptions.Builder.name("anothernewname")), new ParseImageDetailsTest().expected());
}
- @Test(expectedExceptions = AuthorizationException.class)
- public void testUpdateNameAndImageWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("PUT")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", MediaType.APPLICATION_JSON)
- .put("X-Image-Meta-Name", "anothernewname")
- .put("X-Auth-Token", authToken).build())
- .payload(payloadFromStringWithContentType("somenewdata", MediaType.APPLICATION_OCTET_STREAM))
- .build();
-
- HttpResponse updateResponse = HttpResponse.builder().statusCode(403).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, updateResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- apiWhenExist.getImageApi("az-1.region-a.geo-1").upload("fcc451d0-f6e4-4824-ad8f-70ec12326d07",
- new StringPayload("somenewdata"), UpdateImageOptions.Builder.name("anothernewname"));
- }
-
public void testDeleteWhenResponseIs2xx() throws Exception {
HttpRequest get = HttpRequest.builder().method("DELETE")
.endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
@@ -435,22 +278,4 @@ public class ImageApiExpectTest extends BaseGlanceExpectTest {
assertTrue(apiWhenExist.getImageApi("az-1.region-a.geo-1").delete("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
}
-
- public void testDeleteWhenResponseIs4xx() throws Exception {
- HttpRequest get = HttpRequest.builder().method("DELETE")
- .endpoint("https://glance.jclouds.org:9292/v1.0/images/fcc451d0-f6e4-4824-ad8f-70ec12326d07")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken).build();
-
-
- HttpResponse getResponse = HttpResponse.builder().statusCode(404).build();
-
- GlanceApi apiWhenExist = requestsSendResponses(keystoneAuthWithUsernameAndPassword,
- responseWithKeystoneAccess, versionNegotiationRequest, versionNegotiationResponse,
- get, getResponse);
-
- assertEquals(apiWhenExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1"));
-
- assertFalse(apiWhenExist.getImageApi("az-1.region-a.geo-1").delete("fcc451d0-f6e4-4824-ad8f-70ec12326d07"));
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
index 47e4c52..984ace8 100644
--- a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
+++ b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/ResourceApiMockTest.java
@@ -63,30 +63,4 @@ public class ResourceApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testListTypesIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- ResourceApi api = heatApi.getResourceApi("RegionOne");
-
- List<String> resourceTypes = api.listTypes();
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/resource_types");
-
- /*
- * Check response
- */
- assertThat(resourceTypes).isEmpty();
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
index 2695d5a..d7c2897 100644
--- a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
+++ b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/StackApiMockTest.java
@@ -18,8 +18,6 @@ package org.jclouds.openstack.heat.v1.features;
import static org.assertj.core.api.Assertions.assertThat;
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.io.IOException;
@@ -74,28 +72,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testGetStackFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- Stack stack = api.get("Non_Existing_Stack", "Non-Existing-Stack");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/Non_Existing_Stack/Non-Existing-Stack");
-
- assertNull(stack);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGeStackWithIDOnly() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -119,51 +95,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testGetStackWithIDOnlyFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- Stack stack = api.get("Non-Existing-Stack");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/Non-Existing-Stack");
-
- assertNull(stack);
-
- } finally {
- server.shutdown();
- }
- }
-
- public void testGetStackResourceFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- StackResource stackResource = api.getStackResource(TEST_STACK_NAME, TEST_STACK_ID, "Non_Existing_Stack_resource");
-
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/" + TEST_STACK_NAME + "/" + TEST_STACK_ID + "/resources/Non_Existing_Stack_resource");
-
- assertNull(stackResource);
-
- } finally {
- server.shutdown();
- }
- }
-
-
public void testList() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -291,88 +222,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testListIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- List<Stack> stacks = api.list();
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks");
-
- /*
- * Check response
- */
- assertThat(stacks).isEmpty();
- } finally {
- server.shutdown();
- }
- }
-
- public void testListWithOptionsIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- ListStackOptions options = ListStackOptions.Builder.name("Stack_dont_exist");
- List<Stack> stacks = api.list(options);
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks?name=Stack_dont_exist");
-
- /*
- * Check response
- */
- assertThat(stacks).isEmpty();
- } finally {
- server.shutdown();
- }
- }
-
- public void testListStackResourceIsEmpty() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- List<StackResource> stackResources = api.listStackResources("empty_stack", "empty_stack_id");
-
- /*
- * Check request
- */
- assertThat(server.getRequestCount()).isEqualTo(2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/empty_stack/empty_stack_id/resources");
-
- /*
- * Check response
- */
- assertThat(stackResources).isEmpty();
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateWithTemplateUrl() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -434,33 +283,6 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testDeleteReturnFalseOn404Stack() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- boolean result = api.delete("Non-Existing-Stack-Name", "Non-Existing-Stack-ID");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "DELETE", BASE_URI + "/stacks/Non-Existing-Stack-Name/Non-Existing-Stack-ID");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateStack() throws IOException, InterruptedException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -516,29 +338,5 @@ public class StackApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testResourcesMetadataReturnNullOn404() throws IOException, InterruptedException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- StackApi api = heatApi.getStackApi("RegionOne");
-
- Map<String, Object> metadata = api.getStackResourceMetadata(TEST_STACK_NAME, TEST_STACK_ID, "Stack_Resource_dont_exist");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 2);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", BASE_URI + "/stacks/" + TEST_STACK_NAME + "/" + TEST_STACK_ID + "/resources/Stack_Resource_dont_exist/metadata");
- assertThat(metadata).isEmpty();
-
-
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
index a8d8e12..ec7ee87 100644
--- a/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
+++ b/openstack-heat/src/test/java/org/jclouds/openstack/heat/v1/features/TemplateApiMockTest.java
@@ -18,12 +18,10 @@ package org.jclouds.openstack.heat.v1.features;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
import org.jclouds.openstack.heat.v1.HeatApi;
import org.jclouds.openstack.heat.v1.domain.Template;
import org.jclouds.openstack.heat.v1.internal.BaseHeatApiMockTest;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.squareup.okhttp.mockwebserver.MockResponse;
@@ -59,27 +57,6 @@ public class TemplateApiMockTest extends BaseHeatApiMockTest {
}
}
- public void testGetTemplateFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404).setBody(stringFromResource("/template_get_response.json"))));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- TemplateApi api = heatApi.getTemplateApi("RegionOne");
-
- Template template = api.get("simple_stack", "3095aefc-09fb-4bc7-b1f0-f21a304e864c");
-
- assertNull(template);
- assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET",
- BASE_URI + "/stacks/simple_stack/3095aefc-09fb-4bc7-b1f0-f21a304e864c/template");
- } finally {
- server.shutdown();
- }
- }
-
public void testValidateTemplate() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -105,22 +82,5 @@ public class TemplateApiMockTest extends BaseHeatApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testValidateTemplateFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404).setBody(stringFromResource("/template_validate_response.json"))));
-
- try {
- HeatApi heatApi = api(server.getUrl("/").toString(), "openstack-heat", overrides);
- TemplateApi api = heatApi.getTemplateApi("RegionOne");
-
- Template template = api.validate("https://examplevalidateurl.com/exampletemplate.json");
-
- } finally {
- server.shutdown();
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
index 1afe47f..8bf93f1 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
@@ -29,7 +29,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
-import org.jclouds.Fallbacks.EmptyListOnNotFoundOr404;
import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.javax.annotation.Nullable;
@@ -90,7 +89,6 @@ public interface ClaimApi {
@POST
@Payload("%7B\"ttl\":{ttl},\"grace\":{grace}%7D")
@ResponseParser(ParseMessagesToList.class)
- @Fallback(EmptyListOnNotFoundOr404.class)
List<Message> claim(@PayloadParam("ttl") int ttl, @PayloadParam("grace") int grace, @QueryParam("limit") int limit);
/**
@@ -121,8 +119,7 @@ public interface ClaimApi {
@Path("/{claim_id}")
@Produces(MediaType.APPLICATION_JSON)
@Payload("%7B\"ttl\":{ttl}%7D")
- @Fallback(FalseOnNotFoundOr404.class)
- boolean update(@PathParam("claim_id") String claimId, @PayloadParam("ttl") int ttl);
+ void update(@PathParam("claim_id") String claimId, @PayloadParam("ttl") int ttl);
/**
* This operation immediately releases a claim, making any remaining, undeleted messages that are associated with
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
index 1e648a7..5eb070e 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
@@ -68,8 +68,6 @@ public interface MessageApi {
@Named("message:create")
@POST
@ResponseParser(ParseMessagesCreated.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
MessagesCreated create(@BinderParam(BindToJsonPayload.class) List<CreateMessage> messages);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
index ec59bbe..f8c60e6 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
@@ -66,8 +66,7 @@ public interface QueueApi {
@Named("queue:create")
@PUT
@Path("/{name}")
- @Fallback(FalseOnNotFoundOr404.class)
- boolean create(@PathParam("name") String name);
+ void create(@PathParam("name") String name);
/**
* Delete a queue.
@@ -130,8 +129,7 @@ public interface QueueApi {
@PUT
@Path("/{name}/metadata")
@Produces(MediaType.APPLICATION_JSON)
- @Fallback(FalseOnNotFoundOr404.class)
- boolean setMetadata(@PathParam("name") String name,
+ void setMetadata(@PathParam("name") String name,
@BinderParam(BindToJsonPayload.class) Map<String, String> metadata);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
index a7fd8e9..083e3f3 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
@@ -43,9 +43,7 @@ public class ClaimApiLiveTest extends BaseMarconiApiLiveTest {
public void createQueues() throws Exception {
for (String regionId : regions) {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
- boolean success = queueApi.create("jclouds-test");
-
- assertTrue(success);
+ queueApi.create("jclouds-test");
}
}
@@ -112,10 +110,7 @@ public class ClaimApiLiveTest extends BaseMarconiApiLiveTest {
public void updateClaim() throws Exception {
for (String regionId : regions) {
ClaimApi claimApi = api.getClaimApi(regionId, CLIENT_ID, "jclouds-test");
-
- boolean success = claimApi.update(claimIds.get(regionId).get(0), 400);
-
- assertTrue(success);
+ claimApi.update(claimIds.get(regionId).get(0), 400);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
index b4f6200..dcd1df2 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
@@ -112,9 +112,7 @@ public class ClaimApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
ClaimApi claimApi = api.getClaimApi("DFW", CLIENT_ID, "jclouds-test");
- boolean success = claimApi.update("52a8d23eb04a584f1bbd4f47", 400);
-
- assertTrue(success);
+ claimApi.update("52a8d23eb04a584f1bbd4f47", 400);
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
index d0f64a2..b0c8378 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
@@ -48,9 +48,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
public void createQueues() throws Exception {
for (String regionId : regions) {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
- boolean success = queueApi.create("jclouds-test");
-
- assertTrue(success);
+ queueApi.create("jclouds-test");
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
index 36a1d40..c33110c 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
@@ -54,9 +54,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
for (int i = 0; i < 6; i++) {
- boolean success = queueApi.create("jclouds-test-" + i);
-
- assertTrue(success);
+ queueApi.create("jclouds-test-" + i);
}
}
}
@@ -82,9 +80,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
for (int i = 6; i < 12; i++) {
- boolean success = queueApi.create("jclouds-test-" + i);
-
- assertTrue(success);
+ queueApi.create("jclouds-test-" + i);
}
}
}
@@ -139,9 +135,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
for (String regionId : regions) {
QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
- boolean success = queueApi.setMetadata("jclouds-test-1", metadata);
-
- assertTrue(success);
+ queueApi.setMetadata("jclouds-test-1", metadata);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
index e84b534..102774c 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
@@ -16,17 +16,16 @@
*/
package org.jclouds.openstack.marconi.v1.features;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.squareup.okhttp.mockwebserver.MockResponse;
import com.squareup.okhttp.mockwebserver.MockWebServer;
import com.squareup.okhttp.mockwebserver.RecordedRequest;
+
import org.jclouds.openstack.marconi.v1.MarconiApi;
import org.jclouds.openstack.marconi.v1.domain.Queue;
import org.jclouds.openstack.marconi.v1.domain.QueueStats;
import org.jclouds.openstack.marconi.v1.domain.Queues;
-import org.jclouds.openstack.marconi.v1.options.ListQueuesOptions;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;
import org.testng.annotations.Test;
@@ -53,9 +52,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
- boolean success = queueApi.create("jclouds-test");
-
- assertTrue(success);
+ queueApi.create("jclouds-test");
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
@@ -108,27 +105,6 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
}
}
- public void doesNotExistQueue() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(new MockResponse().setBody(accessRackspace));
- server.enqueue(new MockResponse().setResponseCode(404));
-
- try {
- MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
- boolean success = queueApi.exists("jclouds-blerg");
-
- assertFalse(success);
-
- assertEquals(server.getRequestCount(), 2);
- assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
- assertEquals(server.takeRequest().getRequestLine(), "GET /v1/123123/queues/jclouds-blerg HTTP/1.1");
- }
- finally {
- server.shutdown();
- }
- }
-
public void listZeroPagesOfQueues() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(new MockResponse().setBody(accessRackspace));
@@ -177,42 +153,6 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
}
}
- public void listOnePageOfQueuesFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(new MockResponse().setBody(accessRackspace));
- server.enqueue(new MockResponse().setResponseCode(404));
-
- try {
- MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
-
- FluentIterable<Queue> queues = queueApi.list(false).concat();
-
- assertTrue(queues.isEmpty(), "Expecting empty queues but was " + queues.toString());
- }
- finally {
- server.shutdown();
- }
- }
-
- public void listPagedIterableCollectionQueuesFail() throws Exception {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(new MockResponse().setBody(accessRackspace));
- server.enqueue(new MockResponse().setResponseCode(404));
-
- try {
- MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
-
- Queues queues = queueApi.list(ListQueuesOptions.NONE);
-
- assertTrue(queues.isEmpty(), "Expecting empty queues but was " + queues.toString());
- }
- finally {
- server.shutdown();
- }
- }
-
public void listManyPagesOfQueues() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(new MockResponse().setBody(accessRackspace));
@@ -288,9 +228,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
- boolean success = queueApi.setMetadata("jclouds-test", metadata);
-
- assertTrue(success);
+ queueApi.setMetadata("jclouds-test", metadata);
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
index 4d9edcd..68bc807 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
@@ -136,8 +136,6 @@ public interface FWaaSApi {
@PUT
@Path("/firewalls/{id}")
@SelectJson("firewall")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Firewall update(@PathParam("id") String id, @WrapWith("firewall") UpdateFirewall updateFirewall);
/**
@@ -183,7 +181,6 @@ public interface FWaaSApi {
@Named("firewall:updatePolicy")
@PUT
@SelectJson("firewall_policy")
- @Fallback(NullOnNotFoundOr404.class)
@Path("/firewall_policies/{id}")
FirewallPolicy updateFirewallPolicy(@PathParam("id") String id, @WrapWith("firewall_policy") UpdateFirewallPolicy updateFirewallPolicy);
@@ -225,8 +222,6 @@ public interface FWaaSApi {
@PUT
@Path("/firewall_rules/{id}")
@SelectJson("firewall_rule")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
FirewallRule updateFirewallRule(@PathParam("id") String id, @WrapWith("firewall_rule") UpdateFirewallRule updateFirewallRule);
@Named("firewall:deleteFirewallRule")
@@ -238,8 +233,6 @@ public interface FWaaSApi {
@Named("firewall:insertFirewallRuleToPolicy")
@PUT
@Path("/firewall_policies/{id}/insert_rule")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
FirewallPolicy insertFirewallRuleToPolicy(@PathParam("id") String policyId, @WrapWith("firewall_rule_id") String firewallRuleId);
@Named("firewall:removeFirewallRuleFromPolicy")
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
index 9f0164a..98da377 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
@@ -123,8 +123,6 @@ public interface FloatingIPApi {
@PUT
@Path("/{id}")
@SelectJson("floatingip")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
FloatingIP update(@PathParam("id") String id, @WrapWith("floatingip") FloatingIP.UpdateFloatingIP updateFloatingIP);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
index b4668aa..6cddbdc 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
@@ -127,8 +127,6 @@ public interface RouterApi {
@PUT
@Path("/{id}")
@SelectJson("router")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Router update(@PathParam("id") String id, @WrapWith("router") Router.UpdateRouter router);
/**
@@ -154,8 +152,6 @@ public interface RouterApi {
@PUT
@Path("/{id}/add_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
RouterInterface addInterfaceForSubnet(@PathParam("id") String routerId, @PayloadParam("subnet_id") String subnetId);
/**
@@ -169,8 +165,6 @@ public interface RouterApi {
@PUT
@Path("/{id}/add_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
RouterInterface addInterfaceForPort(@PathParam("id") String routerId, @PayloadParam("port_id") String portId);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
index dad80d8..6f6d767 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
@@ -142,8 +142,6 @@ public interface LBaaSApi {
@PUT
@Path("/vips/{id}")
@SelectJson("vip")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
VIP updateVIP(@PathParam("id") String id, @WrapWith("vip") VIP.UpdateVIP vip);
/**
@@ -220,8 +218,6 @@ public interface LBaaSApi {
@PUT
@Path("/pools/{id}")
@SelectJson("pool")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Pool updatePool(@PathParam("id") String id, @WrapWith("pool") Pool.UpdatePool pool);
/**
@@ -298,8 +294,6 @@ public interface LBaaSApi {
@PUT
@Path("/members/{id}")
@SelectJson("member")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
Member updateMember(@PathParam("id") String id, @WrapWith("member") Member.UpdateMember member);
/**
@@ -376,8 +370,6 @@ public interface LBaaSApi {
@PUT
@Path("/health_monitors/{id}")
@SelectJson("health_monitor")
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
HealthMonitor updateHealthMonitor(@PathParam("id") String id,
@WrapWith("health_monitor") HealthMonitor.UpdateHealthMonitor healthMonitor);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
index 08e5586..2706517 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
@@ -133,8 +133,6 @@ public interface NetworkApi {
@PUT
@Path("/{id}")
@SelectJson("network")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
- @Nullable
Network update(@PathParam("id") String id, @WrapWith("network") Network.UpdateNetwork network);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
index 6466a90..3797810 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
@@ -131,7 +131,6 @@ public interface PortApi {
@PUT
@Path("/{id}")
@SelectJson("port")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
Port update(@PathParam("id") String id, @WrapWith("port") Port.UpdatePort port);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
index 7b6f54e..ffb7dcd 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
@@ -127,7 +127,6 @@ public interface SubnetApi {
@PUT
@Path("/{id}")
@SelectJson("subnet")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
Subnet update(@PathParam("id") String id, @WrapWith("subnet") Subnet.UpdateSubnet subnet);
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
index fe7a879..ae84c36 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java
@@ -19,8 +19,8 @@ package org.jclouds.openstack.neutron.v2.extensions;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.List;
@@ -33,14 +33,12 @@ import org.jclouds.openstack.neutron.v2.domain.Firewall;
import org.jclouds.openstack.neutron.v2.domain.FirewallPolicy;
import org.jclouds.openstack.neutron.v2.domain.FirewallRule;
import org.jclouds.openstack.neutron.v2.domain.FloatingIP;
-import org.jclouds.openstack.neutron.v2.domain.FloatingIPs;
import org.jclouds.openstack.neutron.v2.domain.UpdateFirewall;
import org.jclouds.openstack.neutron.v2.domain.UpdateFirewallPolicy;
import org.jclouds.openstack.neutron.v2.domain.UpdateFirewallRule;
import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest;
import org.jclouds.openstack.v2_0.domain.PaginatedCollection;
import org.jclouds.openstack.v2_0.options.PaginationOptions;
-import org.jclouds.rest.ResourceNotFoundException;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
@@ -97,29 +95,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- CreateFirewall firewallRequest = CreateFirewall.builder()
- .firewallPolicyId("c69933c1-b472-44f9-8226-30dc4ffd454c")
- .adminStateUp(Boolean.TRUE)
- .build();
-
- Firewall firewall = api.create(firewallRequest);
- } finally {
- server.shutdown();
- }
- }
-
public void testListSpecificPageFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -152,36 +127,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListSpecificPageFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- FloatingIPs floatingIPs = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg"));
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips?limit=2&marker=abcdefg");
-
- /*
- * Check response
- */
- assertNotNull(floatingIPs);
- assertTrue(floatingIPs.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testListPagedFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -217,37 +162,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testListPagedFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FloatingIPApi api = neutronApi.getFloatingIPApi("RegionOne").get();
-
- // Note: Lazy! Have to actually look at the collection.
- List<FloatingIP> floatingIPs = api.list().concat().toList();
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips");
-
- /*
- * Check response
- */
- assertNotNull(floatingIPs);
- assertTrue(floatingIPs.isEmpty());
- } finally {
- server.shutdown();
- }
- }
-
public void testGetFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -285,37 +199,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- Firewall firewall = api.get("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/fw/firewalls/12345");
-
- /*
- * Check response
- */
- assertNull(firewall);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -352,40 +235,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- UpdateFirewall updateFirewall = UpdateFirewall.builder()
- .adminStateUp(false)
- .build();
-
- Firewall firewall = api.update("12345", updateFirewall);
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewalls/12345", "/firewall_update_request.json");
-
- /*
- * Check response
- */
- assertNull(firewall);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteFirewall() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -416,36 +265,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteFirewallFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- boolean result = api.delete("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/fw/firewalls/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -487,29 +306,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- CreateFirewallPolicy firewallPolicyRequest = CreateFirewallPolicy.builder()
- .name("jclouds-fw-policy_group-52-e8b")
- .build();
-
- FirewallPolicy firewallPolicy = api.createFirewallPolicy(firewallPolicyRequest);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGetFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -547,37 +343,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- FirewallPolicy firewallPolicy = api.getFirewallPolicy("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/fw/firewall_policies/12345");
-
- /*
- * Check response
- */
- assertNull(firewallPolicy);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -619,41 +384,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- UpdateFirewallPolicy updateFirewallPolicy = UpdateFirewallPolicy.builder()
- .shared(true)
- .build();
-
- FirewallPolicy firewallPolicy = api.updateFirewallPolicy("12345", updateFirewallPolicy);
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewall_policies/12345");
-
- /*
- * Check response
- */
- assertNull(firewallPolicy);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testInsertFirewallRuleIntoFirewallPolicy() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -685,36 +415,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testInsertFirewallRuleIntoFirewallPolicyFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- FirewallPolicy updatedFirewallPolicy = api.insertFirewallRuleToPolicy("12345", "59585143-e819-48c9-944d-f03e0f049dba");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewall_policies/12345/insert_rule", "/firewall_policy_insert_rule_request.json");
-
- /*
- * Check response
- */
- assertNull(updatedFirewallPolicy);
- } finally {
- server.shutdown();
- }
- }
-
public void testCreateFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -762,29 +462,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testCreateFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- CreateFirewallRule firewallRuleRequest = CreateFirewallRule.builder()
- .name("jclouds-fw-rule_group-52-e8b_port-22")
- .build();
-
- FirewallRule firewallRule = api.createFirewallRule(firewallRuleRequest);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testGetFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -824,37 +501,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testGetFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- FirewallRule firewallRule = api.getFirewallRule("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "GET", uriApiVersion + "/fw/firewall_rules/12345");
-
- /*
- * Check response
- */
- assertNull(firewallRule);
-
- } finally {
- server.shutdown();
- }
- }
-
public void testUpdateFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -889,38 +535,6 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testUpdateFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- UpdateFirewallRule updateFirewallRule = UpdateFirewallRule.builder()
- .build();
-
- FirewallRule firewallRule = api.updateFirewallRule("12345", updateFirewallRule);
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/fw/firewall_rules/12345", "/firewall_rule_update_request.json");
-
- /*
- * Check response
- */
- assertNull(firewallRule);
- } finally {
- server.shutdown();
- }
- }
-
public void testDeleteFirewallRule() throws IOException, InterruptedException, URISyntaxException {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -951,34 +565,4 @@ public class FWaaSApiMockTest extends BaseNeutronApiMockTest {
}
}
- public void testDeleteFirewallRuleFail() throws IOException, InterruptedException, URISyntaxException {
- MockWebServer server = mockOpenStackServer();
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
- server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/extension_list.json"))));
- server.enqueue(addCommonHeaders(
- new MockResponse().setResponseCode(404)));
-
- try {
- NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides);
- FWaaSApi api = neutronApi.getFWaaSApi("RegionOne").get();
-
- boolean result = api.deleteFirewallRule("12345");
-
- /*
- * Check request
- */
- assertEquals(server.getRequestCount(), 3);
- assertAuthentication(server);
- assertExtensions(server, uriApiVersion + "");
- assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/fw/firewall_rules/12345");
-
- /*
- * Check response
- */
- assertFalse(result);
- } finally {
- server.shutdown();
- }
- }
-
}