Repository: jclouds-labs-openstack Updated Branches: refs/heads/master 3b490162a -> 167312fb4
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java index e0b6e1c..a929881 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/ExtensionApiMockTest.java @@ -18,8 +18,6 @@ package org.jclouds.openstack.neutron.v2.features; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; import java.util.Set; @@ -67,33 +65,6 @@ public class ExtensionApiMockTest extends BaseNeutronApiMockTest { } } - public void testListExtensionsIsEmpty() throws Exception { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - ExtensionApi api = neutronApi.getExtensionApi("RegionOne"); - - Set<Extension> extensions = api.list(); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/extensions"); - - /* - * Check response - */ - assertTrue(extensions.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testGetExtensionByAlias() throws Exception { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -122,31 +93,4 @@ public class ExtensionApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetExtensionByAliasFail() throws Exception { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - - Extension routerExtension = neutronApi.getExtensionApi("RegionOne").get("router"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/extensions/router"); - - /* - * Check response - */ - assertNull(routerExtension); - } finally { - server.shutdown(); - } - - } - } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java index 5de307e..95e3f4c 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/NetworkApiMockTest.java @@ -20,6 +20,7 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; + import org.jclouds.openstack.neutron.v2.NeutronApi; import org.jclouds.openstack.neutron.v2.domain.Network; import org.jclouds.openstack.neutron.v2.domain.NetworkStatus; @@ -27,7 +28,6 @@ import org.jclouds.openstack.neutron.v2.domain.NetworkType; import org.jclouds.openstack.neutron.v2.domain.Networks; 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 java.io.IOException; @@ -35,9 +35,7 @@ import java.net.URISyntaxException; import java.util.List; 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; /** @@ -82,26 +80,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateNetworkFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/network_create_response.json")))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - NetworkApi api = neutronApi.getNetworkApi("RegionOne"); - - Network.CreateNetwork createNetwork = Network.createBuilder("jclouds-wibble") - .networkType(NetworkType.LOCAL) - .build(); - - Network network = api.create(createNetwork); - } finally { - server.shutdown(); - } - } - public void testListSpecificPageNetwork() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -191,35 +169,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest { } } - public void testListPagedNetworkFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/network_list_response_paged1.json")))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - NetworkApi api = neutronApi.getNetworkApi("RegionOne"); - - // Note: Lazy! Have to actually look at the collection. - List<Network> networks = api.list().concat().toList(); - - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/networks"); - - /* - * Check response - */ - assertTrue(networks.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testGetNetwork() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -249,33 +198,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetNetworkFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - NetworkApi api = neutronApi.getNetworkApi("RegionOne"); - - Network network = api.get("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/networks/12345"); - - /* - * Check response - */ - assertNull(network); - } finally { - server.shutdown(); - } - } - public void testCreateNetworkBulk() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -322,30 +244,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateNetworkBulkFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - NetworkApi api = neutronApi.getNetworkApi("RegionOne"); - - Network.CreateNetwork createNetwork1 = Network.createBuilder("jclouds-wibble") - .networkType(NetworkType.LOCAL) - .build(); - - Network.CreateNetwork createNetwork2 = Network.createBuilder("jclouds-wibble2") - .networkType(NetworkType.LOCAL) - .build(); - - FluentIterable<Network> networks = api.createBulk(ImmutableList.of(createNetwork1, createNetwork2)); - } finally { - server.shutdown(); - } - } - public void testUpdateNetwork() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -379,37 +277,6 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest { } } - public void testUpdateNetworkFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - NetworkApi api = neutronApi.getNetworkApi("RegionOne"); - - Network.UpdateNetwork updateNetwork = Network.updateBuilder() - .name("jclouds-wibble-updated") - .networkType(NetworkType.LOCAL) - .build(); - - Network network = api.update("123456", updateNetwork); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/networks/123456"); - - /* - * Check response - */ - assertNull(network); - } finally { - server.shutdown(); - } - } - public void testDeleteNetwork() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -436,29 +303,4 @@ public class NetworkApiMockTest extends BaseNeutronApiMockTest { } } - public void testDeleteNetworkFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - NetworkApi api = neutronApi.getNetworkApi("RegionOne"); - - boolean result = api.delete("123456"); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/networks/123456"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java index 8b4797d..a8932c7 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java @@ -17,9 +17,7 @@ package org.jclouds.openstack.neutron.v2.features; 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.VIFType; import org.jclouds.openstack.neutron.v2.domain.VNICType; 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.google.common.collect.FluentIterable; @@ -98,30 +95,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreatePortFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders( - new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - PortApi api = neutronApi.getPortApi("RegionOne"); - - Port.CreatePort createPort = Port.createBuilder("6aeaf34a-c482-4bd3-9dc3-7faf36412f12") - .name("port1") - .adminStateUp(Boolean.TRUE) - .deviceId("d6b4d3a5-c700-476f-b609-1493dd9dadc0") - .allowedAddressPairs(ImmutableSet.of(AddressPair.builder("12", "111.222.333.444").build())) - .build(); - - Port port = api.create(createPort); - } finally { - server.shutdown(); - } - } - public void testListSpecificPagePort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -150,32 +123,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { } } - public void testListSpecificPagePortFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - PortApi api = neutronApi.getPortApi("RegionOne"); - - Ports ports = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/ports?limit=2&marker=abcdefg"); - - /* - * Check response - */ - assertTrue(ports.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testListPagedPort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -209,34 +156,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { } } - public void testListPagedPortFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - PortApi api = neutronApi.getPortApi("RegionOne"); - - // Note: Lazy! Have to actually look at the collection. - List<Port> ports = api.list().concat().toList(); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/ports"); - - /* - * Check response - */ - assertTrue(ports.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testCreateBulkPort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -281,37 +200,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateBulkPortFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders( - new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - PortApi api = neutronApi.getPortApi("RegionOne"); - - Port.CreatePort createPort1 = Port.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa") - .name("port1") - .adminStateUp(Boolean.TRUE) - .deviceId("24df1d04-d5cb-41e1-8de5-61ed77c558df") - .securityGroups(ImmutableSet.of("dbc107f4-afcd-4d5a-9352-f68f82241d5b")) - .build(); - - Port.CreatePort createPort2 = Port.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406") - .name("port2") - .adminStateUp(Boolean.FALSE) - .securityGroups( - ImmutableSet.of("8bf3f7cc-8471-40b1-815f-9da47e79775b", "dbc107f4-afcd-4d5a-9352-f68f82241d5b")) - .build(); - - FluentIterable<Port> ports = api.createBulk(ImmutableList.of(createPort1, createPort2)); - } finally { - server.shutdown(); - } - } - public void testGetPort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -348,33 +236,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetPortFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders( - new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - PortApi api = neutronApi.getPortApi("RegionOne"); - - Port port = api.get("12345"); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/ports/12345"); - - /* - * Check response - */ - assertNull(port); - } finally { - server.shutdown(); - } - } - public void testUpdatePort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -408,37 +269,6 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { } } - public void testUpdatePortFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders( - new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - PortApi api = neutronApi.getPortApi("RegionOne"); - - Port.UpdatePort updatePort = Port.updateBuilder() - .securityGroups(ImmutableSet.of("85cc3048-abc3-43cc-89b3-377341426ac5", "c5ab5c29-2c99-44cb-a4b8-e70a88b77799")) - .build(); - - Port port = api.update("12345", updatePort); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/ports/12345", "/port_update_request.json"); - - /* - * Check response - */ - assertNull(port); - } finally { - server.shutdown(); - } - } - public void testDeletePort() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -465,29 +295,4 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { } } - public void testDeletePortFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - PortApi api = neutronApi.getPortApi("RegionOne"); - - boolean result = api.delete("12345"); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/ports/12345"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java index bfe3d12..036bad7 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java @@ -17,9 +17,7 @@ package org.jclouds.openstack.neutron.v2.features; 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; @@ -32,7 +30,6 @@ import org.jclouds.openstack.neutron.v2.domain.Subnet; import org.jclouds.openstack.neutron.v2.domain.Subnets; 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.google.common.collect.FluentIterable; @@ -83,27 +80,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateSubnetFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - - Subnet.CreateSubnet createSubnet = Subnet.createBuilder("1234567890", "cidr") - .name("jclouds-wibble") - .ipVersion(4) - .build(); - - Subnet subnet = api.create(createSubnet); - } finally { - server.shutdown(); - } - } - public void testListSpecificPageSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -131,32 +107,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { } } - public void testListSpecificPageSubnetFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - - Subnets subnets = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets?limit=2&marker=abcdefg"); - - /* - * Check response - */ - assertTrue(subnets.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testListPagedSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -190,34 +140,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { } } - public void testListPagedSubnetFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - - // Note: Lazy! Have to actually look at the collection. - List<Subnet> subnets = api.list().concat().toList(); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets"); - - /* - * Check response - */ - assertTrue(subnets.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testGetSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -249,33 +171,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { } } - public void testGetSubnetFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - - Subnet subnet = api.get("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", uriApiVersion + "/subnets/12345"); - - /* - * Check response - */ - assertNull(subnet); - } finally { - server.shutdown(); - } - } - public void testCreateBulkSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -324,32 +219,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { } } - @Test(expectedExceptions = ResourceNotFoundException.class) - public void testCreateBulkSubnetFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - - Subnet.CreateSubnet createSubnet1 = Subnet.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406", - "192.168.199.0/24") - .ipVersion(4) - .build(); - - Subnet.CreateSubnet createSubnet2 = Subnet.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa", - "10.56.4.0/22") - .ipVersion(4) - .build(); - - FluentIterable<Subnet> subnets = api.createBulk(ImmutableList.of(createSubnet1, createSubnet2)); - } finally { - server.shutdown(); - } - } - public void testUpdateSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -385,38 +254,6 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { } } - public void testUpdateSubnetFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - - Subnet.UpdateSubnet updateSubnet = Subnet.updateBuilder() - .name("new_name") - .gatewayIp("10.0.3.254") - .build(); - - Subnet subnet = api.update("12345", updateSubnet); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "PUT", uriApiVersion + "/subnets/12345", "/subnet_update_request.json"); - - /* - * Check response - */ - assertNull(subnet); - } finally { - server.shutdown(); - } - } - public void testDeleteSubnet() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -444,30 +281,4 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { } } - public void testDeleteSubnetFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); - SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - - boolean result = api.delete("12345"); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "DELETE", uriApiVersion + "/subnets/12345"); - - /* - * Check response - */ - assertFalse(result); - } finally { - server.shutdown(); - } - } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java ---------------------------------------------------------------------- diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java index 6ed062a..dfc86de 100644 --- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java +++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/features/ServiceApi.java @@ -114,7 +114,6 @@ public interface ServiceApi { @POST @ResponseParser(ParseServiceURIFromHeaders.class) @Produces(MediaType.APPLICATION_JSON) - @Nullable URI create(@BinderParam(BindToJsonPayload.class) CreateService createService); /** @@ -144,7 +143,6 @@ public interface ServiceApi { @Path("/{id}") @ResponseParser(ParseServiceURIFromHeaders.class) @MapBinder(JSONPatchUpdate.class) - @Nullable URI update(@PathParam("id") String id, @PayloadParam("service") Service service, @PayloadParam("updateService") UpdateService updateService); /** http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/167312fb/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java index f634386..d487a19 100644 --- a/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java +++ b/openstack-poppy/src/test/java/org/jclouds/openstack/poppy/v1/features/ServiceApiMockTest.java @@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import static org.testng.AssertJUnit.assertFalse; import java.io.IOException; import java.net.URI; @@ -117,28 +116,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest { } } - public void testGetServiceFailOn404() throws Exception { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404))); - - try { - PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides); - ServiceApi api = poppyApi.getServiceApi(); - - Service oneService = api.get("unknown"); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", BASE_URI + "/services/unknown"); - - assertThat(oneService).isNull(); - - } finally { - server.shutdown(); - } - } - public void testListPagedService() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -174,34 +151,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest { } } - public void testListPagedServiceFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/poppy_service_list_response_paged1.json")))); - - try { - PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides); - ServiceApi api = poppyApi.getServiceApi(); - - // Note: Lazy! Have to actually look at the collection. - List<Service> services = api.list().concat().toList(); - - /* - * Check request - */ - assertEquals(server.getRequestCount(), 2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", "/v1.0/123123/services"); - - /* - * Check response - */ - assertTrue(services.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testListSpecificPageService() throws IOException, InterruptedException, URISyntaxException { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -229,32 +178,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest { } } - public void testListSpecificPageServiceFail() throws IOException, InterruptedException, URISyntaxException { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/poppy_service_list_response_paged1.json")))); - - try { - PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides); - ServiceApi api = poppyApi.getServiceApi(); - - PaginatedCollection<Service> services = api.list(PaginationOptions.Builder.limit(2).marker("abcdefg")); - - /* - * Check request - */ - assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", "/v1.0/123123/services?limit=2&marker=abcdefg"); - - /* - * Check response - */ - assertTrue(services.isEmpty()); - } finally { - server.shutdown(); - } - } - public void testPatchService() throws Exception { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -306,28 +229,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest { } } - public void testDeleteServiceFail() throws Exception { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders( - new MockResponse().setResponseCode(404))); - - try { - PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides); - ServiceApi api = poppyApi.getServiceApi(); - - boolean result = api.delete("96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0"); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "DELETE", BASE_URI + "/services/96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0"); - - assertFalse(result); - } finally { - server.shutdown(); - } - } - public void testDeleteServiceAsset() throws Exception { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -351,29 +252,6 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest { } } - public void testDeleteServiceAssetFail() throws Exception { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders( - new MockResponse().setResponseCode(404))); - - try { - PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides); - ServiceApi api = poppyApi.getServiceApi(); - - boolean result = api.deleteAsset("96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0", "/images/1.jpg"); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "DELETE", - BASE_URI + "/services/96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0/assets?url=/images/1.jpg"); - - assertFalse(result); - } finally { - server.shutdown(); - } - } - public void testDeleteAllServiceAssets() throws Exception { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); @@ -397,26 +275,4 @@ public class ServiceApiMockTest extends BasePoppyApiMockTest { } } - public void testDeleteAllServiceAssetsFail() throws Exception { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders( - new MockResponse().setResponseCode(404))); - - try { - PoppyApi poppyApi = api(server.getUrl("/").toString(), "openstack-poppy", overrides); - ServiceApi api = poppyApi.getServiceApi(); - - boolean result = api.deleteAssets("96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0"); - - assertThat(server.getRequestCount()).isEqualTo(2); - assertAuthentication(server); - assertRequest(server.takeRequest(), "DELETE", - BASE_URI + "/services/96737ae3-cfc1-4c72-be88-5d0e7cc9a3f0/assets?all=true"); - - assertFalse(result); - } finally { - server.shutdown(); - } - } }
