http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/RollbackSnapshotRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/RollbackSnapshotRequestBinderTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/RollbackSnapshotRequestBinderTest.java index e1ba061..87a043c 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/RollbackSnapshotRequestBinderTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/RollbackSnapshotRequestBinderTest.java @@ -28,10 +28,7 @@ public class RollbackSnapshotRequestBinderTest { public void testRollbackPayload() { RollbackSnapshotRequestBinder binder = new RollbackSnapshotRequestBinder(); - Snapshot.Request.RollbackPayload payload = Snapshot.Request.rollbackBuilder() - .snapshotId("snapshot-id") - .storageId("storage-id") - .build(); + Snapshot.Request.RollbackPayload payload = Snapshot.Request.createRollbackPayload("snapshot-id", "storage-id"); String actual = binder.createPayload(payload); assertNotNull(actual, "Binder returned null payload");
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/UpdateSnapshotRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/UpdateSnapshotRequestBinderTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/UpdateSnapshotRequestBinderTest.java index 3acb8e1..1809a1c 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/UpdateSnapshotRequestBinderTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/snapshot/UpdateSnapshotRequestBinderTest.java @@ -30,7 +30,21 @@ public class UpdateSnapshotRequestBinderTest { public void testUpdatePayload() { UpdateSnapshotRequestBinder binder = new UpdateSnapshotRequestBinder(); - Snapshot.Request.UpdatePayload payload = Snapshot.Request.UpdatePayload.create("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh", "description", "snapshot-name", true, OsType.LINUX, true, true, true, true, true, true, true, true); + Snapshot.Request.UpdatePayload payload = Snapshot.Request.updatingBuilder() + .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") + .description("description") + .name("snapshot-name") + .bootable(true) + .osType(OsType.LINUX) + .isCpuHotPlug(true) + .isCpuHotUnPlug(true) + .isRamHotPlug(true) + .isRamHotUnPlug(true) + .isNicHotPlug(true) + .isNicHotUnPlug(true) + .isDiscVirtioHotPlug(true) + .isDiscVirtioHotUnPlug(true) + .build(); String actual = binder.createPayload(payload); assertNotNull(actual, "Binder returned null payload"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/function/ServerToNodeMetadataTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/function/ServerToNodeMetadataTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/function/ServerToNodeMetadataTest.java index 5fba62b..7f1da39 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/function/ServerToNodeMetadataTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/function/ServerToNodeMetadataTest.java @@ -130,7 +130,7 @@ public class ServerToNodeMetadataTest { .internetAccess(true) .serverId("qwertyui-qwer-qwer-qwer-qwertyyuiiop") .macAddress("02:01:09:cd:f0:b0") - .ip("173.252.120.6") + .ips( ImmutableList.<String>of("173.252.120.6")) .build() ) ) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/FirewallRuleBuilderTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/FirewallRuleBuilderTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/FirewallRuleBuilderTest.java index af29eae..6f43604 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/FirewallRuleBuilderTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/FirewallRuleBuilderTest.java @@ -58,7 +58,7 @@ public class FirewallRuleBuilderTest { @Test public void testAutoValueFirewallRuleWithIcmpPropertiesSettingCorrectly() { - Firewall.RuleWithIcmp actual = Firewall.RuleWithIcmp.builder() + Firewall.Rule actual = Firewall.Rule.builder() .name(_name) .icmpCode(_icmpCode) .icmpType(_icmpType) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/ServerBuilderTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/ServerBuilderTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/ServerBuilderTest.java index c04f65c..6cad856 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/ServerBuilderTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/domain/ServerBuilderTest.java @@ -29,8 +29,8 @@ public class ServerBuilderTest { private final Boolean _isNicHotUnPlug = false; private final Boolean _isDiscVirtioHotPlug = true; private final Boolean _isDiscVirtioHotUnPlug = false; - private final int _cores = 8; - private final int _ram = 8 * 1024; + private final Integer _cores = 8; + private final Integer _ram = 8 * 1024; private final String _id = "some-random-server-id"; private final String _name = "jclouds-node"; private final Boolean _hasInternetAccess = true; @@ -110,7 +110,7 @@ public class ServerBuilderTest { assertEquals(actual.availabilityZone(), _availabilityZone); assertEquals(actual.bootFromImageId(), _bootFromImageId); assertEquals(actual.bootFromStorageId(), _bootFromStorageId); - assertEquals(actual.cores(), _cores); + assertEquals(actual.cores(), _cores.intValue()); assertEquals(actual.dataCenterId(), _dataCenterId); assertEquals(actual.hasInternetAccess(), _hasInternetAccess); assertEquals(actual.name(), _name); @@ -121,7 +121,7 @@ public class ServerBuilderTest { assertEquals(actual.isNicHotUnPlug(), _isNicHotUnPlug); assertEquals(actual.isRamHotPlug(), _isRamHotPlug); assertEquals(actual.lanId(), _lanId); - assertEquals(actual.ram(), _ram); + assertEquals(actual.ram(), _ram.intValue()); assertEquals(actual.osType(), _osType); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiLiveTest.java index 36191ca..6bcf053 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiLiveTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiLiveTest.java @@ -41,7 +41,7 @@ public class DataCenterApiLiveTest extends BaseProfitBricksLiveTest { @Test public void testCreateDataCenter() { DataCenter dc = api.dataCenterApi().createDataCenter( - DataCenter.Request.CreatePayload.create("JClouds", Location.DE_FKB) + DataCenter.Request.creatingPayload("JClouds", Location.DE_FKB) ); assertNotNull(dc); @@ -83,7 +83,7 @@ public class DataCenterApiLiveTest extends BaseProfitBricksLiveTest { final String newName = "Apache"; DataCenter dataCenter = api.dataCenterApi().updateDataCenter( - DataCenter.Request.UpdatePayload.create(dcId, newName) + DataCenter.Request.updatingPayload(dcId, newName) ); assertNotNull(dataCenter); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiMockTest.java index 586487b..262d34a 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiMockTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DataCenterApiMockTest.java @@ -153,7 +153,7 @@ public class DataCenterApiMockTest extends BaseProfitBricksMockTest { + "</request></ws:createDataCenter>"; try { DataCenter dataCenter = api.createDataCenter( - DataCenter.Request.CreatePayload.create("JClouds-DC", Location.DE_FRA) + DataCenter.Request.creatingPayload("JClouds-DC", Location.DE_FRA) ); assertRequestHasCommonProperties(server.takeRequest(), content); assertNotNull(dataCenter); @@ -170,7 +170,7 @@ public class DataCenterApiMockTest extends BaseProfitBricksMockTest { String[] names = {"JCl@ouds", "JC|ouds", "^clouds", ""}; for (String name : names) try { - DataCenter.Request.CreatePayload.create(name, Location.US_LAS); + DataCenter.Request.creatingPayload(name, Location.US_LAS); fail("Should have failed for name: ".concat(name)); } catch (IllegalArgumentException ex) { // expected exception @@ -194,7 +194,7 @@ public class DataCenterApiMockTest extends BaseProfitBricksMockTest { + "</request></ws:updateDataCenter>"; try { DataCenter dataCenter = api.updateDataCenter( - DataCenter.Request.UpdatePayload.create(id, newName) + DataCenter.Request.updatingPayload(id, newName) ); assertRequestHasCommonProperties(server.takeRequest(), content); assertNotNull(dataCenter); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java index 8e84746..2f3c767 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java @@ -60,7 +60,7 @@ public class DrivesApiLiveTest extends BaseProfitBricksLiveTest { public void addRomDriveToServerTest() { String requestId = api.drivesApi().addRomDriveToServer(Drive.Request.AddRomDriveToServerPayload.builder() .serverId(serverId) - .storageId("05cadf29-6c12-11e4-beeb-52540066fee9") + .imageId("05cadf29-6c12-11e4-beeb-52540066fee9") .deviceNumber("0") .build()); assertNotNull(requestId); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiMockTest.java index d55676d..38cdcf0 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiMockTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiMockTest.java @@ -46,7 +46,7 @@ public class DrivesApiMockTest extends BaseProfitBricksMockTest { try { String requestId = api.addRomDriveToServer(Drive.Request.AddRomDriveToServerPayload.builder() .serverId("server-id") - .storageId("image-id") + .imageId("image-id") .deviceNumber("device-number") .build()); assertRequestHasCommonProperties(server.takeRequest(), content); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java index ddf94d4..772667a 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java @@ -75,13 +75,13 @@ public class FirewallApiLiveTest extends BaseProfitBricksLiveTest { @Test public void testAddFirewallRuleToNic() { Firewall firewall = api.firewallApi().addFirewallRuleToNic( - Firewall.Request.ruleAddingBuilder() - .nicId(nic.id()) - .newRule() - .name("test-rule-tcp") - .protocol(Protocol.TCP) - .endRule() - .build()); + Firewall.Request.createAddRulePayload(nic.id(), ImmutableList.of( + Firewall.Rule.builder() + .name("test-rule-tcp") + .protocol(Protocol.TCP) + .build() + )) + ); assertNotNull(firewall); assertNotNull(firewall.rules()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiMockTest.java index 17ec324..d9531cb 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiMockTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiMockTest.java @@ -128,18 +128,18 @@ public class FirewallApiMockTest extends BaseProfitBricksMockTest { + "</request>" + "</ws:addFirewallRulesToNic>"; try { - Firewall.Request.AddRulePayload payload = Firewall.Request.ruleAddingBuilder() - .nicId("nic-id") - .newRule() - .name("name") - .portRangeEnd(45678) - .portRangeStart(12345) - .protocol(Protocol.TCP) - .sourceIp("192.168.0.1") - .sourceMac("aa:bb:cc:dd:ee:ff") - .targetIp("192.168.0.2") - .endRule() - .build(); + Firewall.Request.AddRulePayload payload = Firewall.Request.createAddRulePayload( + "nic-id", ImmutableList.of( + Firewall.Rule.builder() + .name("name") + .portRangeEnd(45678) + .portRangeStart(12345) + .protocol(Protocol.TCP) + .sourceIp("192.168.0.1") + .sourceMac("aa:bb:cc:dd:ee:ff") + .targetIp("192.168.0.2") + .build() + )); Firewall response = api.addFirewallRuleToNic(payload); assertRequestHasCommonProperties(server.takeRequest(), content); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiLiveTest.java new file mode 100644 index 0000000..e293e1c --- /dev/null +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiLiveTest.java @@ -0,0 +1,134 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.profitbricks.features; + +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; + +import java.util.List; + +import com.google.common.collect.Iterables; + +import org.assertj.core.util.Lists; +import org.jclouds.profitbricks.BaseProfitBricksLiveTest; +import org.jclouds.profitbricks.domain.DataCenter; +import org.jclouds.profitbricks.domain.LoadBalancer; +import org.jclouds.profitbricks.domain.LoadBalancer.Algorithm; +import org.jclouds.profitbricks.domain.Server; +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.Test; + +@Test(groups = "unit", testName = "LoadBalancerApiLiveTest") +public class LoadBalancerApiLiveTest extends BaseProfitBricksLiveTest { + + private String dataCenterId; + private String loadBalancerId; + private String serverId; + + @Override + protected void initialize() { + super.initialize(); + List<DataCenter> dataCenters = api.dataCenterApi().getAllDataCenters(); + assertFalse(dataCenters.isEmpty(), "At least 1 datacenter has to be available for loadbalancer testing."); + + dataCenterId = Iterables.getFirst(dataCenters, null).id(); + + List<Server> servers = api.serverApi().getAllServers(); + assertFalse(servers.isEmpty(), "At least 1 server has to be available for loadbalancer testing."); + + serverId = Iterables.getFirst(servers, null).id(); + } + + @Test + public void testCreateLoadBalancer() { + List<String> serverIds = com.google.common.collect.Lists.newArrayList(); + serverIds.add("server-ids"); + + LoadBalancer.Request.CreatePayload payload = LoadBalancer.Request.creatingBuilder() + .dataCenterId(dataCenterId) + .name("testName") + .algorithm(Algorithm.ROUND_ROBIN) + .ip("0.0.0.1") + .lanId(1) + .serverIds(serverIds) + .build(); + + String requestId = api.loadBalancerApi().createLoadBalancer(payload); + + assertNotNull(requestId); + } + + @Test(dependsOnMethods = "testCreateLoadBalancer") + public void testGetAllLoadBalancers() { + List<LoadBalancer> loadBalancers = api.loadBalancerApi().getAllLoadBalancers(); + + assertFalse(loadBalancers.isEmpty()); + } + + @Test(dependsOnMethods = "testCreateLoadBalancer") + public void testGetLoadBalancer() { + LoadBalancer loadBalancer = api.loadBalancerApi().getLoadBalancer(loadBalancerId); + + assertNotNull(loadBalancer); + } + + @Test(dependsOnMethods = "testCreateLoadBalancer") + public void testRegisterLoadBalancer() { + List<String> serverIds = Lists.newArrayList(); + serverIds.add(serverId); + + LoadBalancer.Request.RegisterPayload payload = LoadBalancer.Request + .createRegisteringPaylod(loadBalancerId, serverIds); + + LoadBalancer loadBalancer = api.loadBalancerApi().registerLoadBalancer(payload); + + assertNotNull(loadBalancer); + } + + @Test(dependsOnMethods = "testRegisterLoadBalancer") + public void testDeregisterLoadBalancer() { + List<String> serverIds = Lists.newArrayList(); + serverIds.add(serverId); + + LoadBalancer.Request.DeregisterPayload payload = LoadBalancer.Request + .createDeregisteringPayload(loadBalancerId, serverIds); + + LoadBalancer loadBalancer = api.loadBalancerApi().deregisterLoadBalancer(payload); + + assertNotNull(loadBalancer); + } + + @Test(dependsOnMethods = "testCreateLoadBalancer") + public void testUpdateLoadBalancer() { + LoadBalancer.Request.UpdatePayload payload = LoadBalancer.Request.updatingBuilder() + .id(loadBalancerId) + .name("whatever") + .build(); + + LoadBalancer loadBalancer = api.loadBalancerApi().updateLoadBalancer(payload); + + assertNotNull(loadBalancer); + } + + @AfterClass(alwaysRun = true) + public void testDeleteLoadBalancer() { + boolean result = api.loadBalancerApi().deleteLoadBalancer(loadBalancerId); + + Assert.assertTrue(result); + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiMockTest.java new file mode 100644 index 0000000..c4f26aa --- /dev/null +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadBalancerApiMockTest.java @@ -0,0 +1,290 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.profitbricks.features; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.AssertJUnit.assertTrue; + +import java.util.List; + +import com.google.common.collect.Lists; +import com.squareup.okhttp.mockwebserver.MockResponse; +import com.squareup.okhttp.mockwebserver.MockWebServer; +import org.jclouds.profitbricks.ProfitBricksApi; +import org.jclouds.profitbricks.domain.LoadBalancer; +import org.jclouds.profitbricks.domain.LoadBalancer.Algorithm; +import org.jclouds.profitbricks.internal.BaseProfitBricksMockTest; +import org.testng.annotations.Test; + +@Test(groups = "unit", testName = "LoadBalancerApiMockTest") +public class LoadBalancerApiMockTest extends BaseProfitBricksMockTest { + + @Test + public void testGetAllLoadBalancers() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancers.xml"))); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + try { + List<LoadBalancer> loadBalancerList = api.getAllLoadBalancers(); + + assertRequestHasCommonProperties(server.takeRequest(), "<ws:getAllLoadBalancers/>"); + assertNotNull(loadBalancerList); + assertTrue(loadBalancerList.size() == 2); + + } finally { + pbApi.close(); + server.shutdown(); + } + } + + @Test + public void testGetAllLoadBalancersReturning404() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setResponseCode(404)); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + try { + List<LoadBalancer> loadBalancerList = api.getAllLoadBalancers(); + + assertRequestHasCommonProperties(server.takeRequest()); + assertTrue(loadBalancerList.isEmpty()); + + } finally { + pbApi.close(); + server.shutdown(); + } + } + + @Test + public void testGetLoadBalancer() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer.xml"))); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + String id = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; + + String content = "<ws:getLoadBalancer><loadBalancerId>" + id + "</loadBalancerId></ws:getLoadBalancer>"; + try { + LoadBalancer loadBalancer = api.getLoadBalancer(id); + + assertRequestHasCommonProperties(server.takeRequest(), content); + assertNotNull(loadBalancer); + assertEquals(loadBalancer.id(), id); + } finally { + pbApi.close(); + server.shutdown(); + } + } + + @Test + public void testGetNonExistingLoadBalancer() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setResponseCode(404)); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + String id = "random-non-existing-id"; + + try { + LoadBalancer loadBalancer = api.getLoadBalancer(id); + + assertRequestHasCommonProperties(server.takeRequest()); + assertNull(loadBalancer); + } finally { + pbApi.close(); + server.shutdown(); + } + } + + @Test + public void testCreateLoadBalancer() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-create.xml"))); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + String content = "<ws:createLoadBalancer>" + + "<request>" + + "<dataCenterId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeeee</dataCenterId>" + + "<loadBalancerName>load-balancer-name</loadBalancerName>" + + "<loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm>" + + "<ip>192.168.0.1</ip>" + + "<lanId>3</lanId>" + + "<serverIds>server-ids</serverIds>" + + "</request>" + + "</ws:createLoadBalancer>"; + + try { + List<String> serverIds = Lists.newArrayList(); + serverIds.add("server-ids"); + String requestId = api.createLoadBalancer(LoadBalancer.Request.creatingBuilder() + .dataCenterId("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeeee") + .name("load-balancer-name") + .algorithm(Algorithm.ROUND_ROBIN) + .ip("192.168.0.1") + .lanId(3) + .serverIds(serverIds) + .build()); + + assertRequestHasCommonProperties(server.takeRequest(), content); + + } finally { + pbApi.close(); + server.shutdown(); + } + } + + @Test + public void testUpdateLoadBalancer() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-create.xml"))); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + String id = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; + String newName = "Apache"; + + String content = "<ws:updateLoadBalancer>" + + "<request>" + + "<loadBalancerId>" + id + "</loadBalancerId>" + + "<loadBalancerName>load-balancer-name</loadBalancerName>" + + "<loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm>" + + "<ip>192.168.0.1</ip>" + + "</request>" + + "</ws:updateLoadBalancer>"; + + try { + LoadBalancer.Request.UpdatePayload toUpdate = LoadBalancer.Request.updatingBuilder() + .id(id) + .name("load-balancer-name") + .algorithm(Algorithm.ROUND_ROBIN) + .ip("192.168.0.1") + .build(); + + LoadBalancer loadBalancer = api.updateLoadBalancer(toUpdate); + + assertRequestHasCommonProperties(server.takeRequest(), content); + assertNotNull(loadBalancer); + } finally { + pbApi.close(); + server.shutdown(); + } + + } + + @Test + public void testRegisterLoadBalancer() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-register.xml"))); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + String content = "<ws:registerServersOnLoadBalancer>" + + "<request>" + + "<loadBalancerId>1234</loadBalancerId>" + + "<serverIds>1</serverIds>" + + "<serverIds>2</serverIds>" + + "</request>" + + "</ws:registerServersOnLoadBalancer>"; + + try { + List<String> serverIds = Lists.newArrayList(); + serverIds.add("1"); + serverIds.add("2"); + LoadBalancer.Request.RegisterPayload payload = LoadBalancer.Request + .createRegisteringPaylod("1234", serverIds); + + LoadBalancer loadBalancer = api.registerLoadBalancer(payload); + + assertRequestHasCommonProperties(server.takeRequest(), content); + assertNotNull(loadBalancer); + } finally { + pbApi.close(); + server.shutdown(); + } + } + + @Test + public void testDeregisterLoadBalancer() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-update.xml"))); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + String content = "<ws:deregisterServersOnLoadBalancer>" + + "<request>" + + "<serverIds>1</serverIds>" + + "<serverIds>2</serverIds>" + + "<loadBalancerId>load-balancer-id</loadBalancerId>" + + "</request>" + + "</ws:deregisterServersOnLoadBalancer>"; + + try { + List<String> serverIds = Lists.newArrayList(); + serverIds.add("1"); + serverIds.add("2"); + + LoadBalancer.Request.DeregisterPayload payload = LoadBalancer.Request + .createDeregisteringPayload("load-balancer-id", serverIds); + + LoadBalancer loadBalancer = api.deregisterLoadBalancer(payload); + + assertRequestHasCommonProperties(server.takeRequest(), content); + assertNotNull(loadBalancer); + } finally { + pbApi.close(); + server.shutdown(); + } + } + + @Test + public void testDeleteLoadBalancer() throws Exception { + MockWebServer server = mockWebServer(); + server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-register.xml"))); + + ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); + LoadBalancerApi api = pbApi.loadBalancerApi(); + + String loadBalancerId = "qwertyui-qwer-qwer-qwer-qwertyyuiiop"; + + String content = "<ws:deleteLoadBalancer><loadBalancerId>" + loadBalancerId + "</loadBalancerId></ws:deleteLoadBalancer>"; + + try { + boolean done = api.deleteLoadBalancer(loadBalancerId); + + assertRequestHasCommonProperties(server.takeRequest(), content); + assertTrue(done); + } finally { + pbApi.close(); + server.shutdown(); + } + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiLiveTest.java deleted file mode 100644 index d5e64cf..0000000 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiLiveTest.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.profitbricks.features; - -import com.google.common.collect.Iterables; -import java.util.List; -import org.assertj.core.util.Lists; -import org.jclouds.profitbricks.BaseProfitBricksLiveTest; -import org.jclouds.profitbricks.domain.DataCenter; -import org.jclouds.profitbricks.domain.LoadBalancer; -import org.jclouds.profitbricks.domain.LoadBalancer.Algorithm; -import org.jclouds.profitbricks.domain.Server; -import org.testng.Assert; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import org.testng.annotations.AfterClass; -import org.testng.annotations.Test; - -@Test(groups = "unit", testName = "LoadbalancerApiLiveTest") -public class LoadbalancerApiLiveTest extends BaseProfitBricksLiveTest { - - private String dataCenterId; - private String loadBalancerID; - private String serverId; - - @Override - protected void initialize() { - super.initialize(); - List<DataCenter> dataCenters = api.dataCenterApi().getAllDataCenters(); - assertFalse(dataCenters.isEmpty(), "At least 1 datacenter has to be available for loadbalancer testing."); - - dataCenterId = Iterables.getFirst(dataCenters, null).id(); - - List<Server> servers = api.serverApi().getAllServers(); - assertFalse(servers.isEmpty(), "At least 1 server has to be available for loadbalancer testing."); - - serverId = Iterables.getFirst(servers, null).id(); - } - - @Test - public void testCreateLoadBalancer() { - List<String> serverIds = com.google.common.collect.Lists.newArrayList(); - serverIds.add("server-ids"); - - LoadBalancer.Request.CreatePayload payload = LoadBalancer.Request.creatingBuilder() - .dataCenterId(dataCenterId) - .loadBalancerName("testName") - .loadBalancerAlgorithm(Algorithm.ROUND_ROBIN) - .ip("0.0.0.1") - .lanId("1") - .serverIds(serverIds) - .build(); - - String requestId = api.loadBalancerApi().createLoadBalancer(payload); - - assertNotNull(requestId); - } - - @Test(dependsOnMethods = "testCreateLoadBalancer") - public void testGetAllLoadBalancers() { - List<LoadBalancer> loadBalancers = api.loadBalancerApi().getAllLoadBalancers(); - - assertFalse(loadBalancers.isEmpty()); - } - - @Test(dependsOnMethods = "testCreateLoadBalancer") - public void testGetLoadBalancer() { - LoadBalancer loadBalancer = api.loadBalancerApi().getLoadBalancer(loadBalancerID); - - assertNotNull(loadBalancer); - } - - @Test(dependsOnMethods = "testCreateLoadBalancer") - public void testRegisterLoadBalancer() { - List<String> serverIds = Lists.newArrayList(); - serverIds.add(serverId); - - LoadBalancer.Request.RegisterPayload payload = LoadBalancer.Request.registerBuilder() - .id(loadBalancerID) - .serverIds(serverIds) - .build(); - - LoadBalancer loadBalancer = api.loadBalancerApi().registerLoadBalancer(payload); - - assertNotNull(loadBalancer); - } - - @Test(dependsOnMethods = "testRegisterLoadBalancer") - public void testDeregisterLoadBalancer() { - List<String> serverIds = Lists.newArrayList(); - serverIds.add(serverId); - - LoadBalancer.Request.DeregisterPayload payload = LoadBalancer.Request.deregisterBuilder() - .id(loadBalancerID) - .serverIds(serverIds) - .build(); - - LoadBalancer loadBalancer = api.loadBalancerApi().deregisterLoadBalancer(payload); - - assertNotNull(loadBalancer); - } - - @Test(dependsOnMethods = "testCreateLoadBalancer") - public void testUpdateLoadBalancer() { - LoadBalancer.Request.UpdatePayload payload = LoadBalancer.Request.updatingBuilder() - .id(loadBalancerID) - .loadBalancerName("whatever") - .build(); - - LoadBalancer loadBalancer = api.loadBalancerApi().updateLoadBalancer(payload); - - assertNotNull(loadBalancer); - } - - @AfterClass(alwaysRun = true) - public void testDeleteLoadBalancer() { - boolean result = api.loadBalancerApi().deleteLoadBalancer(loadBalancerID); - - Assert.assertTrue(result); - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiMockTest.java deleted file mode 100644 index 1271244..0000000 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/LoadbalancerApiMockTest.java +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.profitbricks.features; - -import com.google.common.collect.Lists; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; -import java.util.List; -import org.jclouds.profitbricks.ProfitBricksApi; -import org.jclouds.profitbricks.domain.LoadBalancer; -import org.jclouds.profitbricks.domain.LoadBalancer.Algorithm; -import org.jclouds.profitbricks.internal.BaseProfitBricksMockTest; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.AssertJUnit.assertTrue; -import org.testng.annotations.Test; - -@Test(groups = "unit", testName = "LoadbalancerApiMockTest") -public class LoadbalancerApiMockTest extends BaseProfitBricksMockTest { - - @Test - public void testGetAllLoadBalancers() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancers.xml"))); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - try { - List<LoadBalancer> loadBalancerList = api.getAllLoadBalancers(); - - assertRequestHasCommonProperties(server.takeRequest(), "<ws:getAllLoadBalancers/>"); - assertNotNull(loadBalancerList); - assertTrue(loadBalancerList.size() == 2); - - } finally { - pbApi.close(); - server.shutdown(); - } - } - - @Test - public void testGetAllLoadBalancersReturning404() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setResponseCode(404)); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - try { - List<LoadBalancer> loadBalancerList = api.getAllLoadBalancers(); - - assertRequestHasCommonProperties(server.takeRequest()); - assertTrue(loadBalancerList.isEmpty()); - - } finally { - pbApi.close(); - server.shutdown(); - } - } - - @Test - public void testGetLoadBalancer() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer.xml"))); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - String id = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; - - String content = "<ws:getLoadBalancer><loadBalancerId>" + id + "</loadBalancerId></ws:getLoadBalancer>"; - try { - LoadBalancer loadBalancer = api.getLoadBalancer(id); - - assertRequestHasCommonProperties(server.takeRequest(), content); - assertNotNull(loadBalancer); - assertEquals(loadBalancer.id(), id); - } finally { - pbApi.close(); - server.shutdown(); - } - } - - @Test - public void testGetNonExistingLoadBalancer() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setResponseCode(404)); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - String id = "random-non-existing-id"; - - try { - LoadBalancer loadBalancer = api.getLoadBalancer(id); - - assertRequestHasCommonProperties(server.takeRequest()); - assertNull(loadBalancer); - } finally { - pbApi.close(); - server.shutdown(); - } - } - - @Test - public void testCreateLoadBalancer() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-create.xml"))); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - String content = "<ws:createLoadBalancer>" - + "<request>" - + "<dataCenterId>aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeeee</dataCenterId>" - + "<loadBalancerName>load-balancer-name</loadBalancerName>" - + "<loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm>" - + "<ip>192.168.0.1</ip>" - + "<lanId>lan-id</lanId>" - + "<serverIds>server-ids</serverIds>" - + "</request>" - + "</ws:createLoadBalancer>"; - - try { - List<String> serverIds = Lists.newArrayList(); - serverIds.add("server-ids"); - String requestId = api.createLoadBalancer(LoadBalancer.Request.creatingBuilder() - .dataCenterId("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeeee") - .loadBalancerName("load-balancer-name") - .loadBalancerAlgorithm(Algorithm.ROUND_ROBIN) - .ip("192.168.0.1") - .lanId("lan-id") - .serverIds(serverIds) - .build()); - - assertRequestHasCommonProperties(server.takeRequest(), content); - - } finally { - pbApi.close(); - server.shutdown(); - } - } - - @Test - public void testUpdateLoadBalancer() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-create.xml"))); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - String id = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"; - String newName = "Apache"; - - String content = "<ws:updateLoadBalancer>" - + "<request>" - + "<loadBalancerId>" + id + "</loadBalancerId>" - + "<loadBalancerName>load-balancer-name</loadBalancerName>" - + "<loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm>" - + "<ip>192.168.0.1</ip>" - + "</request>" - + "</ws:updateLoadBalancer>"; - - try { - LoadBalancer.Request.UpdatePayload toUpdate = LoadBalancer.Request.updatingBuilder() - .id(id) - .loadBalancerName("load-balancer-name") - .loadBalancerAlgorithm(Algorithm.ROUND_ROBIN) - .ip("192.168.0.1") - .build(); - - LoadBalancer loadBalancer = api.updateLoadBalancer(toUpdate); - - assertRequestHasCommonProperties(server.takeRequest(), content); - assertNotNull(loadBalancer); - } finally { - pbApi.close(); - server.shutdown(); - } - - } - - @Test - public void testRegisterLoadBalancer() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-register.xml"))); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - String content = "<ws:registerServersOnLoadBalancer>" - + "<request>" - + "<loadBalancerId>1234</loadBalancerId>" - + "<serverIds>1</serverIds>" - + "<serverIds>2</serverIds>" - + "</request>" - + "</ws:registerServersOnLoadBalancer>"; - - try { - List<String> serverIds = Lists.newArrayList(); - serverIds.add("1"); - serverIds.add("2"); - LoadBalancer.Request.RegisterPayload payload = LoadBalancer.Request.registerBuilder() - .id("1234") - .serverIds(serverIds) - .build(); - - LoadBalancer loadbalancer = api.registerLoadBalancer(payload); - - assertRequestHasCommonProperties(server.takeRequest(), content); - } finally { - pbApi.close(); - server.shutdown(); - } - } - - @Test - public void testDeregisterLoadBalancer() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-update.xml"))); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - String content = "<ws:deregisterServersOnLoadBalancer>" - + "<request>" - + "<serverIds>1</serverIds>" - + "<serverIds>2</serverIds>" - + "<loadBalancerId>load-balancer-id</loadBalancerId>" - + "</request>" - + "</ws:deregisterServersOnLoadBalancer>"; - - try { - List<String> serverIds = Lists.newArrayList(); - serverIds.add("1"); - serverIds.add("2"); - LoadBalancer loadbalancer = api.deregisterLoadBalancer(LoadBalancer.Request.DeregisterPayload.create(serverIds, "load-balancer-id")); - - assertRequestHasCommonProperties(server.takeRequest(), content); - assertNotNull(loadbalancer); - } finally { - pbApi.close(); - server.shutdown(); - } - } - - @Test - public void testDeleteLoadBalancer() throws Exception { - MockWebServer server = mockWebServer(); - server.enqueue(new MockResponse().setBody(payloadFromResource("/loadbalancer/loadbalancer-register.xml"))); - - ProfitBricksApi pbApi = api(server.getUrl(rootUrl)); - LoadBalancerApi api = pbApi.loadBalancerApi(); - - String loadBalancerId = "qwertyui-qwer-qwer-qwer-qwertyyuiiop"; - - String content = "<ws:deleteLoadBalancer><loadBalancerId>" + loadBalancerId + "</loadBalancerId></ws:deleteLoadBalancer>"; - - try { - boolean done = api.deleteLoadBalancer(loadBalancerId); - - assertRequestHasCommonProperties(server.takeRequest(), content); - assertTrue(done); - } finally { - pbApi.close(); - server.shutdown(); - } - } -} http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/NicApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/NicApiMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/NicApiMockTest.java index 0e01e2c..2129b25 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/NicApiMockTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/NicApiMockTest.java @@ -140,15 +140,22 @@ public class NicApiMockTest extends BaseProfitBricksMockTest { String content = "<ws:updateNic>" + "<request>" + "<nicId>nic-id</nicId>" - + "<ip>ip</ip>" + + "<ip>10.0.0.1</ip>" + "<nicName>nic-name</nicName>" + "<dhcpActive>true</dhcpActive>" + "<lanId>1</lanId>" + "</request>" + "</ws:updateNic>"; try { - Nic nic = api.updateNic(Nic.Request.UpdatePayload.create("nic-id", "ip", "nic-name", true, 1)); + Nic nic = api.updateNic(Nic.Request.updatingBuilder() + .id("nic-id") + .ip("10.0.0.1") + .name("nic-name") + .dhcpActive(true) + .lanId(1) + .build()); assertRequestHasCommonProperties(server.takeRequest(), content); + assertNotNull(nic); } finally { pbApi.close(); server.shutdown(); @@ -169,8 +176,13 @@ public class NicApiMockTest extends BaseProfitBricksMockTest { + "<internetAccess>true</internetAccess>" + "</ws:setInternetAccess>"; try { - Nic nic = api.setInternetAccess(Nic.Request.SetInternetAccessPayload.create("datacenter-id", 1, true)); + Nic nic = api.setInternetAccess(Nic.Request.setInternetAccessBuilder() + .dataCenterId("datacenter-id") + .lanId(1) + .internetAccess(true) + .build()); assertRequestHasCommonProperties(server.takeRequest(), content); + assertNotNull(nic); } finally { pbApi.close(); server.shutdown(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/ServerApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/ServerApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/ServerApiLiveTest.java index e7b1b9c..6ceffcd 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/ServerApiLiveTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/ServerApiLiveTest.java @@ -57,7 +57,12 @@ public class ServerApiLiveTest extends BaseProfitBricksLiveTest { @Test public void testCreateServer() { String serverId = api.serverApi().createServer( - Server.Request.CreatePayload.create(dataCenter.id(), "jclouds-node", 1, 1024)); + Server.Request.creatingBuilder() + .dataCenterId(dataCenter.id()) + .name("jclouds-node") + .cores(1) + .ram(1024) + .build()); assertNotNull(serverId); this.createdServerId = serverId; http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiLiveTest.java index 6c50f2a..500d218 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiLiveTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiLiveTest.java @@ -58,7 +58,11 @@ public class SnapshotApiLiveTest extends BaseProfitBricksLiveTest { @Test public void testCreateSnapshot() { - Snapshot snapshot = api.snapshotApi().createSnapshot(Snapshot.Request.CreatePayload.create(storageId, "my description", "test snapshot")); + Snapshot snapshot = api.snapshotApi().createSnapshot(Snapshot.Request.creatingBuilder() + .storageId(storageId) + .description("my description") + .name("test snapshot") + .build()); assertNotNull(snapshot); @@ -89,7 +93,7 @@ public class SnapshotApiLiveTest extends BaseProfitBricksLiveTest { String newName = "new name"; api.snapshotApi().updateSnapshot(Snapshot.Request.updatingBuilder() - .snapshotId(snapshotId) + .id(snapshotId) .description("new description") .name(newName) .bootable(true) @@ -112,7 +116,7 @@ public class SnapshotApiLiveTest extends BaseProfitBricksLiveTest { @Test(dependsOnMethods = "testCreateSnapshot") public void testRollbackSnapshot() { - String result = api.snapshotApi().rollbackSnapshot(Snapshot.Request.RollbackPayload.create(snapshotId, storageId)); + String result = api.snapshotApi().rollbackSnapshot(Snapshot.Request.createRollbackPayload(snapshotId, storageId)); assertNotNull(result); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiMockTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiMockTest.java index 528f893..9574e76 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiMockTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/SnapshotApiMockTest.java @@ -182,9 +182,10 @@ public class SnapshotApiMockTest extends BaseProfitBricksMockTest { try { String requestId = api.updateSnapshot(Snapshot.Request.updatingBuilder() - .snapshotId(snapshotId) - .name("snapshot-name") + .id(snapshotId) .description("description") + .name("snapshot-name") + .bootable(false) .osType(OsType.LINUX) .isCpuHotPlug(false) .isCpuHotUnPlug(false) @@ -256,10 +257,7 @@ public class SnapshotApiMockTest extends BaseProfitBricksMockTest { String content = "<ws:rollbackSnapshot><request><snapshotId>" + snapshotId + "</snapshotId><storageId>" + storageId + "</storageId></request></ws:rollbackSnapshot>"; try { - String result = api.rollbackSnapshot(Snapshot.Request.rollbackBuilder() - .snapshotId(snapshotId) - .storageId(storageId) - .build()); + String result = api.rollbackSnapshot(Snapshot.Request.createRollbackPayload(snapshotId, storageId)); assertRequestHasCommonProperties(server.takeRequest(), content); assertNotNull(result); } finally { http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/StorageApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/StorageApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/StorageApiLiveTest.java index 6295701..08ffba2 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/StorageApiLiveTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/StorageApiLiveTest.java @@ -66,7 +66,7 @@ public class StorageApiLiveTest extends BaseProfitBricksLiveTest { public void testUberStorage() { api.storageApi().createStorage( Storage.Request.creatingBuilder() - .dataCenterId(dataCenter) + .dataCenterId(dataCenter.id()) .name("Uber Storage") .size(9999999f) .build()); @@ -76,7 +76,7 @@ public class StorageApiLiveTest extends BaseProfitBricksLiveTest { public void testCreateStorage() { String storageId = api.storageApi().createStorage( Storage.Request.creatingBuilder() - .dataCenterId(dataCenter) + .dataCenterId(dataCenter.id()) .name("hdd-1") .size(2f) .build()); @@ -114,7 +114,7 @@ public class StorageApiLiveTest extends BaseProfitBricksLiveTest { Storage.Request.updatingBuilder() .id(createdStorageId) .name("hdd-2") - .size(5l) + .size(5f) .build()); assertNotNull(requestId); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java index 8658e2d..bb92109 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java @@ -73,7 +73,7 @@ public class ResponseStatusFromPayloadHttpCommandExecutorServiceTest extends Bas DataCenterApi api = pbApi.dataCenterApi(); try { - api.createDataCenter(DataCenter.Request.CreatePayload.create("D@tacenter", Location.DE_FKB)); + api.createDataCenter(DataCenter.Request.creatingPayload("D@tacenter", Location.DE_FKB)); fail("Request should have failed"); } catch (Exception ex) { assertTrue(ex instanceof IllegalArgumentException, "Exception should be an IllegalArgumentException"); @@ -111,7 +111,13 @@ public class ResponseStatusFromPayloadHttpCommandExecutorServiceTest extends Bas ServerApi api = pbApi.serverApi(); try { - api.createServer(Server.Request.CreatePayload.create("some-datacenter-id", "node1", 99, 12800)); + api.createServer( + Server.Request.creatingBuilder() + .dataCenterId("some-datacenter-id") + .name("node1") + .cores(99) + .ram(12800) + .build()); fail("Request should have failed."); } catch (Exception ex) { assertTrue(ex instanceof InsufficientResourcesException, "Exception should be InsufficientResourcesException"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/datacenter/DataCenterInfoResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/datacenter/DataCenterInfoResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/datacenter/DataCenterInfoResponseHandlerTest.java index 16b2504..3cb15a5 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/datacenter/DataCenterInfoResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/datacenter/DataCenterInfoResponseHandlerTest.java @@ -104,7 +104,7 @@ public class DataCenterInfoResponseHandlerTest extends BaseResponseHandlerTest<D .lanId(1) .internetAccess(true) .serverId("qqqqqqqq-wwww-eeee-rrrr-tttttttttttt") - .ip("202.94.38.12") + .ips(ImmutableList.of("202.94.38.12")) .macAddress("02:01:09:cd:f0:b0") .firewall( Firewall.builder() http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandlerTest.java index 49dbaba..1bd3518 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandlerTest.java @@ -44,29 +44,28 @@ public class IpBlockListResponseHandlerTest extends BaseResponseHandlerTest<List List<IpBlock> expected = ImmutableList.<IpBlock>of( IpBlock.builder() - .id("block-id") + .id("block-id-1") .location(Location.US_LAS) .publicIps(ImmutableList.<PublicIp>of( PublicIp.builder() - .ip("1.1") - .nicId("nic-id") + .ip("10.0.0.2") + .nicId("nic-id-1") .build(), PublicIp.builder() - .ip("1.2") - .nicId("nic-id") + .ip("10.0.0.3") + .nicId("nic-id-2") .build())) .build(), IpBlock.builder() - .id("block-id") + .id("block-id-2") .location(Location.US_LAS) .publicIps(ImmutableList.<PublicIp>of( PublicIp.builder() - .ip("2.1") - .nicId("nic-id") + .ip("10.0.0.4") .build(), PublicIp.builder() - .ip("2.2") - .nicId("nic-id") + .ip("10.0.0.5") + .nicId("nic-id-4") .build())) .build() ); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockResponseHandlerTest.java index 54f48dc..053f0ae 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockResponseHandlerTest.java @@ -49,12 +49,11 @@ public class IpBlockResponseHandlerTest extends BaseResponseHandlerTest<IpBlock> .location(Location.US_LAS) .publicIps(ImmutableList.<PublicIp>of( PublicIp.builder() - .ip("ip") + .ip("10.0.0.2") .nicId("nic-id") .build(), PublicIp.builder() - .ip("ip") - .nicId("nic-id") + .ip("10.0.0.3") .build())) .ips(emptyIpList) .build(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandlerTest.java index eedfa50..3c9e082 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandlerTest.java @@ -67,7 +67,7 @@ public class LoadBalancerListResponseHandlerTest extends BaseResponseHandlerTest .build()) .internetAccess(true) .ip("192.168.0.1") - .lanId("lan-id") + .lanId(1) .state(ProvisioningState.AVAILABLE) .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) @@ -97,7 +97,7 @@ public class LoadBalancerListResponseHandlerTest extends BaseResponseHandlerTest .build()) .internetAccess(false) .ip("192.168.0.1") - .lanId("lan-id") + .lanId(2) .state(ProvisioningState.AVAILABLE) .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-04T07:09:23.138Z")) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java index 079c5c0..0971e21 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerResponseHandlerTest.java @@ -85,7 +85,7 @@ public class LoadBalancerResponseHandlerTest extends BaseResponseHandlerTest<Loa .build()) .internetAccess(true) .ip("192.168.0.1") - .lanId("lan-id") + .lanId(2) .state(ProvisioningState.AVAILABLE) .creationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:08:35.629Z")) .lastModificationTime(dateParser.iso8601DateOrSecondsDateParse("2014-12-12T03:08:35.629Z")) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandlerTest.java index ee0cac0..aa1975d 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandlerTest.java @@ -49,8 +49,8 @@ public class NicListResponseHandlerTest extends BaseResponseHandlerTest<List<Nic .lanId(1) .internetAccess(true) .serverId("server-id") - .ip("192.168.0.1") - .macAddress("mac-address") + .ips(ImmutableList.of("192.168.0.1")) + .macAddress("aa:bb:cc:dd:ee:f1") .firewall( Firewall.builder() .active(true) @@ -75,7 +75,7 @@ public class NicListResponseHandlerTest extends BaseResponseHandlerTest<List<Nic "192.168.0.3", "192.168.0.4" )) - .macAddress("mac-address") + .macAddress("aa:bb:cc:dd:ee:f2") .firewall( Firewall.builder() .active(false) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java index a14b0d4..3797ca0 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/nic/NicResponseHandlerTest.java @@ -19,6 +19,8 @@ package org.jclouds.profitbricks.http.parser.nic; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import com.google.common.collect.ImmutableList; + import org.jclouds.http.functions.ParseSax; import org.jclouds.profitbricks.domain.Firewall; import org.jclouds.profitbricks.domain.Nic; @@ -47,10 +49,10 @@ public class NicResponseHandlerTest extends BaseResponseHandlerTest<Nic> { .lanId(1) .internetAccess(true) .serverId("server-id") - .ip("192.168.0.1") - .macAddress("mac-address") + .ips(ImmutableList.of("192.168.0.1")) + .macAddress("aa:bb:cc:dd:ee:ff") .dhcpActive(true) - .gatewayIp("gateway-ip") + .gatewayIp("10.0.0.1") .state(ProvisioningState.AVAILABLE) .firewall( Firewall.builder() http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java index 5e629b9..03fb3da 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerInfoResponseHandlerTest.java @@ -98,7 +98,7 @@ public class ServerInfoResponseHandlerTest extends BaseResponseHandlerTest<Serve .lanId(1) .internetAccess(true) .serverId("qwertyui-qwer-qwer-qwer-qwertyyuiiop") - .ip("173.252.120.6") + .ips(ImmutableList.of("173.252.120.6")) .macAddress("02:01:09:cd:f0:b0") .firewall(Firewall.builder() .active(false) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java index ea5d46d..95c7923 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/server/ServerListResponseHandlerTest.java @@ -102,7 +102,7 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< .lanId(1) .internetAccess(true) .serverId("qwertyui-qwer-qwer-qwer-qwertyyuiiop") - .ip("173.252.120.6") + .ips(ImmutableList.of("173.252.120.6")) .macAddress("02:01:09:cd:f0:b0") .firewall(Firewall.builder() .active(false) @@ -160,7 +160,7 @@ public class ServerListResponseHandlerTest extends BaseResponseHandlerTest<List< .lanId(3) .internetAccess(false) .serverId("asdfghjk-asdf-asdf-asdf-asdfghjklkjl") - .ip("202.69.181.241") + .ips(ImmutableList.of("202.69.181.241")) .macAddress("02:01:9e:5e:35:1e") .firewall(Firewall.builder() .active(false) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java index f9f93d0..37cdb96 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotListResponseHandlerTest.java @@ -59,7 +59,7 @@ public class SnapshotListResponseHandlerTest extends BaseResponseHandlerTest<Lis expected.add(Snapshot.builder() .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") .description("description") - .size(1024) + .size(1024f) .name("snapshot01") .state(ProvisioningState.AVAILABLE) .isBootable(true) @@ -80,7 +80,7 @@ public class SnapshotListResponseHandlerTest extends BaseResponseHandlerTest<Lis expected.add(Snapshot.builder() .id("qqqqqqqq-wwww-rrrr-tttt-yyyyyyyyyyyy") .description("description") - .size(1024) + .size(1024f) .name("snapshot02") .state(ProvisioningState.AVAILABLE) .isBootable(true) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java index ced1814..1a73c9f 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/parser/snapshot/SnapshotResponseHandlerTest.java @@ -53,7 +53,7 @@ public class SnapshotResponseHandlerTest extends BaseResponseHandlerTest<Snapsho Snapshot expected = Snapshot.builder() .id("qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh") .description("description") - .size(1024) + .size(1024f) .name("snapshot01") .state(ProvisioningState.AVAILABLE) .isBootable(true) http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml b/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml index 8586aaf..89d14f7 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblock-reserve.xml @@ -6,7 +6,7 @@ <requestId>request-id</requestId> <blockId>block-id</blockId> <location>us/las</location> - <ips>ip</ips> + <ips>10.0.0.1</ips> </return> </ns2:reservePublicIpBlockResponse> </S:Body> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/ipblock/ipblock.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblock.xml b/providers/profitbricks/src/test/resources/ipblock/ipblock.xml index 339fdfb..0b22915 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblock.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblock.xml @@ -6,11 +6,11 @@ <blockId>qwertyui-qwer-qwer-qwer-qwertyyuiiop</blockId> <location>us/las</location> <publicIps> - <ip>ip</ip> + <ip>10.0.0.2</ip> <nicId>nic-id</nicId> </publicIps> <publicIps> - <ip>ip</ip> + <ip>10.0.0.3</ip> </publicIps> </return> </ns2:getAllPublicIpBlocksResponse> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/ipblock/ipblocks.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/ipblock/ipblocks.xml b/providers/profitbricks/src/test/resources/ipblock/ipblocks.xml index 4e436e1..44ea788 100644 --- a/providers/profitbricks/src/test/resources/ipblock/ipblocks.xml +++ b/providers/profitbricks/src/test/resources/ipblock/ipblocks.xml @@ -3,26 +3,26 @@ <S:Body> <ns2:getAllPublicIpBlocksResponse xmlns:ns2="http://ws.api.profitbricks.com/";> <return> - <blockId>block-id</blockId> + <blockId>block-id-1</blockId> <location>us/las</location> <publicIps> - <ip>1.1</ip> - <nicId>nic-id</nicId> + <ip>10.0.0.2</ip> + <nicId>nic-id-1</nicId> </publicIps> <publicIps> - <ip>1.2</ip> - <nicId>nic-id</nicId> + <ip>10.0.0.3</ip> + <nicId>nic-id-2</nicId> </publicIps> </return> <return> - <blockId>block-id</blockId> + <blockId>block-id-2</blockId> <location>us/las</location> <publicIps> - <ip>2.1</ip> + <ip>10.0.0.4</ip> </publicIps> <publicIps> - <ip>2.2</ip> - <nicId>nic-id</nicId> + <ip>10.0.0.5</ip> + <nicId>nic-id-4</nicId> </publicIps> </return> </ns2:getAllPublicIpBlocksResponse> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml index 33eb41b..5c1afb0 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-create.xml @@ -9,7 +9,7 @@ <loadBalancerName>load-balancer-name</loadBalancerName> <loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm> <ip>192.168.0.1</ip> - <lanId>lan-id</lanId> + <lanId>1</lanId> <serverIds>server-ids</serverIds> </request> </ws:createLoadBalancer> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml index 8396174..29e24aa 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer-delete.xml @@ -5,7 +5,7 @@ <return> <requestId>request-id</requestId> <dataCenterId>datacenter-id</dataCenterId> - <dataCenterVersion>datacenter-version</dataCenterVersion> + <dataCenterVersion>123</dataCenterVersion> </return> </ns2:deleteLoadBalancerResponse> </S:Body> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml index 302c10e..6388113 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancer.xml @@ -10,7 +10,7 @@ <loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm> <internetAccess>true</internetAccess> <ip>192.168.0.1</ip> - <lanId>lan-id</lanId> + <lanId>2</lanId> <balancedServers> <activate>true</activate> <balancedNicId>balanced-nic-id</balancedNicId> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml index 54d1949..afe2573 100644 --- a/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml +++ b/providers/profitbricks/src/test/resources/loadbalancer/loadbalancers.xml @@ -10,7 +10,7 @@ <loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm> <internetAccess>true</internetAccess> <ip>192.168.0.1</ip> - <lanId>lan-id</lanId> + <lanId>1</lanId> <balancedServers> <activate>true</activate> <balancedNicId>balanced-nic-id</balancedNicId> @@ -35,7 +35,7 @@ <loadBalancerAlgorithm>ROUND_ROBIN</loadBalancerAlgorithm> <internetAccess>false</internetAccess> <ip>192.168.0.1</ip> - <lanId>lan-id</lanId> + <lanId>2</lanId> <balancedServers> <activate>false</activate> <balancedNicId>balanced-nic-id</balancedNicId> http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e82bbfa/providers/profitbricks/src/test/resources/nic/nic.xml ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/resources/nic/nic.xml b/providers/profitbricks/src/test/resources/nic/nic.xml index 18adc23..e460384 100644 --- a/providers/profitbricks/src/test/resources/nic/nic.xml +++ b/providers/profitbricks/src/test/resources/nic/nic.xml @@ -11,7 +11,7 @@ <internetAccess>true</internetAccess> <serverId>server-id</serverId> <ips>192.168.0.1</ips> - <macAddress>mac-address</macAddress> + <macAddress>aa:bb:cc:dd:ee:ff</macAddress> <firewall> <active>true</active> <firewallId>firewall-id</firewallId> @@ -19,7 +19,7 @@ <provisioningState>AVAILABLE</provisioningState> </firewall> <dhcpActive>true</dhcpActive> - <gatewayIp>gateway-ip</gatewayIp> + <gatewayIp>10.0.0.1</gatewayIp> <provisioningState>AVAILABLE</provisioningState> </return> </ns2:getNicResponse>
