JCLOUDS-691: Remove 404 fallbacks of PUT and POST calls from OpenStack APIs
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/01ca3425 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/01ca3425 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/01ca3425 Branch: refs/heads/master Commit: 01ca3425cc9405a23758a07a442f78872a80ecb5 Parents: 19b3a41 Author: Reijhanniel Jearl Campos <[email protected]> Authored: Fri Feb 5 09:06:55 2016 +0800 Committer: Reijhanniel Jearl Campos <[email protected]> Committed: Sat Feb 6 08:02:16 2016 +0800 ---------------------------------------------------------------------- .../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 ----- 16 files changed, 7 insertions(+), 2560 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/01ca3425/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java index 4d9edcd..68bc807 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java +++ b/apis/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/blob/01ca3425/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java index 9f0164a..98da377 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java +++ b/apis/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/blob/01ca3425/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java index b4668aa..6cddbdc 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java +++ b/apis/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/blob/01ca3425/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java index dad80d8..6f6d767 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java +++ b/apis/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/blob/01ca3425/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java index 08e5586..2706517 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java +++ b/apis/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/blob/01ca3425/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java index 6466a90..3797810 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java +++ b/apis/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/blob/01ca3425/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java index 7b6f54e..ffb7dcd 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java +++ b/apis/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/blob/01ca3425/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java index fe7a879..ae84c36 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApiMockTest.java +++ b/apis/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(); - } - } - } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01ca3425/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java index 279dca9..ea368ee 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApiMockTest.java @@ -17,7 +17,6 @@ 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; @@ -31,7 +30,6 @@ import org.jclouds.openstack.neutron.v2.domain.FloatingIP; import org.jclouds.openstack.neutron.v2.domain.FloatingIPs; import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; import com.squareup.okhttp.mockwebserver.MockResponse; @@ -86,28 +84,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateFloatingIPFail() 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(); - - FloatingIP.CreateFloatingIP createFip = FloatingIP.createBuilder("376da547-b977-4cfe-9cba-275c80debf57") - .portId("ce705c24-c1ef-408a-bda3-7bbd946164ab") - .build(); - - FloatingIP floatingIP = api.create(createFip); - } finally { - server.shutdown(); - } - } - public void testListSpecificPageFloatingIP() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -140,36 +116,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest { } } - public void testListSpecificPageFloatingIPFail() 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 testListPagedFloatingIP() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -205,37 +151,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest { } } - public void testListPagedFloatingIPFail() 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 testGetFloatingIP() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -274,37 +189,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetFloatingIPFail() 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(); - - FloatingIP floatingIP = api.get("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/floatingips/12345"); - - /* - * Check response - */ - assertNull(floatingIP); - - } finally { - server.shutdown(); - } - } - public void testUpdateFloatingIP() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -375,40 +259,6 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest { } } - public void testUpdateFloatingIPFail() 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(); - - FloatingIP.UpdateFloatingIP updateFloatingIP = FloatingIP.updateBuilder() - .portId("fc861431-0e6c-4842-a0ed-e2363f9bc3a8") - .build(); - - FloatingIP floatingIP = api.update("12345", updateFloatingIP); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/floatingips/12345", "/floatingip_update_request.json"); - - /* - * Check response - */ - assertNull(floatingIP); - } finally { - server.shutdown(); - } - } - public void testDeleteFloatingIP() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -439,33 +289,4 @@ public class FloatingIPApiMockTest extends BaseNeutronApiMockTest { } } - public void testDeleteFloatingIPFail() 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(); - - boolean result = api.delete("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/floatingips/12345"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01ca3425/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java index 902518e..16859f4 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/RouterApiMockTest.java @@ -17,11 +17,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 static org.testng.Assert.fail; import java.io.IOException; import java.net.URISyntaxException; @@ -35,7 +32,6 @@ import org.jclouds.openstack.neutron.v2.domain.RouterInterface; import org.jclouds.openstack.neutron.v2.domain.Routers; import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; import com.squareup.okhttp.mockwebserver.MockResponse; @@ -92,30 +88,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateRouterFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - Router.CreateRouter createRouter = Router.createBuilder().name("another_router").adminStateUp(Boolean.TRUE) - .externalGatewayInfo(ExternalGatewayInfo.builder().networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b").build()) - .build(); - - api.create(createRouter); - fail("Should have failed with not found exception"); - - } finally { - server.shutdown(); - } - } - public void testListSpecificPageRouter() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -147,36 +119,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testListSpecificPageRouterFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - Routers routers = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/routers?limit=2&marker=abcdefg"); - - /* - * Check response - */ - assertNotNull(routers); - assertTrue(routers.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testListPagedRouter() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -212,37 +154,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testListPagedRouterFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - // Note: Lazy! Have to actually look at the collection. - List<Router> routers = api.list().concat().toList(); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/routers"); - - /* - * Check response - */ - assertNotNull(routers); - assertTrue(routers.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testGetRouter() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -279,36 +190,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetRouterFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - Router router = api.get("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/routers/12345"); - - /* - * Check response - */ - assertNull(router); - } finally { - server.shutdown(); - } - } - public void testUpdateRouter() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -350,41 +231,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testUpdateRouterFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - Router.UpdateRouter updateRouter = Router.updateBuilder() - .externalGatewayInfo( - ExternalGatewayInfo.builder().networkId("8ca37218-28ff-41cb-9b10-039601ea7e6b").build()) - .build(); - - Router router = api.update("12345", updateRouter); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345", "/router_update_request.json"); - - /* - * Check response - */ - assertNull(router); - } finally { - server.shutdown(); - } - } - public void testDeleteRouter() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -415,36 +261,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testDeleteRouterFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - boolean result = api.delete("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/routers/12345"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } - public void testAddRouterInterfaceForSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -476,36 +292,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testAddRouterInterfaceForSubnetFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - RouterInterface routerInterface = api.addInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/add_router_interface", "/router_add_interface_request.json"); - - /* - * Check response - */ - assertNull(routerInterface); - } finally { - server.shutdown(); - } - } - public void testAddRouterInterfaceForPort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -538,36 +324,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testAddRouterInterfaceForPortFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - RouterInterface routerInterface = api.addInterfaceForPort("12345", "portid"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/add_router_interface", "/router_add_interface_port_request.json"); - - /* - * Check response - */ - assertNull(routerInterface); - } finally { - server.shutdown(); - } - } - public void testRemoveRouterInterfaceForSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -598,36 +354,6 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testRemoveRouterInterfaceForSubnetFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - boolean result = api.removeInterfaceForSubnet("12345", "a2f1f29d-571b-4533-907f-5803ab96ead1"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/remove_router_interface", "/router_remove_interface_subnet_request.json"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } - public void testRemoveRouterInterfaceForPort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -658,33 +384,4 @@ public class RouterApiMockTest extends BaseNeutronApiMockTest { } } - public void testRemoveRouterInterfaceForPortFail() 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); - RouterApi api = neutronApi.getRouterApi("RegionOne").get(); - - boolean result = api.removeInterfaceForPort("12345", "portid"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/routers/12345/remove_router_interface", "/router_remove_interface_port_request.json"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01ca3425/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java index 6494a05..682232e 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiMockTest.java @@ -17,9 +17,7 @@ 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; @@ -36,7 +34,6 @@ import org.jclouds.openstack.neutron.v2.domain.SecurityGroup; import org.jclouds.openstack.neutron.v2.domain.SecurityGroups; import org.jclouds.openstack.neutron.v2.internal.BaseNeutronApiMockTest; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; import com.squareup.okhttp.mockwebserver.MockResponse; @@ -93,28 +90,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateSecurityGroupFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - SecurityGroup.CreateSecurityGroup createSecurityGroup = SecurityGroup.createBuilder().name("new-webservers") - .description("security group for webservers") - .build(); - - SecurityGroup securityGroup = api.create(createSecurityGroup); - } finally { - server.shutdown(); - } - } - public void testCreateSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -164,33 +139,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateSecurityGroupRuleFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - Rule.CreateRule createSecurityGroupRule = Rule.createBuilder( - RuleDirection.INGRESS, "a7734e61-b545-452d-a3cd-0189cbd9747a") - .portRangeMin(80) - .portRangeMax(80) - .ethertype(RuleEthertype.IPV4) - .protocol(RuleProtocol.TCP) - .remoteGroupId("85cc3048-abc3-43cc-89b3-377341426ac5") - .build(); - - Rule rule = api.create(createSecurityGroupRule); - } finally { - server.shutdown(); - } - } - public void testListSpecificPageSecurityGroup() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -224,36 +172,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - public void testListSpecificPageSecurityGroupFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - SecurityGroups securityGroups = api.listSecurityGroups(PaginationOptions.Builder.limit(2).marker("abcdefg")); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-groups?limit=2&marker=abcdefg"); - - /* - * Check response - */ - assertNotNull(securityGroups); - assertTrue(securityGroups.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testListSpecificPageSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -287,36 +205,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - public void testListSpecificPageSecurityGroupRuleFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - Rules rules = api.listRules(PaginationOptions.Builder.limit(2).marker("abcdefg")); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-group-rules?limit=2&marker=abcdefg"); - - /* - * Check response - */ - assertNotNull(rules); - assertTrue(rules.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testListPagedSecurityGroups() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -354,38 +242,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - public void testListPagedSecurityGroupsFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - // Note: Lazy! Have to actually look at the collection. - List<SecurityGroup> securityGroups = api.listSecurityGroups().concat().toList(); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-groups"); - - /* - * Check response - */ - assertNotNull(securityGroups); - assertTrue(securityGroups.isEmpty()); - - } finally { - server.shutdown(); - } - } - public void testListPagedSecurityGroupRules() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -423,38 +279,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - public void testListPagedSecurityGroupRulesFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - // Note: Lazy! Have to actually look at the collection. - List<Rule> rules = api.listRules().concat().toList(); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-group-rules"); - - /* - * Check response - */ - assertNotNull(rules); - assertTrue(rules.isEmpty()); - - } finally { - server.shutdown(); - } - } - public void testGetSecurityGroup() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -491,37 +315,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetSecurityGroupFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - SecurityGroup securityGroup = api.getSecurityGroup("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-groups/12345"); - - /* - * Check response - */ - assertNull(securityGroup); - - } finally { - server.shutdown(); - } - } - public void testGetSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -558,37 +351,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetSecurityGroupRuleFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - Rule rule = api.get("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/security-group-rules/12345"); - - /* - * Check response - */ - assertNull(rule); - - } finally { - server.shutdown(); - } - } - public void testDeleteSecurityGroup() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -619,36 +381,6 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { } } - public void testDeleteSecurityGroupFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - boolean result = api.deleteSecurityGroup("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/security-groups/12345"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } - public void testDeleteSecurityGroupRule() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -678,34 +410,4 @@ public class SecurityGroupApiMockTest extends BaseNeutronApiMockTest { server.shutdown(); } } - - public void testDeleteSecurityGroupRuleFail() 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); - SecurityGroupApi api = neutronApi.getSecurityGroupApi("RegionOne").get(); - - boolean result = api.deleteRule("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 3); - assertAuthentication(server); - assertExtensions(server, uriApiVersion + ""); - assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/security-group-rules/12345"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } }
