You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2015/06/25 00:04:11 UTC
[2/3] jclouds git commit: replace ExpectTests with MockWebServerTests
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java
new file mode 100644
index 0000000..c7ab663
--- /dev/null
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/DatacentersParseTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.softlayer.parse;
+
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.softlayer.domain.Datacenter;
+import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+@Test(groups = "unit")
+public class DatacentersParseTest extends BaseSoftLayerParseTest<Set<Datacenter>> {
+
+ @Override
+ public String resource() {
+ return "/datacenter_list.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Set<Datacenter> expected() {
+ return ImmutableSet.of(
+ Datacenter.builder()
+ .id(265592)
+ .longName("Amsterdam 1")
+ .name("ams01")
+ .build(),
+ Datacenter.builder()
+ .id(3)
+ .longName("Dallas 1")
+ .name("dal01")
+ .build(),
+ Datacenter.builder()
+ .id(154770)
+ .longName("Dallas 2")
+ .name("dal02")
+ .build(),
+ Datacenter.builder()
+ .id(167092)
+ .longName("Dallas 4")
+ .name("dal04")
+ .build(),
+ Datacenter.builder()
+ .id(138124)
+ .longName("Dallas 5")
+ .name("dal05")
+ .build(),
+ Datacenter.builder()
+ .id(154820)
+ .longName("Dallas 6")
+ .name("dal06")
+ .build(),
+ Datacenter.builder()
+ .id(142776)
+ .longName("Dallas 7")
+ .name("dal07")
+ .build(),
+ Datacenter.builder()
+ .id(352392)
+ .longName("Dallas 8")
+ .name("dal08")
+ .build(),
+ Datacenter.builder()
+ .id(352494)
+ .longName("Hong Kong 2")
+ .name("hkg02")
+ .build(),
+ Datacenter.builder()
+ .id(142775)
+ .longName("Houston 2")
+ .name("hou02")
+ .build(),
+ Datacenter.builder()
+ .id(168642)
+ .longName("San Jose 1")
+ .name("sjc01")
+ .build(),
+ Datacenter.builder()
+ .id(18171)
+ .longName("Seattle")
+ .name("sea01")
+ .build(),
+ Datacenter.builder()
+ .id(224092)
+ .longName("Singapore 1")
+ .name("sng01")
+ .build(),
+ Datacenter.builder()
+ .id(37473)
+ .longName("Washington, DC")
+ .name("wdc01")
+ .build()
+ );
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java
deleted file mode 100644
index a9709b2..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java
+++ /dev/null
@@ -1,62 +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.softlayer.parse;
-
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.softlayer.domain.SoftwareDescription;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class GetAllObjectsResponseTest extends BaseSoftLayerParseTest<Set<SoftwareDescription>> {
-
- @Override
- public String resource() {
- return "/software_description_list.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public Set<SoftwareDescription> expected() {
- return ImmutableSet.of(
- SoftwareDescription.builder()
- .version("6.0-64 LAMP for CCI")
- .referenceCode("CENTOS_6_64")
- .operatingSystem(1)
- .longDescription("CentOS / CentOS / 6.0-64 LAMP for CCI")
- .build(),
- SoftwareDescription.builder()
- .version("WEB 64 bit")
- .referenceCode("WIN_2008-WEB-R2_64")
- .operatingSystem(1)
- .longDescription("Microsoft / Windows 2008 FULL WEB 64 bit R2 / WEB 64 bit")
- .build(),
- SoftwareDescription.builder()
- .version("12.04-32 Minimal for CCI")
- .referenceCode("UBUNTU_12_32")
- .operatingSystem(1)
- .longDescription("Ubuntu / Ubuntu / 12.04-32 Minimal for CCI")
- .build()
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java
new file mode 100644
index 0000000..1945c4f
--- /dev/null
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsParseTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.softlayer.parse;
+
+import org.jclouds.softlayer.domain.ContainerVirtualGuestConfiguration;
+import org.jclouds.softlayer.domain.ContainerVirtualGuestConfigurationOption;
+import org.jclouds.softlayer.domain.Datacenter;
+import org.jclouds.softlayer.domain.ProductItem;
+import org.jclouds.softlayer.domain.ProductItemPrice;
+import org.jclouds.softlayer.domain.VirtualDiskImage;
+import org.jclouds.softlayer.domain.VirtualGuest;
+import org.jclouds.softlayer.domain.VirtualGuestBlockDevice;
+import org.jclouds.softlayer.domain.VirtualGuestNetworkComponent;
+import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+public class GetCreateObjectOptionsParseTest extends BaseSoftLayerParseTest<ContainerVirtualGuestConfiguration> {
+
+ @Override
+ public String resource() {
+ return "/container_virtual_guest_configuration.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ContainerVirtualGuestConfiguration expected() {
+ return ContainerVirtualGuestConfiguration.builder()
+ .blockDevices(ContainerVirtualGuestConfigurationOption.builder()
+ .productItemPrice(ProductItemPrice.builder()
+ .hourlyRecurringFee(0)
+ .recurringFee("0")
+ .item(ProductItem.builder().description("25 GB (SAN)").build())
+ .build())
+ .template(VirtualGuest.builder()
+ .blockDevices(VirtualGuestBlockDevice.builder()
+ .device("0")
+ .diskImage(VirtualDiskImage.builder().capacity(25).build())
+ .build())
+ .localDiskFlag(false)
+ .build())
+ .build())
+ .datacenters(ContainerVirtualGuestConfigurationOption.builder()
+ .template(VirtualGuest.builder().datacenter(Datacenter.builder().name("ams01").build()).build())
+ .build())
+ .memory(ContainerVirtualGuestConfigurationOption.builder()
+ .productItemPrice(ProductItemPrice.builder()
+ .hourlyRecurringFee(.02f)
+ .recurringFee("14")
+ .item(ProductItem.builder().description("1 GB").build())
+ .build())
+ .template(VirtualGuest.builder().maxMemory(1024).build())
+ .build())
+ .networkComponents(ContainerVirtualGuestConfigurationOption.builder()
+ .productItemPrice(ProductItemPrice.builder()
+ .hourlyRecurringFee(0)
+ .recurringFee("0")
+ .item(ProductItem.builder().description("10 Mbps Public & Private Networks").build())
+ .build())
+ .template(VirtualGuest.builder().networkComponents(
+ VirtualGuestNetworkComponent.builder()
+ .maxSpeed(10)
+ .build())
+ .build())
+ .build())
+ .operatingSystems(ContainerVirtualGuestConfigurationOption.builder()
+ .productItemPrice(ProductItemPrice.builder()
+ .hourlyRecurringFee(0)
+ .recurringFee("0")
+ .item(ProductItem.builder().description("CentOS 6.x - Minimal Install (64 bit)").build())
+ .build())
+ .template(VirtualGuest.builder()
+ .operatingSystemReferenceCode("CENTOS_6_64")
+ .build())
+ .build())
+ .processors(ContainerVirtualGuestConfigurationOption.builder()
+ .productItemPrice(ProductItemPrice.builder()
+ .hourlyRecurringFee(.022f)
+ .recurringFee("15")
+ .item(ProductItem.builder().description("1 x 2.0 GHz Core").build())
+ .build())
+ .template(VirtualGuest.builder().startCpus(1).build())
+ .build())
+ .build();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java
deleted file mode 100644
index e25d08a..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java
+++ /dev/null
@@ -1,102 +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.softlayer.parse;
-
-import org.jclouds.softlayer.domain.ContainerVirtualGuestConfiguration;
-import org.jclouds.softlayer.domain.ContainerVirtualGuestConfigurationOption;
-import org.jclouds.softlayer.domain.Datacenter;
-import org.jclouds.softlayer.domain.ProductItem;
-import org.jclouds.softlayer.domain.ProductItemPrice;
-import org.jclouds.softlayer.domain.VirtualDiskImage;
-import org.jclouds.softlayer.domain.VirtualGuest;
-import org.jclouds.softlayer.domain.VirtualGuestBlockDevice;
-import org.jclouds.softlayer.domain.VirtualGuestNetworkComponent;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-public class GetCreateObjectOptionsResponseTest extends BaseSoftLayerParseTest<ContainerVirtualGuestConfiguration> {
-
- @Override
- public String resource() {
- return "/container_virtual_guest_configuration.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public ContainerVirtualGuestConfiguration expected() {
- return ContainerVirtualGuestConfiguration.builder()
- .blockDevices(ContainerVirtualGuestConfigurationOption.builder()
- .productItemPrice(ProductItemPrice.builder()
- .hourlyRecurringFee(0)
- .recurringFee("0")
- .item(ProductItem.builder().description("25 GB (SAN)").build())
- .build())
- .template(VirtualGuest.builder()
- .blockDevices(VirtualGuestBlockDevice.builder()
- .device("0")
- .diskImage(VirtualDiskImage.builder().capacity(25).build())
- .build())
- .localDiskFlag(false)
- .build())
- .build())
- .datacenters(ContainerVirtualGuestConfigurationOption.builder()
- .template(VirtualGuest.builder().datacenter(Datacenter.builder().name("ams01").build()).build())
- .build())
- .memory(ContainerVirtualGuestConfigurationOption.builder()
- .productItemPrice(ProductItemPrice.builder()
- .hourlyRecurringFee(.02f)
- .recurringFee("14")
- .item(ProductItem.builder().description("1 GB").build())
- .build())
- .template(VirtualGuest.builder().maxMemory(1024).build())
- .build())
- .networkComponents(ContainerVirtualGuestConfigurationOption.builder()
- .productItemPrice(ProductItemPrice.builder()
- .hourlyRecurringFee(0)
- .recurringFee("0")
- .item(ProductItem.builder().description("10 Mbps Public & Private Networks").build())
- .build())
- .template(VirtualGuest.builder().networkComponents(
- VirtualGuestNetworkComponent.builder()
- .maxSpeed(10)
- .build())
- .build())
- .build())
- .operatingSystems(ContainerVirtualGuestConfigurationOption.builder()
- .productItemPrice(ProductItemPrice.builder()
- .hourlyRecurringFee(0)
- .recurringFee("0")
- .item(ProductItem.builder().description("CentOS 6.x - Minimal Install (64 bit)").build())
- .build())
- .template(VirtualGuest.builder()
- .operatingSystemReferenceCode("CENTOS_6_64")
- .build())
- .build())
- .processors(ContainerVirtualGuestConfigurationOption.builder()
- .productItemPrice(ProductItemPrice.builder()
- .hourlyRecurringFee(.022f)
- .recurringFee("15")
- .item(ProductItem.builder().description("1 x 2.0 GHz Core").build())
- .build())
- .template(VirtualGuest.builder().startCpus(1).build())
- .build())
- .build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java
deleted file mode 100644
index e340707..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java
+++ /dev/null
@@ -1,62 +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.softlayer.parse;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.softlayer.domain.Address;
-import org.jclouds.softlayer.domain.Datacenter;
-import org.jclouds.softlayer.domain.Region;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class GetDatacenterResponseTest extends BaseSoftLayerParseTest<Datacenter> {
-
- @Override
- public String resource() {
- return "/datacenter_get.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public Datacenter expected() {
- return Datacenter.builder()
- .id(265592)
- .longName("Amsterdam 1")
- .name("ams01")
- .locationAddress(Address.builder()
- .address("Paul van Vlissingenstraat 16")
- .accountId(1)
- .city("Amsterdam")
- .contactName("SoftLayer")
- .country("NL")
- .description("Amsterdam - AMS01")
- .id(3322)
- .isActive(1)
- .locationId(265592)
- .postalCode("1096 BK")
- .build())
- .regions(ImmutableSet.of(Region.builder().keyname("AMSTERDAM")
- .description("AMS01 - Amsterdam - Western Europe")
- .build()))
- .build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupResponseTest.java
deleted file mode 100644
index 70d202e..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupResponseTest.java
+++ /dev/null
@@ -1,212 +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.softlayer.parse;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.softlayer.domain.SoftwareDescription;
-import org.jclouds.softlayer.domain.VirtualDiskImage;
-import org.jclouds.softlayer.domain.VirtualDiskImageSoftware;
-import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplate;
-import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplateGroup;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class
- GetVirtualGuestBlockDeviceTemplateGroupResponseTest extends
- BaseSoftLayerParseTest<VirtualGuestBlockDeviceTemplateGroup> {
-
- @Override
- public String resource() {
- return "/virtual_guest_block_device_template_group_get.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public VirtualGuestBlockDeviceTemplateGroup expected() {
- return VirtualGuestBlockDeviceTemplateGroup.builder()
- .id(402456)
- .name("DST_Windows-2008_R2DC_x86-64_Base_ICOv2")
- .globalIdentifier("8df677d9-02a0-43b0-9cc8-88015fcb6ad7")
- .statusId(1)
- .accountId(278462)
- .summary("DST_Windows-2008_R2DC_x86-64_Base with preparation for ICO 2.4")
- .children(VirtualGuestBlockDeviceTemplateGroup.builder()
- .id(402458)
- .name("DST_Windows-2008_R2DC_x86-64_Base_ICOv2")
- .statusId(1)
- .accountId(278462)
- .parentId(402456)
- .summary("DST_Windows-2008_R2DC_x86-64_Base with preparation for ICO 2.4")
- .blockDevices(ImmutableSet.of(
- VirtualGuestBlockDeviceTemplate.builder()
- .id(508130)
- .device("0")
- .diskSpace(20926382592f)
- .diskImageId(6865056)
- .groupId(402458)
- .units("B")
- .diskImage(VirtualDiskImage.builder()
- .id(6865056)
- .uuid("00c9bb78-9ac0-4f43-b4d8-35a6568c7db8")
- .capacity(25f)
- .units("GB")
- .typeId(241)
- .description("rrm-2k8r2dc-ico.dstdev.sl.edst.ibm.com")
- .name("rrm-2k8r2dc-ico.dstdev.sl.edst.ibm.com")
- .storageRepositoryId(2330744)
- .softwareReferences(ImmutableSet.of(
- VirtualDiskImageSoftware.builder()
- .id(4259392)
- .softwareDescriptionId(727)
- .softwareDescription(
- SoftwareDescription.builder()
- .id(727)
- .longDescription("Nimsoft / Nimsoft Robot / 5.0")
- .manufacturer("Nimsoft")
- .name("Nimsoft Robot")
- .operatingSystem(0)
- .requiredUser("administrator")
- .version("5.0")
- .controlPanel(0)
- .virtualLicense("0")
- .virtualizationPlatform("0")
- .build())
- .build(),
- VirtualDiskImageSoftware.builder()
- .id(4259394)
- .softwareDescriptionId(829)
- .softwareDescription(
- SoftwareDescription.builder()
- .id(829)
- .longDescription("Microsoft / Windows 2008 FULL DC 64 bit R2 SP1 / DC 64 bit")
- .manufacturer("Microsoft")
- .name("Windows 2008 FULL DC 64 bit R2 SP1")
- .operatingSystem(1)
- .referenceCode("WIN_2008-DC-R2-SP1_64")
- .requiredUser("Administrator")
- .version("DC 64 bit")
- .controlPanel(0)
- .virtualLicense("0")
- .virtualizationPlatform("0")
- .build())
- .build()))
- .build())
- .build(),
- VirtualGuestBlockDeviceTemplate.builder()
- .id(508136)
- .device("1")
- .diskImageId(6865060)
- .groupId(402458)
- .diskImage(VirtualDiskImage.builder()
- .id(6865060)
- .name("7903014-SWAP")
- .uuid("38eb1c23-0cf9-4325-b78a-95545829a36d")
- .capacity(2f)
- .units("GB")
- .typeId(246)
- .description("7903014-SWAP")
- .storageRepositoryId(2330744)
- .build())
- .build()))
- .build(),
- VirtualGuestBlockDeviceTemplateGroup.builder()
- .id(402460)
- .name("DST_Windows-2008_R2DC_x86-64_Base_ICOv2")
- .statusId(1)
- .accountId(278462)
- .parentId(402456)
- .summary("DST_Windows-2008_R2DC_x86-64_Base with preparation for ICO 2.4")
- .blockDevices(
- VirtualGuestBlockDeviceTemplate.builder()
- .id(508132)
- .device("0")
- .diskSpace(20926382592f)
- .diskImageId(6865054)
- .groupId(402460)
- .units("B")
- .diskImage(VirtualDiskImage.builder()
- .id(6865054)
- .capacity(25f)
- .description("rrm-2k8r2dc-ico.dstdev.sl.edst.ibm.com")
- .name("rrm-2k8r2dc-ico.dstdev.sl.edst.ibm.com")
- .storageRepositoryId(2330746)
- .units("GB")
- .typeId(241)
- .uuid("ef20e61c-6814-47bf-8cd9-9d26f84d3789")
- .softwareReferences(ImmutableSet.of(
- VirtualDiskImageSoftware.builder()
- .id(4259396)
- .softwareDescriptionId(727)
- .softwareDescription(
- SoftwareDescription.builder()
- .id(727)
- .longDescription("Nimsoft / Nimsoft Robot / 5.0")
- .manufacturer("Nimsoft")
- .name("Nimsoft Robot")
- .operatingSystem(0)
- .requiredUser("administrator")
- .version("5.0")
- .controlPanel(0)
- .virtualLicense("0")
- .virtualizationPlatform("0")
- .build())
- .build(),
- VirtualDiskImageSoftware.builder()
- .id(4259398)
- .softwareDescriptionId(829)
- .softwareDescription(
- SoftwareDescription.builder()
- .id(829)
- .longDescription("Microsoft / Windows 2008 FULL DC 64 bit R2 SP1 / DC 64 bit")
- .manufacturer("Microsoft")
- .name("Windows 2008 FULL DC 64 bit R2 SP1")
- .operatingSystem(1)
- .referenceCode("WIN_2008-DC-R2-SP1_64")
- .requiredUser("Administrator")
- .version("DC 64 bit")
- .controlPanel(0)
- .virtualLicense("0")
- .virtualizationPlatform("0")
- .build())
- .build()))
- .build())
- .build(),
- VirtualGuestBlockDeviceTemplate.builder()
- .id(508134)
- .device("1")
- .diskImageId(6865058)
- .groupId(402460)
- .diskImage(VirtualDiskImage.builder()
- .id(6865058)
- .name("7903014-SWAP")
- .capacity(2f)
- .description("7903014-SWAP")
- .storageRepositoryId(2330746)
- .typeId(246)
- .units("GB")
- .uuid("c84edb86-a9ce-4932-bf2c-c3e4b2b44ae9")
- .build())
- .build())
- .build())
- .build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java
deleted file mode 100644
index ba214ad..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java
+++ /dev/null
@@ -1,131 +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.softlayer.parse;
-
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.softlayer.domain.SoftwareDescription;
-import org.jclouds.softlayer.domain.VirtualDiskImage;
-import org.jclouds.softlayer.domain.VirtualDiskImageSoftware;
-import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplate;
-import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplateGroup;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class
- GetVirtualGuestBlockDeviceTemplateGroupsResponseTest extends
- BaseSoftLayerParseTest<Set<VirtualGuestBlockDeviceTemplateGroup>> {
-
- @Override
- public String resource() {
- return "/account_get_block_devices_template_groups.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public Set<VirtualGuestBlockDeviceTemplateGroup> expected() {
- return ImmutableSet.of(VirtualGuestBlockDeviceTemplateGroup.builder()
- .id(82898)
- .name("Backup template for disk migration of 'ljvsilauncher1.scic.ibm.com'.")
- .globalIdentifier("e4055a07-13f5-4fa9-ab46-b023b65c47d2")
- .statusId(1)
- .accountId(278184)
- .children(VirtualGuestBlockDeviceTemplateGroup.builder()
- .id(82900)
- .name("Backup template for disk migration of 'ljvsilauncher1.scic.ibm.com'.")
- .statusId(1)
- .accountId(278184)
- .parentId(82898)
- .blockDevices(ImmutableSet.of(
- VirtualGuestBlockDeviceTemplate.builder()
- .id(108100)
- .device("0")
- .diskSpace(21832020480f)
- .diskImageId(2190750)
- .groupId(82900)
- .units("B")
- .diskImage(VirtualDiskImage.builder()
- .id(2190750)
- .uuid("42423638-a54e-4d82-9b23-25af5fb13547")
- .capacity(25f)
- .units("GB")
- .typeId(241)
- .description("ljvsilauncher1.scic.ibm.com")
- .name("ljvsilauncher1.scic.ibm.com")
- .storageRepositoryId(906427)
- .softwareReferences(ImmutableSet.of(
- VirtualDiskImageSoftware.builder()
- .id(1498856)
- .softwareDescriptionId(1076)
- .softwareDescription(
- SoftwareDescription.builder()
- .id(1076)
- .longDescription("Microsoft / Windows 2012 FULL STD 64 bit / STD x64")
- .manufacturer("Microsoft")
- .name("Windows 2012 FULL STD 64 bit")
- .operatingSystem(1)
- .referenceCode("WIN_2012-STD_64")
- .requiredUser("Administrator")
- .version("STD x64")
- .controlPanel(0)
- .virtualLicense("0")
- .virtualizationPlatform("0")
- .build())
- .build(),
- VirtualDiskImageSoftware.builder()
- .id(1498858)
- .softwareDescriptionId(106)
- .softwareDescription(
- SoftwareDescription.builder()
- .id(106)
- .longDescription("Microsoft / Windows Firewall / 1")
- .manufacturer("Microsoft")
- .name("Windows Firewall")
- .operatingSystem(0)
- .version("1")
- .controlPanel(0)
- .virtualLicense("0")
- .virtualizationPlatform("0")
- .build())
- .build()))
- .build())
- .build(), VirtualGuestBlockDeviceTemplate.builder()
- .id(108102)
- .device("1")
- .diskImageId(2190752)
- .groupId(82900)
- .diskImage(VirtualDiskImage.builder()
- .id(2190752)
- .name("3334230-SWAP")
- .uuid("9f087bfb-3ed4-4985-a8b7-ac67bd8316e6")
- .capacity(2f)
- .units("GB")
- .typeId(246)
- .description("3334230-SWAP")
- .storageRepositoryId(906427)
- .build())
- .build()))
- .build())
- .build());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java
deleted file mode 100644
index 97e2e0d..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java
+++ /dev/null
@@ -1,65 +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.softlayer.parse;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.softlayer.domain.VirtualGuest;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class GetVirtualGuestResponseTest extends BaseSoftLayerParseTest<VirtualGuest> {
-
- @Override
- public String resource() {
- return "/virtual_guest_get.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public VirtualGuest expected() {
- return VirtualGuest.builder()
- .accountId(278184)
- .createDate(new SimpleDateFormatDateService().iso8601DateParse("2013-07-26T14:08:21.552-07:00"))
- .dedicatedAccountHostOnly(false)
- .domain("test.com")
- .fullyQualifiedDomainName("my.test.com")
- .hostname("my")
- .id(3001812)
- .lastVerifiedDate(null)
- .maxCpu(1)
- .maxCpuUnits("CORE")
- .maxMemory(1024)
- .metricPollDate(null)
- .modifyDate(new SimpleDateFormatDateService().iso8601DateParse("2013-07-26T14:10:21.552-07:00"))
- .privateNetworkOnlyFlag(false)
- .startCpus(1)
- .statusId(1001)
- .uuid("92102aff-93c9-05f1-b3f2-50787e865344")
- .primaryBackendIpAddress("10.32.23.74")
- .primaryIpAddress("174.37.252.118")
- .billingItemId(0)
- .operatingSystem(null)
- .datacenter(null)
- .powerState(null)
- .softwareLicense(null)
- .build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java
deleted file mode 100644
index 08832d6..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java
+++ /dev/null
@@ -1,114 +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.softlayer.parse;
-
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.softlayer.domain.Datacenter;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListDatacentersResponseTest extends BaseSoftLayerParseTest<Set<Datacenter>> {
-
- @Override
- public String resource() {
- return "/datacenter_list.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public Set<Datacenter> expected() {
- return ImmutableSet.of(
- Datacenter.builder()
- .id(265592)
- .longName("Amsterdam 1")
- .name("ams01")
- .build(),
- Datacenter.builder()
- .id(3)
- .longName("Dallas 1")
- .name("dal01")
- .build(),
- Datacenter.builder()
- .id(154770)
- .longName("Dallas 2")
- .name("dal02")
- .build(),
- Datacenter.builder()
- .id(167092)
- .longName("Dallas 4")
- .name("dal04")
- .build(),
- Datacenter.builder()
- .id(138124)
- .longName("Dallas 5")
- .name("dal05")
- .build(),
- Datacenter.builder()
- .id(154820)
- .longName("Dallas 6")
- .name("dal06")
- .build(),
- Datacenter.builder()
- .id(142776)
- .longName("Dallas 7")
- .name("dal07")
- .build(),
- Datacenter.builder()
- .id(352392)
- .longName("Dallas 8")
- .name("dal08")
- .build(),
- Datacenter.builder()
- .id(352494)
- .longName("Hong Kong 2")
- .name("hkg02")
- .build(),
- Datacenter.builder()
- .id(142775)
- .longName("Houston 2")
- .name("hou02")
- .build(),
- Datacenter.builder()
- .id(168642)
- .longName("San Jose 1")
- .name("sjc01")
- .build(),
- Datacenter.builder()
- .id(18171)
- .longName("Seattle")
- .name("sea01")
- .build(),
- Datacenter.builder()
- .id(224092)
- .longName("Singapore 1")
- .name("sng01")
- .build(),
- Datacenter.builder()
- .id(37473)
- .longName("Washington, DC")
- .name("wdc01")
- .build()
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java
deleted file mode 100644
index d91900b..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java
+++ /dev/null
@@ -1,108 +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.softlayer.parse;
-
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.softlayer.domain.SoftwareDescription;
-import org.jclouds.softlayer.domain.VirtualDiskImage;
-import org.jclouds.softlayer.domain.VirtualDiskImageSoftware;
-import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplate;
-import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplateGroup;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListPublicImagesResponseTest extends
- BaseSoftLayerParseTest<Set<VirtualGuestBlockDeviceTemplateGroup>> {
-
- @Override
- public String resource() {
- return "/virtual_guest_block_device_template_group_get_public_images.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public Set<VirtualGuestBlockDeviceTemplateGroup> expected() {
- return ImmutableSet.of(VirtualGuestBlockDeviceTemplateGroup.builder()
- .id(33352)
- .name("25G CentOS 6 32-bit")
- .statusId(1)
- .accountId(208938)
- .parentId(10616)
- .blockDevices(ImmutableSet.of(
- VirtualGuestBlockDeviceTemplate.builder()
- .id(42678)
- .device("0")
- .diskSpace(2597196288f)
- .diskImageId(1692629)
- .groupId(33352)
- .units("B")
- .diskImage(VirtualDiskImage.builder()
- .id(1692629)
- .uuid("3764c062-43d7-4488-8119-0cf847c3e4db")
- .capacity(25f)
- .units("GB")
- .typeId(241)
- .description("25G CentOS 6 32-bit")
- .name("25G CentOS 6 32-bit")
- .storageRepositoryId(863078)
- .softwareReferences(
- VirtualDiskImageSoftware.builder()
- .id(1227351)
- .softwareDescriptionId(885)
- .softwareDescription(
- SoftwareDescription.builder()
- .id(885)
- .longDescription("CentOS / CentOS / 6.0-32 Minimal for CCI")
- .manufacturer("CentOS")
- .name("CentOS")
- .operatingSystem(1)
- .referenceCode("CENTOS_6_32")
- .requiredUser("root")
- .version("6.0-32 Minimal for CCI")
- .controlPanel(0)
- .virtualLicense("0")
- .virtualizationPlatform("0")
- .build())
- .build())
- .build())
- .build(), VirtualGuestBlockDeviceTemplate.builder()
- .id(42679)
- .device("1")
- .diskImageId(1692630)
- .diskSpace(0f)
- .groupId(33352)
- .diskImage(VirtualDiskImage.builder()
- .id(1692630)
- .name("10617-SWAP")
- .uuid("ae3d12c3-f624-4c3a-80f5-ceeea2259c16")
- .capacity(2f)
- .units("GB")
- .typeId(246)
- .description("10617-SWAP")
- .storageRepositoryId(863078)
- .build())
- .build()))
- .build());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java
deleted file mode 100644
index 74508dc..0000000
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java
+++ /dev/null
@@ -1,70 +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.softlayer.parse;
-
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.softlayer.domain.VirtualGuest;
-import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListVirtualGuestsResponseTest extends BaseSoftLayerParseTest<Set<VirtualGuest>> {
-
- @Override
- public String resource() {
- return "/account_list.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- public Set<VirtualGuest> expected() {
- return ImmutableSet.of(
- VirtualGuest.builder()
- .accountId(278184)
- .createDate(new SimpleDateFormatDateService().iso8601DateParse("2013-07-26T14:08:21.552-07:00"))
- .dedicatedAccountHostOnly(false)
- .domain("test.com")
- .fullyQualifiedDomainName("my.test.com")
- .hostname("my")
- .id(3001812)
- .lastVerifiedDate(null)
- .maxCpu(1)
- .maxCpuUnits("CORE")
- .maxMemory(1024)
- .metricPollDate(null)
- .modifyDate(new SimpleDateFormatDateService().iso8601DateParse("2013-07-26T14:10:21.552-07:00"))
- .privateNetworkOnlyFlag(false)
- .startCpus(1)
- .statusId(1001)
- .uuid("92102aff-93c9-05f1-b3f2-50787e865344")
- .primaryBackendIpAddress("10.32.23.74")
- .primaryIpAddress("174.37.252.118")
- .billingItemId(0)
- .operatingSystem(null)
- .datacenter(null)
- .powerState(null)
- .softwareLicense(null)
- .build());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java
new file mode 100644
index 0000000..2d3a47f
--- /dev/null
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/PublicImagesParseTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.softlayer.parse;
+
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.softlayer.domain.SoftwareDescription;
+import org.jclouds.softlayer.domain.VirtualDiskImage;
+import org.jclouds.softlayer.domain.VirtualDiskImageSoftware;
+import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplate;
+import org.jclouds.softlayer.domain.VirtualGuestBlockDeviceTemplateGroup;
+import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+@Test(groups = "unit")
+public class PublicImagesParseTest extends
+ BaseSoftLayerParseTest<Set<VirtualGuestBlockDeviceTemplateGroup>> {
+
+ @Override
+ public String resource() {
+ return "/virtual_guest_block_device_template_group_get_public_images.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Set<VirtualGuestBlockDeviceTemplateGroup> expected() {
+ return ImmutableSet.of(VirtualGuestBlockDeviceTemplateGroup.builder()
+ .id(33352)
+ .name("25G CentOS 6 32-bit")
+ .statusId(1)
+ .accountId(208938)
+ .parentId(10616)
+ .blockDevices(ImmutableSet.of(
+ VirtualGuestBlockDeviceTemplate.builder()
+ .id(42678)
+ .device("0")
+ .diskSpace(2597196288f)
+ .diskImageId(1692629)
+ .groupId(33352)
+ .units("B")
+ .diskImage(VirtualDiskImage.builder()
+ .id(1692629)
+ .uuid("3764c062-43d7-4488-8119-0cf847c3e4db")
+ .capacity(25f)
+ .units("GB")
+ .typeId(241)
+ .description("25G CentOS 6 32-bit")
+ .name("25G CentOS 6 32-bit")
+ .storageRepositoryId(863078)
+ .softwareReferences(
+ VirtualDiskImageSoftware.builder()
+ .id(1227351)
+ .softwareDescriptionId(885)
+ .softwareDescription(
+ SoftwareDescription.builder()
+ .id(885)
+ .longDescription("CentOS / CentOS / 6.0-32 Minimal for CCI")
+ .manufacturer("CentOS")
+ .name("CentOS")
+ .operatingSystem(1)
+ .referenceCode("CENTOS_6_32")
+ .requiredUser("root")
+ .version("6.0-32 Minimal for CCI")
+ .controlPanel(0)
+ .virtualLicense("0")
+ .virtualizationPlatform("0")
+ .build())
+ .build())
+ .build())
+ .build(), VirtualGuestBlockDeviceTemplate.builder()
+ .id(42679)
+ .device("1")
+ .diskImageId(1692630)
+ .diskSpace(0f)
+ .groupId(33352)
+ .diskImage(VirtualDiskImage.builder()
+ .id(1692630)
+ .name("10617-SWAP")
+ .uuid("ae3d12c3-f624-4c3a-80f5-ceeea2259c16")
+ .capacity(2f)
+ .units("GB")
+ .typeId(246)
+ .description("10617-SWAP")
+ .storageRepositoryId(863078)
+ .build())
+ .build()))
+ .build());
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7480d6e3/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java
new file mode 100644
index 0000000..a28988f
--- /dev/null
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/SoftwareDescriptionsParseTest.java
@@ -0,0 +1,62 @@
+/*
+ * 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.softlayer.parse;
+
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.softlayer.domain.SoftwareDescription;
+import org.jclouds.softlayer.internal.BaseSoftLayerParseTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+@Test(groups = "unit")
+public class SoftwareDescriptionsParseTest extends BaseSoftLayerParseTest<Set<SoftwareDescription>> {
+
+ @Override
+ public String resource() {
+ return "/software_description_list.json";
+ }
+
+ @Override
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Set<SoftwareDescription> expected() {
+ return ImmutableSet.of(
+ SoftwareDescription.builder()
+ .version("6.0-64 LAMP for CCI")
+ .referenceCode("CENTOS_6_64")
+ .operatingSystem(1)
+ .longDescription("CentOS / CentOS / 6.0-64 LAMP for CCI")
+ .build(),
+ SoftwareDescription.builder()
+ .version("WEB 64 bit")
+ .referenceCode("WIN_2008-WEB-R2_64")
+ .operatingSystem(1)
+ .longDescription("Microsoft / Windows 2008 FULL WEB 64 bit R2 / WEB 64 bit")
+ .build(),
+ SoftwareDescription.builder()
+ .version("12.04-32 Minimal for CCI")
+ .referenceCode("UBUNTU_12_32")
+ .operatingSystem(1)
+ .longDescription("Ubuntu / Ubuntu / 12.04-32 Minimal for CCI")
+ .build()
+ );
+ }
+}