Repository: jclouds Updated Branches: refs/heads/master 6fd7c7c38 -> 3ac9279ac
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0485a564/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java index 738ede5..a9a2dc4 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/PortApiMockTest.java @@ -61,7 +61,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); PortApi api = neutronApi.getPortApi("RegionOne"); - Port.CreateOptions createPort = Port.createOptions("6aeaf34a-c482-4bd3-9dc3-7faf36412f12") + Port.CreatePort createPort = Port.createBuilder("6aeaf34a-c482-4bd3-9dc3-7faf36412f12") .name("port1") .adminStateUp(true) .deviceId("d6b4d3a5-c700-476f-b609-1493dd9dadc0") @@ -108,7 +108,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); PortApi api = neutronApi.getPortApi("RegionOne"); - Port.CreateOptions createPort = Port.createOptions("6aeaf34a-c482-4bd3-9dc3-7faf36412f12") + Port.CreatePort createPort = Port.createBuilder("6aeaf34a-c482-4bd3-9dc3-7faf36412f12") .name("port1") .adminStateUp(true) .deviceId("d6b4d3a5-c700-476f-b609-1493dd9dadc0") @@ -246,14 +246,14 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); PortApi api = neutronApi.getPortApi("RegionOne"); - Port.CreateOptions createPort1 = Port.createOptions("64239a54-dcc4-4b39-920b-b37c2144effa") + Port.CreatePort createPort1 = Port.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa") .name("port1") .adminStateUp(true) .deviceId("24df1d04-d5cb-41e1-8de5-61ed77c558df") .securityGroups(ImmutableSet.of("dbc107f4-afcd-4d5a-9352-f68f82241d5b")) .build(); - Port.CreateOptions createPort2 = Port.createOptions("e6031bc2-901a-4c66-82da-f4c32ed89406") + Port.CreatePort createPort2 = Port.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406") .name("port2") .adminStateUp(false) .securityGroups( @@ -291,14 +291,14 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); PortApi api = neutronApi.getPortApi("RegionOne"); - Port.CreateOptions createPort1 = Port.createOptions("64239a54-dcc4-4b39-920b-b37c2144effa") + Port.CreatePort createPort1 = Port.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa") .name("port1") .adminStateUp(true) .deviceId("24df1d04-d5cb-41e1-8de5-61ed77c558df") .securityGroups(ImmutableSet.of("dbc107f4-afcd-4d5a-9352-f68f82241d5b")) .build(); - Port.CreateOptions createPort2 = Port.createOptions("e6031bc2-901a-4c66-82da-f4c32ed89406") + Port.CreatePort createPort2 = Port.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406") .name("port2") .adminStateUp(false) .securityGroups( @@ -384,7 +384,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); PortApi api = neutronApi.getPortApi("RegionOne"); - Port.UpdateOptions updatePort = Port.updateOptions() + Port.UpdatePort updatePort = Port.updateBuilder() .securityGroups( ImmutableSet.of("85cc3048-abc3-43cc-89b3-377341426ac5", "c5ab5c29-2c99-44cb-a4b8-e70a88b77799")) .build(); @@ -417,7 +417,7 @@ public class PortApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); PortApi api = neutronApi.getPortApi("RegionOne"); - Port.UpdateOptions updatePort = Port.updateOptions() + Port.UpdatePort updatePort = Port.updateBuilder() .securityGroups(ImmutableSet.of("85cc3048-abc3-43cc-89b3-377341426ac5", "c5ab5c29-2c99-44cb-a4b8-e70a88b77799")) .build(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/0485a564/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiLiveTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiLiveTest.java index 3e1adb8..3c5d7a8 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiLiveTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiLiveTest.java @@ -44,7 +44,7 @@ public class SubnetApiLiveTest extends BaseNeutronApiLiveTest { public void testCreateUpdateAndDeleteSubnet() { for (String region : api.getConfiguredRegions()) { NetworkApi networkApi = api.getNetworkApi(region); - String networkId = networkApi.create(Network.createOptions("jclouds-live-test").networkType(NetworkType.LOCAL).build()).getId(); + String networkId = networkApi.create(Network.createBuilder("jclouds-live-test").networkType(NetworkType.LOCAL).build()).getId(); SubnetApi subnetApi = api.getSubnetApi(region); ImmutableSet<AllocationPool> allocationPools = ImmutableSet.of( @@ -54,7 +54,7 @@ public class SubnetApiLiveTest extends BaseNeutronApiLiveTest { ImmutableSet<HostRoute> hostRoutes = ImmutableSet.of( HostRoute.builder().destinationCidr("a3:bc00::/48").nextHop("a3:bc00::0004").build() ); - Subnet subnet = subnetApi.create(Subnet.createOptions(networkId, "a3:bc00::/48").ipVersion(6).allocationPools(allocationPools).hostRoutes(hostRoutes).build()); + Subnet subnet = subnetApi.create(Subnet.createBuilder(networkId, "a3:bc00::/48").ipVersion(6).allocationPools(allocationPools).hostRoutes(hostRoutes).build()); assertNotNull(subnet); /* Test list and get */ @@ -71,7 +71,7 @@ public class SubnetApiLiveTest extends BaseNeutronApiLiveTest { assertTrue(retrievedSubnet.getDnsNameservers().isEmpty()); assertEquals(retrievedSubnet.getAllocationPools().size(), 2); assertEquals(retrievedSubnet.getHostRoutes().size(), 1); - assertNotNull(subnetApi.update(retrievedSubnet.getId(), Subnet.updateOptions().name("jclouds-live-test-update").build())); + assertNotNull(subnetApi.update(retrievedSubnet.getId(), Subnet.updateBuilder().name("jclouds-live-test-update").build())); retrievedSubnet = subnetApi.get(retrievedSubnet.getId()); @@ -79,7 +79,7 @@ public class SubnetApiLiveTest extends BaseNeutronApiLiveTest { assertEquals(retrievedSubnet.getName(), "jclouds-live-test-update"); assertTrue(retrievedSubnet.getDnsNameservers().isEmpty()); - Subnet subnet2 = subnetApi.create(Subnet.createOptions(networkId, "a3:bd01::/48").ipVersion(6).build()); + Subnet subnet2 = subnetApi.create(Subnet.createBuilder(networkId, "a3:bd01::/48").ipVersion(6).build()); assertNotNull(subnet2); assertTrue(subnetApi.delete(subnet.getId())); @@ -91,14 +91,14 @@ public class SubnetApiLiveTest extends BaseNeutronApiLiveTest { public void testBulkCreateSubnet() { for (String region : api.getConfiguredRegions()) { NetworkApi networkApi = api.getNetworkApi(region); - String networkId = networkApi.create(Network.createOptions("jclouds-live-test").networkType(NetworkType.LOCAL).build()).getId(); + String networkId = networkApi.create(Network.createBuilder("jclouds-live-test").networkType(NetworkType.LOCAL).build()).getId(); SubnetApi subnetApi = api.getSubnetApi(region); Set<? extends Subnet> subnets = subnetApi.createBulk( ImmutableList.of( - Subnet.createOptions("jclouds-live-test-1", "a3:bd01::/48").ipVersion(6).networkId(networkId).build(), - Subnet.createOptions("jclouds-live-test-2", "a3:bd02::/48").ipVersion(6).networkId(networkId).build(), - Subnet.createOptions("jclouds-live-test-3", "a3:bd03::/48").ipVersion(6).networkId(networkId).build() + Subnet.createBuilder("jclouds-live-test-1", "a3:bd01::/48").ipVersion(6).networkId(networkId).build(), + Subnet.createBuilder("jclouds-live-test-2", "a3:bd02::/48").ipVersion(6).networkId(networkId).build(), + Subnet.createBuilder("jclouds-live-test-3", "a3:bd03::/48").ipVersion(6).networkId(networkId).build() ) ).toSet(); Set<Subnet> existingSubnets = subnetApi.list().concat().toSet(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/0485a564/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java index 51855ad..3571b0c 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/features/SubnetApiMockTest.java @@ -55,7 +55,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - Subnet.CreateOptions createSubnet = Subnet.createOptions("1234567890", "10.0.3.0/24") + Subnet.CreateSubnet createSubnet = Subnet.createBuilder("1234567890", "10.0.3.0/24") .name("jclouds-wibble") .ipVersion(4) .build(); @@ -92,7 +92,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - Subnet.CreateOptions createSubnet = Subnet.createOptions("1234567890", "cidr") + Subnet.CreateSubnet createSubnet = Subnet.createBuilder("1234567890", "cidr") .name("jclouds-wibble") .ipVersion(4) .build(); @@ -284,12 +284,12 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - Subnet.CreateOptions createSubnet1 = Subnet.createOptions("e6031bc2-901a-4c66-82da-f4c32ed89406", + Subnet.CreateSubnet createSubnet1 = Subnet.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406", "192.168.199.0/24") .ipVersion(4) .build(); - Subnet.CreateOptions createSubnet2 = Subnet.createOptions("64239a54-dcc4-4b39-920b-b37c2144effa", + Subnet.CreateSubnet createSubnet2 = Subnet.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa", "10.56.4.0/22") .ipVersion(4) .build(); @@ -333,12 +333,12 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - Subnet.CreateOptions createSubnet1 = Subnet.createOptions("e6031bc2-901a-4c66-82da-f4c32ed89406", + Subnet.CreateSubnet createSubnet1 = Subnet.createBuilder("e6031bc2-901a-4c66-82da-f4c32ed89406", "192.168.199.0/24") .ipVersion(4) .build(); - Subnet.CreateOptions createSubnet2 = Subnet.createOptions("64239a54-dcc4-4b39-920b-b37c2144effa", + Subnet.CreateSubnet createSubnet2 = Subnet.createBuilder("64239a54-dcc4-4b39-920b-b37c2144effa", "10.56.4.0/22") .ipVersion(4) .build(); @@ -358,7 +358,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - Subnet.UpdateOptions updateSubnet = Subnet.updateOptions() + Subnet.UpdateSubnet updateSubnet = Subnet.updateBuilder() .name("new_name") .gatewayIp("10.0.3.254") .build(); @@ -393,7 +393,7 @@ public class SubnetApiMockTest extends BaseNeutronApiMockTest { NeutronApi neutronApi = api(server.getUrl("/").toString(), "openstack-neutron", overrides); SubnetApi api = neutronApi.getSubnetApi("RegionOne"); - Subnet.UpdateOptions updateSubnet = Subnet.updateOptions() + Subnet.UpdateSubnet updateSubnet = Subnet.updateBuilder() .name("new_name") .gatewayIp("10.0.3.254") .build();
