You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2014/11/27 15:32:25 UTC
[10/24] jclouds-labs git commit: JCLOUDS-785: Leave only Abiquo
skeleton to start coding Abiquo 3 provider
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java
deleted file mode 100644
index bd69351..0000000
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/CloudResources.java
+++ /dev/null
@@ -1,455 +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.abiquo.domain;
-
-import static org.jclouds.abiquo.domain.DomainUtils.link;
-
-import com.abiquo.model.enumerator.DiskFormatType;
-import com.abiquo.model.enumerator.HypervisorType;
-import com.abiquo.model.enumerator.VolumeState;
-import com.abiquo.model.rest.RESTLink;
-import com.abiquo.server.core.appslibrary.VirtualMachineTemplateDto;
-import com.abiquo.server.core.cloud.VirtualApplianceDto;
-import com.abiquo.server.core.cloud.VirtualDatacenterDto;
-import com.abiquo.server.core.cloud.VirtualMachineDto;
-import com.abiquo.server.core.cloud.VirtualMachineState;
-import com.abiquo.server.core.cloud.VirtualMachineStateDto;
-import com.abiquo.server.core.cloud.VirtualMachineTaskDto;
-import com.abiquo.server.core.infrastructure.storage.DiskManagementDto;
-import com.abiquo.server.core.infrastructure.storage.TierDto;
-import com.abiquo.server.core.infrastructure.storage.VolumeManagementDto;
-
-/**
- * Cloud domain utilities.
- */
-public class CloudResources {
- public static VirtualDatacenterDto virtualDatacenterPost() {
- VirtualDatacenterDto virtualDatacenter = new VirtualDatacenterDto();
- virtualDatacenter.setName("VDC");
- virtualDatacenter.setHypervisorType(HypervisorType.KVM);
- virtualDatacenter.setVlan(NetworkResources.vlanPost());
- return virtualDatacenter;
- }
-
- public static VirtualApplianceDto virtualAppliancePost() {
- VirtualApplianceDto virtualAppliance = new VirtualApplianceDto();
- virtualAppliance.setName("VA");
- return virtualAppliance;
- }
-
- public static VirtualMachineDto virtualMachinePost() {
- VirtualMachineDto virtualMachine = new VirtualMachineDto();
- virtualMachine.setName("VM");
- virtualMachine.setCpu(1);
- virtualMachine.setRam(1);
- virtualMachine.setHdInBytes(20l);
- return virtualMachine;
- }
-
- public static VirtualDatacenterDto virtualDatacenterPut() {
- VirtualDatacenterDto virtualDatacenter = virtualDatacenterPost();
- virtualDatacenter.setId(1);
- virtualDatacenter.addLink(new RESTLink("datacenter", "http://localhost/api/admin/datacenters/1"));
- virtualDatacenter.addLink(new RESTLink("disks", "http://localhost/api/cloud/virtualdatacenters/1/disks"));
- virtualDatacenter.addLink(new RESTLink("enterprise", "http://localhost/api/admin/enterprises/1"));
- virtualDatacenter.addLink(new RESTLink("edit", "http://localhost/api/cloud/virtualdatacenters/1"));
- virtualDatacenter.addLink(new RESTLink("tiers", "http://localhost/api/cloud/virtualdatacenters/1/tiers"));
- virtualDatacenter.addLink(new RESTLink("virtualappliances",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances"));
- virtualDatacenter.addLink(new RESTLink("volumes", "http://localhost/api/cloud/virtualdatacenters/1/volumes"));
- virtualDatacenter.addLink(new RESTLink("privatenetworks",
- "http://localhost/api/cloud/virtualdatacenters/1/privatenetworks"));
- virtualDatacenter.addLink(new RESTLink("defaultnetwork",
- "http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1"));
- virtualDatacenter.addLink(new RESTLink("defaultvlan",
- "http://localhost/api/cloud/virtualdatacenters/1/action/defaultvlan"));
- virtualDatacenter.addLink(new RESTLink("topurchase",
- "http://localhost/api/cloud/virtualdatacenters/1/publicips/topurchase"));
- virtualDatacenter.addLink(new RESTLink("purchased",
- "http://localhost/api/cloud/virtualdatacenters/1/publicips/purchased"));
- virtualDatacenter.addLink(new RESTLink("templates",
- "http://localhost/api/cloud/virtualdatacenters/1/action/templates"));
- return virtualDatacenter;
-
- }
-
- public static VirtualApplianceDto virtualAppliancePut() {
- VirtualApplianceDto virtualAppliance = virtualAppliancePost();
- virtualAppliance.setId(1);
- virtualAppliance.addLink(new RESTLink("virtualdatacenter", "http://localhost/api/cloud/virtualdatacenters/1"));
- virtualAppliance.addLink(new RESTLink("deploy",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/action/deploy"));
- virtualAppliance.addLink(new RESTLink("edit",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1"));
- virtualAppliance.addLink(new RESTLink("state",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/state"));
- virtualAppliance.addLink(new RESTLink("undeploy",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/action/undeploy"));
- virtualAppliance.addLink(new RESTLink("virtualmachines",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines"));
- virtualAppliance.addLink(new RESTLink("price",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/action/price"));
- return virtualAppliance;
- }
-
- public static VirtualMachineDto virtualMachinePut() {
- VirtualMachineDto virtualMachine = virtualMachinePost();
- virtualMachine.setId(1);
- virtualMachine.addLink(new RESTLink("deploy",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/deploy"));
- virtualMachine.addLink(new RESTLink("disks",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/disks"));
- virtualMachine.addLink(new RESTLink("edit",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1"));
- virtualMachine.addLink(new RESTLink("state",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/state"));
- virtualMachine.addLink(new RESTLink("reset",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/reset"));
- virtualMachine.addLink(new RESTLink("tasks",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/tasks"));
- virtualMachine.addLink(new RESTLink("undeploy",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/undeploy"));
- virtualMachine.addLink(new RESTLink("persistent",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/persistent"));
- virtualMachine.addLink(new RESTLink("virtualappliance",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1"));
- virtualMachine.addLink(new RESTLink("virtualmachinetemplate",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1"));
- virtualMachine.addLink(new RESTLink("nics",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/nics"));
- virtualMachine.addLink(new RESTLink("volumes",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/volumes"));
- virtualMachine
- .addLink(new RESTLink("configurations",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/configurations"));
- virtualMachine.setCpu(1);
- virtualMachine.setRam(1);
- virtualMachine.setHdInBytes(20l);
- return virtualMachine;
- }
-
- public static VirtualMachineStateDto virtualMachineState() {
- VirtualMachineStateDto state = new VirtualMachineStateDto();
- state.setState(VirtualMachineState.ON);
- return state;
- }
-
- public static String virtualMachineStatePayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualmachinestate>");
- buffer.append("<state>ON</state>");
- buffer.append("</virtualmachinestate>");
- return buffer.toString();
- }
-
- public static VolumeManagementDto volumePost() {
- VolumeManagementDto volume = new VolumeManagementDto();
- volume.setName("Volume");
- volume.setSizeInMB(1024);
- volume.addLink(new RESTLink("tier", "http://localhost/api/cloud/virtualdatacenters/1/tiers/1"));
- return volume;
- }
-
- public static VolumeManagementDto volumePut() {
- VolumeManagementDto volume = volumePost();
- volume.setId(1);
- volume.setState(VolumeState.DETACHED.name());
-
- volume.getLinks().clear();
-
- RESTLink mappings = new RESTLink("action",
- "http://localhost/api/cloud/virtualdatacenters/1/volumes/1/action/initiatormappings");
- mappings.setTitle("initiator mappings");
- volume.addLink(mappings);
- volume.addLink(new RESTLink("edit", "http://localhost/api/cloud/virtualdatacenters/1/volumes/1"));
- volume.addLink(new RESTLink("tier", "http://localhost/api/cloud/virtualdatacenters/1/tiers/1"));
- volume.addLink(new RESTLink("virtualdatacenter", "http://localhost/api/cloud/virtualdatacenters/1"));
- return volume;
- }
-
- public static VirtualMachineTemplateDto virtualMachineTemplatePut() {
- VirtualMachineTemplateDto template = new VirtualMachineTemplateDto();
- template.setId(10);
- template.setName("m0n0wall");
- template.setDiskFormatType(DiskFormatType.VMDK_FLAT.toString());
- template.setPath("1/abiquo-repository.abiquo.com/m0n0wall/m0n0wall-1.3b18-i386-flat.vmdk");
- template.setDiskFileSize(27262976l);
- template.setCpuRequired(1);
- template.setRamRequired(128);
- template.setCpuRequired(27262976);
- template.setCreationUser("SYSTEM");
- template.setIconUrl("http://ww1.prweb.com/prfiles/2010/08/02/2823234/gI_0_HakunaLogoMedium.jpg");
- template.addLink(new RESTLink("icon", "http://localhost/api/config/icons/1"));
- template.addLink(new RESTLink("category", "http://localhost/api/config/categories/1"));
-
- return template;
-
- }
-
- public static TierDto cloudTierPut() {
- TierDto tier = new TierDto();
- tier.setId(1);
- tier.setEnabled(true);
- tier.setName("Tier");
- tier.addLink(new RESTLink("edit", "http://localhost/api/cloud/virtualdatacenters/1/tiers/1"));
- return tier;
- }
-
- public static VirtualMachineTaskDto deployOptions() {
- VirtualMachineTaskDto deploy = new VirtualMachineTaskDto();
- deploy.setForceEnterpriseSoftLimits(false);
- return deploy;
-
- }
-
- public static VirtualMachineTaskDto undeployOptions() {
- VirtualMachineTaskDto deploy = new VirtualMachineTaskDto();
- deploy.setForceUndeploy(true);
- return deploy;
- }
-
- public static String virtualDatacenterPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualDatacenter>");
- buffer.append("<cpuHard>0</cpuHard>");
- buffer.append("<cpuSoft>0</cpuSoft>");
- buffer.append("<hdHard>0</hdHard>");
- buffer.append("<hdSoft>0</hdSoft>");
- buffer.append("<publicIpsHard>0</publicIpsHard>");
- buffer.append("<publicIpsSoft>0</publicIpsSoft>");
- buffer.append("<ramHard>0</ramHard>");
- buffer.append("<ramSoft>0</ramSoft>");
- buffer.append("<storageHard>0</storageHard>");
- buffer.append("<storageSoft>0</storageSoft>");
- buffer.append("<vlansHard>0</vlansHard>");
- buffer.append("<vlansSoft>0</vlansSoft>");
- buffer.append("<hypervisorType>KVM</hypervisorType>");
- buffer.append("<name>VDC</name>");
- buffer.append(NetworkResources.vlanNetworkPostPayload());
- buffer.append("</virtualDatacenter>");
- return buffer.toString();
- }
-
- public static String virtualAppliancePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualAppliance>");
- buffer.append("<error>0</error>");
- buffer.append("<highDisponibility>0</highDisponibility>");
- buffer.append("<name>VA</name>");
- buffer.append("<publicApp>0</publicApp>");
- buffer.append("</virtualAppliance>");
- return buffer.toString();
- }
-
- public static String virtualMachinePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualMachine>");
- buffer.append("<cpu>1</cpu>");
- buffer.append("<hdInBytes>20</hdInBytes>");
- buffer.append("<highDisponibility>0</highDisponibility>");
- buffer.append("<idState>0</idState>");
- buffer.append("<idType>0</idType>");
- buffer.append("<name>VM</name>");
- buffer.append("<ram>1</ram>");
- buffer.append("<vdrpPort>0</vdrpPort>");
- buffer.append("</virtualMachine>");
- return buffer.toString();
- }
-
- public static String virtualDatacenterPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualDatacenter>");
- buffer.append(link("/admin/datacenters/1", "datacenter"));
- buffer.append(link("/cloud/virtualdatacenters/1/disks", "disks"));
- buffer.append(link("/admin/enterprises/1", "enterprise"));
- buffer.append(link("/cloud/virtualdatacenters/1", "edit"));
- buffer.append(link("/cloud/virtualdatacenters/1/tiers", "tiers"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances", "virtualappliances"));
- buffer.append(link("/cloud/virtualdatacenters/1/volumes", "volumes"));
- buffer.append(link("/cloud/virtualdatacenters/1/privatenetworks", "privatenetworks"));
- buffer.append(link("/cloud/virtualdatacenters/1/privatenetworks/1", "defaultnetwork"));
- buffer.append(link("/cloud/virtualdatacenters/1/action/defaultvlan", "defaultvlan"));
- buffer.append(link("/cloud/virtualdatacenters/1/publicips/topurchase", "topurchase"));
- buffer.append(link("/cloud/virtualdatacenters/1/publicips/purchased", "purchased"));
- buffer.append(link("/cloud/virtualdatacenters/1/action/templates", "templates"));
- buffer.append("<cpuHard>0</cpuHard>");
- buffer.append("<cpuSoft>0</cpuSoft>");
- buffer.append("<hdHard>0</hdHard>");
- buffer.append("<hdSoft>0</hdSoft>");
- buffer.append("<publicIpsHard>0</publicIpsHard>");
- buffer.append("<publicIpsSoft>0</publicIpsSoft>");
- buffer.append("<ramHard>0</ramHard>");
- buffer.append("<ramSoft>0</ramSoft>");
- buffer.append("<storageHard>0</storageHard>");
- buffer.append("<storageSoft>0</storageSoft>");
- buffer.append("<vlansHard>0</vlansHard>");
- buffer.append("<vlansSoft>0</vlansSoft>");
- buffer.append("<hypervisorType>KVM</hypervisorType>");
- buffer.append("<id>1</id>");
- buffer.append("<name>VDC</name>");
- buffer.append(NetworkResources.vlanNetworkPostPayload());
- buffer.append("</virtualDatacenter>");
- return buffer.toString();
- }
-
- public static String virtualDatacenterRefPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<links>");
- buffer.append(link("/cloud/virtualdatacenters/1", "virtualdatacenter"));
- buffer.append("</links>");
- return buffer.toString();
- }
-
- public static String virtualAppliancePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualAppliance>");
- buffer.append(link("/cloud/virtualdatacenters/1", "virtualdatacenter"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/action/deploy", "deploy"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1", "edit"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/state", "state"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/action/undeploy", "undeploy"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines", "virtualmachines"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/action/price", "price"));
- buffer.append("<error>0</error>");
- buffer.append("<highDisponibility>0</highDisponibility>");
- buffer.append("<id>1</id>");
- buffer.append("<name>VA</name>");
- buffer.append("<publicApp>0</publicApp>");
- buffer.append("</virtualAppliance>");
- return buffer.toString();
- }
-
- public static String virtualMachinePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualMachine>");
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/deploy", "deploy"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/disks", "disks"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1", "edit"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/state", "state"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/reset", "reset"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/tasks", "tasks"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/undeploy",
- "undeploy"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/action/persistent",
- "persistent"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1", "virtualappliance"));
- buffer.append(link("/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1",
- "virtualmachinetemplate"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/nics", "nics"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/storage/volumes", "volumes"));
- buffer.append(link("/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/configurations",
- "configurations"));
-
- buffer.append("<cpu>1</cpu>");
- buffer.append("<hdInBytes>20</hdInBytes>");
- buffer.append("<highDisponibility>0</highDisponibility>");
- buffer.append("<id>1</id>");
- buffer.append("<idState>0</idState>");
- buffer.append("<idType>0</idType>");
- buffer.append("<name>VM</name>");
- buffer.append("<ram>1</ram>");
- buffer.append("<vdrpPort>0</vdrpPort>");
- buffer.append("</virtualMachine>");
- return buffer.toString();
- }
-
- public static String volumePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<volume>");
- buffer.append(link("/cloud/virtualdatacenters/1/tiers/1", "tier"));
- buffer.append("<name>Volume</name>");
- buffer.append("<sizeInMB>1024</sizeInMB>");
- buffer.append("</volume>");
- return buffer.toString();
- }
-
- public static String volumePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<volume>");
- buffer.append(link("/cloud/virtualdatacenters/1/volumes/1/action/initiatormappings", "action",
- "initiator mappings"));
- buffer.append(link("/cloud/virtualdatacenters/1/volumes/1", "edit"));
- buffer.append(link("/cloud/virtualdatacenters/1/tiers/1", "tier"));
- buffer.append(link("/cloud/virtualdatacenters/1", "virtualdatacenter"));
- buffer.append("<id>1</id>");
- buffer.append("<name>Volume</name>");
- buffer.append("<state>DETACHED</state>");
- buffer.append("<sizeInMB>1024</sizeInMB>");
- buffer.append("</volume>");
- return buffer.toString();
- }
-
- public static String cloudTierPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<tier>");
- buffer.append(link("/cloud/virtualdatacenters/1/tiers/1", "edit"));
- buffer.append("<enabled>true</enabled>");
- buffer.append("<id>1</id>");
- buffer.append("<name>Tier</name>");
- buffer.append("</tier>");
- return buffer.toString();
- }
-
- public static String deployPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualmachinetask>");
- buffer.append("<forceEnterpriseSoftLimits>false</forceEnterpriseSoftLimits>");
- buffer.append("</virtualmachinetask>");
- return buffer.toString();
- }
-
- public static String undeployPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualmachinetask>");
- buffer.append("<forceEnterpriseSoftLimits>false</forceEnterpriseSoftLimits>");
- buffer.append("<forceUndeploy>true</forceUndeploy>");
- buffer.append("</virtualmachinetask>");
- return buffer.toString();
- }
-
- public static DiskManagementDto hardDiskPost() {
- DiskManagementDto disk = new DiskManagementDto();
- disk.setSizeInMb(1024L);
- return disk;
- }
-
- public static DiskManagementDto hardDiskPut() {
- DiskManagementDto disk = hardDiskPost();
- disk.addLink(new RESTLink("edit", "http://localhost/api/cloud/virtualdatacenters/1/disks/1"));
- disk.addLink(new RESTLink("virtualdatacenter", "http://localhost/api/cloud/virtualdatacenters/1"));
- return disk;
- }
-
- public static String hardDiskPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<disk>");
- buffer.append("<sizeInMb>1024</sizeInMb>");
- buffer.append("</disk>");
- return buffer.toString();
- }
-
- public static String hardDiskPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<disk>");
- buffer.append(link("/cloud/virtualdatacenters/1", "virtualdatacenter"));
- buffer.append(link("/cloud/virtualdatacenters/1/disks/1", "edit"));
- buffer.append("<sequence>0</sequence>");
- buffer.append("<sizeInMb>1024</sizeInMb>");
- buffer.append("</disk>");
- return buffer.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java
deleted file mode 100644
index 5182db6..0000000
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/ConfigResources.java
+++ /dev/null
@@ -1,155 +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.abiquo.domain;
-
-import static org.jclouds.abiquo.domain.DomainUtils.link;
-
-import java.io.IOException;
-import java.net.URL;
-import java.nio.charset.Charset;
-
-import com.abiquo.model.rest.RESTLink;
-import com.abiquo.server.core.appslibrary.CategoryDto;
-import com.abiquo.server.core.config.LicenseDto;
-import com.abiquo.server.core.config.SystemPropertyDto;
-import com.google.common.io.Resources;
-
-/**
- * Enterprise domain utilities.
- */
-public class ConfigResources {
- public static LicenseDto licensePost() {
- LicenseDto license = new LicenseDto();
- license.setCode(readLicense("license/expired"));
- return license;
- }
-
- public static CategoryDto categoryPost() {
- CategoryDto category = new CategoryDto();
- category.setName("category");
- category.setErasable(false);
- category.setDefaultCategory(false);
- return category;
- }
-
- public static CategoryDto categoryPut() {
- CategoryDto category = categoryPost();
- category.setId(1);
- category.addLink(new RESTLink("edit", "http://localhost/api/config/categories/1"));
- return category;
- }
-
- public static LicenseDto licensePut() {
- LicenseDto license = licensePost();
- license.setId(1);
- license.addLink(new RESTLink("edit", "http://localhost/api/config/licenses/1"));
-
- return license;
- }
-
- public static SystemPropertyDto propertyPut() {
- SystemPropertyDto property = new SystemPropertyDto();
- property.setId(1);
- property.setDescription("Time interval in seconds");
- property.setValue("10");
- property.setName("api.applibrary.ovfpackagesDownloadingProgressUpdateInterval");
- property.addLink(new RESTLink("edit", "http://localhost/api/config/properties/1"));
-
- return property;
- }
-
- public static String licensePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<license>");
- buffer.append(link("/admin/enterprises/config/licenses/1", "edit"));
- buffer.append("<code>" + readLicense("license/expired") + "</code>");
- buffer.append("<id>1</id>");
- buffer.append("</license>");
- return buffer.toString();
- }
-
- public static String licensePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<license>");
- buffer.append("<code>" + readLicense("license/expired") + "</code>");
- buffer.append("</license>");
- return buffer.toString();
- }
-
- public static String categoryPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<category>");
- buffer.append("<defaultCategory>false</defaultCategory>");
- buffer.append("<erasable>false</erasable>");
- buffer.append("<name>category</name>");
- buffer.append("</category>");
- return buffer.toString();
- }
-
- public static String categoryPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<category>");
- buffer.append(link("/config/categories/1", "edit"));
- buffer.append("<defaultCategory>false</defaultCategory>");
- buffer.append("<erasable>false</erasable>");
- buffer.append("<id>1</id>");
- buffer.append("<name>category</name>");
- buffer.append("</category>");
- return buffer.toString();
- }
-
- public static String iconPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<icon>");
- buffer.append(link("/config/icons/1", "edit"));
- buffer.append("<id>1</id>");
- buffer.append("<name>icon</name>");
- buffer.append("<path>http://www.pixeljoint.com/files/icons/mipreview1.gif</path>");
- buffer.append("</icon>");
- return buffer.toString();
- }
-
- public static String iconPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<icon>");
- buffer.append("<name>icon</name>");
- buffer.append("<path>http://www.pixeljoint.com/files/icons/mipreview1.gif</path>");
- buffer.append("</icon>");
- return buffer.toString();
- }
-
- public static String propertyPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<property>");
- buffer.append(link("/config/properties/1", "edit"));
- buffer.append("<description>Time interval in seconds</description>");
- buffer.append("<id>1</id>");
- buffer.append("<name>api.applibrary.ovfpackagesDownloadingProgressUpdateInterval</name>");
- buffer.append("<value>10</value>");
- buffer.append("</property>");
- return buffer.toString();
- }
-
- private static String readLicense(final String filename) {
- URL url = ConfigResources.class.getResource("/" + filename);
- try {
- return Resources.toString(url, Charset.defaultCharset());
- } catch (IOException e) {
- throw new RuntimeException("Could not read file " + filename);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/java/org/jclouds/abiquo/domain/DomainUtils.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/DomainUtils.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/DomainUtils.java
deleted file mode 100644
index 79da2d1..0000000
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/DomainUtils.java
+++ /dev/null
@@ -1,55 +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.abiquo.domain;
-
-import org.jclouds.xml.XMLParser;
-
-import com.abiquo.model.rest.RESTLink;
-
-/**
- * Utility class to build domain objects used in tests.
- */
-public class DomainUtils {
- /**
- * Adds the XML header to the given XML.
- */
- public static String withHeader(final String xml) {
- return XMLParser.DEFAULT_XML_HEADER + xml;
- }
-
- /**
- * Builds a link in xml format
- */
- public static String link(final String href, final String rel) {
- return "<link href=\"http://localhost/api" + href + "\" rel=\"" + rel + "\"/>";
- }
-
- /**
- * Builds a link in xml format
- */
- public static String link(final String href, final String rel, final String title) {
- return "<link href=\"http://localhost/api" + href + "\" rel=\"" + rel + "\" title=\"" + title + "\"/>";
- }
-
- /**
- * Builds a link in xml format
- */
- public static String link(final RESTLink link) {
- return "<link href=\"" + link.getHref() + "\" rel=\"" + link.getRel() + "\""
- + (link.getTitle() == null ? "" : " title=\"" + link.getTitle() + "\"") + "/>";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/java/org/jclouds/abiquo/domain/EnterpriseResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/EnterpriseResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/EnterpriseResources.java
deleted file mode 100644
index 40fe679..0000000
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/EnterpriseResources.java
+++ /dev/null
@@ -1,316 +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.abiquo.domain;
-
-import static org.jclouds.abiquo.domain.DomainUtils.link;
-
-import java.util.Map;
-
-import com.abiquo.model.rest.RESTLink;
-import com.abiquo.server.core.appslibrary.TemplateDefinitionListDto;
-import com.abiquo.server.core.enterprise.DatacenterLimitsDto;
-import com.abiquo.server.core.enterprise.EnterpriseDto;
-import com.abiquo.server.core.enterprise.EnterprisePropertiesDto;
-import com.abiquo.server.core.enterprise.UserDto;
-import com.google.common.collect.Maps;
-
-/**
- * Enterprise domain utilities.
- */
-public class EnterpriseResources {
- public static EnterpriseDto enterprisePost() {
- EnterpriseDto enterprise = new EnterpriseDto();
- enterprise.setName("Kalakaua");
- return enterprise;
- }
-
- public static EnterpriseDto enterprisePut() {
- EnterpriseDto enterprise = enterprisePost();
- enterprise.setId(1);
- enterprise.addLink(new RESTLink("edit", "http://localhost/api/admin/enterprises/1"));
- enterprise.addLink(new RESTLink("limits", "http://localhost/api/admin/enterprises/1/limits"));
- enterprise.addLink(new RESTLink("users", "http://localhost/api/admin/enterprises/1/users"));
- enterprise.addLink(new RESTLink("properties", "http://localhost/api/admin/enterprises/1/properties"));
- enterprise.addLink(new RESTLink("reservedmachines", "http://localhost/api/admin/enterprises/1/reservedmachines"));
- enterprise.addLink(new RESTLink("datacenterrepositories",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories"));
- enterprise.addLink(new RESTLink("externalnetworks",
- "http://localhost/api/admin/enterprises/1/action/externalnetworks"));
- enterprise.addLink(new RESTLink("virtualmachines",
- "http://localhost/api/admin/enterprises/1/action/virtualmachines"));
- enterprise.addLink(new RESTLink("cloud/virtualdatacenters",
- "http://localhost/api/admin/enterprises/1/action/virtualdatacenters"));
- enterprise.addLink(new RESTLink("virtualappliances",
- "http://localhost/api/admin/enterprises/1/action/virtualappliances"));
- enterprise.addLink(new RESTLink("appslib/templateDefinitionLists",
- "http://localhost/api/admin/enterprises/1/appslib/templateDefinitionLists"));
-
- return enterprise;
- }
-
- public static EnterprisePropertiesDto enterprisePropertiesPut() {
- EnterprisePropertiesDto enterpriseProp = new EnterprisePropertiesDto();
- enterpriseProp.setId(1);
- Map<String, String> props = Maps.newHashMap();
- props.put("key", "value");
- enterpriseProp.setProperties(props);
- enterpriseProp.addLink(new RESTLink("edit", "http://localhost/api/admin/enterprises/1/properties"));
- enterpriseProp.addLink(new RESTLink("enterprise", "http://localhost/api/admin/enterprises/1"));
-
- return enterpriseProp;
- }
-
- public static String enterprisePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<enterprise>");
- buffer.append("<cpuHard>0</cpuHard>");
- buffer.append("<cpuSoft>0</cpuSoft>");
- buffer.append("<hdHard>0</hdHard>");
- buffer.append("<hdSoft>0</hdSoft>");
- buffer.append("<publicIpsHard>0</publicIpsHard>");
- buffer.append("<publicIpsSoft>0</publicIpsSoft>");
- buffer.append("<ramHard>0</ramHard>");
- buffer.append("<ramSoft>0</ramSoft>");
- buffer.append("<storageHard>0</storageHard>");
- buffer.append("<storageSoft>0</storageSoft>");
- buffer.append("<vlansHard>0</vlansHard>");
- buffer.append("<vlansSoft>0</vlansSoft>");
- buffer.append("<isReservationRestricted>false</isReservationRestricted>");
- buffer.append("<name>Kalakaua</name>");
- buffer.append("<repositoryHard>0</repositoryHard>");
- buffer.append("<repositorySoft>0</repositorySoft>");
- buffer.append("</enterprise>");
- return buffer.toString();
- }
-
- public static String enterprisePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<enterprise>");
- buffer.append(link("/admin/enterprises/1", "edit"));
- buffer.append(link("/admin/enterprises/1/limits", "limits"));
- buffer.append(link("/admin/enterprises/1/users", "users"));
- buffer.append(link("/admin/enterprises/1/properties", "properties"));
- buffer.append(link("/admin/enterprises/1/reservedmachines", "reservedmachines"));
- buffer.append(link("/admin/enterprises/1/datacenterrepositories", "datacenterrepositories"));
- buffer.append(link("/admin/enterprises/1/action/externalnetworks", "externalnetworks"));
- buffer.append(link("/admin/enterprises/1/action/virtualmachines", "virtualmachines"));
- buffer.append(link("/admin/enterprises/1/action/virtualdatacenters", "cloud/virtualdatacenters"));
- buffer.append(link("/admin/enterprises/1/action/virtualappliances", "virtualappliances"));
- buffer.append(link("/admin/enterprises/1/appslib/templateDefinitionLists", "appslib/templateDefinitionLists"));
- buffer.append("<cpuHard>0</cpuHard>");
- buffer.append("<cpuSoft>0</cpuSoft>");
- buffer.append("<hdHard>0</hdHard>");
- buffer.append("<hdSoft>0</hdSoft>");
- buffer.append("<publicIpsHard>0</publicIpsHard>");
- buffer.append("<publicIpsSoft>0</publicIpsSoft>");
- buffer.append("<ramHard>0</ramHard>");
- buffer.append("<ramSoft>0</ramSoft>");
- buffer.append("<storageHard>0</storageHard>");
- buffer.append("<storageSoft>0</storageSoft>");
- buffer.append("<vlansHard>0</vlansHard>");
- buffer.append("<vlansSoft>0</vlansSoft>");
- buffer.append("<id>1</id>");
- buffer.append("<isReservationRestricted>false</isReservationRestricted>");
- buffer.append("<name>Kalakaua</name>");
- buffer.append("<repositoryHard>0</repositoryHard>");
- buffer.append("<repositorySoft>0</repositorySoft>");
- buffer.append("</enterprise>");
- return buffer.toString();
- }
-
- public static String enterprisePropertiesPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<enterpriseProperties>");
- buffer.append(link("/admin/enterprises/1/properties", "edit"));
- buffer.append(link("/admin/enterprises/1", "enterprise"));
- buffer.append("<id>1</id>");
- buffer.append("<properties>");
- buffer.append("<entry>");
- buffer.append("<key>key</key>");
- buffer.append("<value>value</value>");
- buffer.append("</entry>");
- buffer.append("</properties>");
- buffer.append("</enterpriseProperties>");
- return buffer.toString();
- }
-
- public static DatacenterLimitsDto datacenterLimitsPost() {
- DatacenterLimitsDto limits = new DatacenterLimitsDto();
- limits.setCpuCountLimits(0, 0);
- limits.setHdLimitsInMb(0, 0);
- limits.setPublicIPLimits(0, 0);
- limits.setRamLimitsInMb(0, 0);
- limits.setStorageLimits(0, 0);
- limits.setVlansLimits(0, 0);
- limits.setRepositoryHardLimitsInMb(0);
- limits.setRepositorySoftLimitsInMb(0);
- return limits;
- }
-
- public static DatacenterLimitsDto datacenterLimitsPut(final EnterpriseDto enterprise) {
- DatacenterLimitsDto limits = datacenterLimitsPost();
- limits.setId(1);
- limits.addLink(new RESTLink("edit", "http://localhost/api/admin/enterprises/" + enterprise.getId() + "/limits/1"));
- return limits;
- }
-
- public static TemplateDefinitionListDto templateListPost() {
- TemplateDefinitionListDto templateList = new TemplateDefinitionListDto();
- templateList.setName("myList");
- templateList.setUrl("http://virtualapp-repository.com/vapp1.ovf");
- return templateList;
- }
-
- public static TemplateDefinitionListDto templateListPut() {
- TemplateDefinitionListDto templateList = templateListPost();
- templateList.setId(1);
- templateList.addLink(new RESTLink("edit",
- "http://localhost/api/admin/enterprises/1/appslib/templateDefinitionLists/1"));
- templateList.addLink(new RESTLink("repositoryStatus",
- "http://localhost/api/admin/enterprises/1/appslib/templateDefinitionLists/1/actions/repositoryStatus"));
- return templateList;
- }
-
- public static String datacenterLimitsPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<limit>");
- buffer.append("<cpuHard>0</cpuHard>");
- buffer.append("<cpuSoft>0</cpuSoft>");
- buffer.append("<hdHard>0</hdHard>");
- buffer.append("<hdSoft>0</hdSoft>");
- buffer.append("<publicIpsHard>0</publicIpsHard>");
- buffer.append("<publicIpsSoft>0</publicIpsSoft>");
- buffer.append("<ramHard>0</ramHard>");
- buffer.append("<ramSoft>0</ramSoft>");
- buffer.append("<storageHard>0</storageHard>");
- buffer.append("<storageSoft>0</storageSoft>");
- buffer.append("<vlansHard>0</vlansHard>");
- buffer.append("<vlansSoft>0</vlansSoft>");
- buffer.append("<repositoryHard>0</repositoryHard>");
- buffer.append("<repositorySoft>0</repositorySoft>");
- buffer.append("</limit>");
- return buffer.toString();
- }
-
- public static String templateListPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<templateDefinitionList>");
- buffer.append("<name>myList</name>");
- buffer.append("<url>http://virtualapp-repository.com/vapp1.ovf</url>");
- buffer.append("</templateDefinitionList>");
- return buffer.toString();
- }
-
- public static String templateListPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<templateDefinitionList>");
- buffer.append(link("/admin/enterprises/1/appslib/templateDefinitionLists/1", "edit"));
- buffer.append(link("/admin/enterprises/1/appslib/templateDefinitionLists/1/actions/repositoryStatus",
- "repositoryStatus"));
- buffer.append("<id>1</id>");
- buffer.append("<name>myList</name>");
- buffer.append("<url>http://virtualapp-repository.com/vapp1.ovf</url>");
- buffer.append("</templateDefinitionList>");
- return buffer.toString();
- }
-
- public static String datacenterLimitsPutPayload(final EnterpriseDto enterprise) {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<limit>");
- buffer.append(link("/admin/enterprises/" + enterprise.getId() + "/limits/1", "edit"));
- buffer.append("<cpuHard>0</cpuHard>");
- buffer.append("<cpuSoft>0</cpuSoft>");
- buffer.append("<hdHard>0</hdHard>");
- buffer.append("<hdSoft>0</hdSoft>");
- buffer.append("<publicIpsHard>0</publicIpsHard>");
- buffer.append("<publicIpsSoft>0</publicIpsSoft>");
- buffer.append("<ramHard>0</ramHard>");
- buffer.append("<ramSoft>0</ramSoft>");
- buffer.append("<storageHard>0</storageHard>");
- buffer.append("<storageSoft>0</storageSoft>");
- buffer.append("<vlansHard>0</vlansHard>");
- buffer.append("<vlansSoft>0</vlansSoft>");
- buffer.append("<id>1</id>");
- buffer.append("<repositoryHard>0</repositoryHard>");
- buffer.append("<repositorySoft>0</repositorySoft>");
- buffer.append("</limit>");
- return buffer.toString();
- }
-
- public static String userPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<user>");
- buffer.append(link("/admin/roles/1", "role"));
- buffer.append("<active>true</active>");
- buffer.append("<authType>ABIQUO</authType>");
- buffer.append("<description>A hawaian user</description>");
- buffer.append("<email>abe.joha@aloha.com</email>");
- buffer.append("<locale>en_US</locale>");
- buffer.append("<name>Aberahama</name>");
- buffer.append("<nick>abejo</nick>");
- buffer.append("<password>c69a39bd64ffb77ea7ee3369dce742f3</password>");
- buffer.append("<surname>Johanson</surname>");
- buffer.append("</user>");
- return buffer.toString();
- }
-
- public static UserDto userPost() {
- UserDto user = new UserDto();
- user.setName("Aberahama");
- user.setSurname("Johanson");
- user.setDescription("A hawaian user");
- user.setEmail("abe.joha@aloha.com");
- user.setNick("abejo");
- user.setAuthType("ABIQUO");
- user.setLocale("en_US");
- user.setActive(true);
- user.setPassword("c69a39bd64ffb77ea7ee3369dce742f3");
- user.addLink(new RESTLink("role", "http://localhost/api/admin/roles/1"));
- return user;
- }
-
- public static String userPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<user>");
- buffer.append(link("/admin/roles/1", "role"));
- buffer.append(link("/admin/enterprises/1/users/1", "edit"));
- buffer.append(link("/admin/enterprises/1", "enterprise"));
- buffer.append(link("/admin/enterprises/1/users/1/action/virtualmachines", "virtualmachines"));
- buffer.append("<active>true</active>");
- buffer.append("<authType>ABIQUO</authType>");
- buffer.append("<description>A hawaian user</description>");
- buffer.append("<email>abe.joha@aloha.com</email>");
- buffer.append("<id>1</id>");
- buffer.append("<locale>en_US</locale>");
- buffer.append("<name>Aberahama</name>");
- buffer.append("<nick>abejo</nick>");
- buffer.append("<password>c69a39bd64ffb77ea7ee3369dce742f3</password>");
- buffer.append("<surname>Johanson</surname>");
- buffer.append("</user>");
- return buffer.toString();
- }
-
- public static UserDto userPut() {
- UserDto user = userPost();
- user.setId(1);
- user.addLink(new RESTLink("edit", "http://localhost/api/admin/enterprises/1/users/1"));
- user.addLink(new RESTLink("enterprise", "http://localhost/api/admin/enterprises/1"));
- user.addLink(new RESTLink("virtualmachines",
- "http://localhost/api/admin/enterprises/1/users/1/action/virtualmachines"));
- return user;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/java/org/jclouds/abiquo/domain/InfrastructureResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/InfrastructureResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/InfrastructureResources.java
deleted file mode 100644
index 2c33897..0000000
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/InfrastructureResources.java
+++ /dev/null
@@ -1,389 +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.abiquo.domain;
-
-import static org.jclouds.abiquo.domain.DomainUtils.link;
-
-import com.abiquo.model.enumerator.RemoteServiceType;
-import com.abiquo.model.rest.RESTLink;
-import com.abiquo.server.core.infrastructure.DatacenterDto;
-import com.abiquo.server.core.infrastructure.MachineDto;
-import com.abiquo.server.core.infrastructure.RackDto;
-import com.abiquo.server.core.infrastructure.RemoteServiceDto;
-import com.abiquo.server.core.infrastructure.storage.StorageDeviceDto;
-import com.abiquo.server.core.infrastructure.storage.StoragePoolDto;
-import com.abiquo.server.core.infrastructure.storage.TierDto;
-
-/**
- * Infrastructure domain utilities.
- */
-public class InfrastructureResources {
- public static DatacenterDto datacenterPost() {
- DatacenterDto datacenter = new DatacenterDto();
- datacenter.setName("DC");
- datacenter.setLocation("Honolulu");
- return datacenter;
- }
-
- public static RackDto rackPost() {
- RackDto rack = new RackDto();
- rack.setName("Aloha");
- rack.setShortDescription("A hawaian rack");
- rack.setHaEnabled(false);
- rack.setVlanIdMin(6);
- rack.setVlanIdMax(3024);
- rack.setVlanPerVdcReserved(6);
- rack.setNrsq(80);
- return rack;
- }
-
- public static MachineDto machinePost() {
- MachineDto machine = new MachineDto();
- machine.setName("Kamehameha");
- machine.setVirtualCpuCores(3);
- machine.setDescription("A hawaian machine");
- machine.setVirtualRamInMb(512);
- return machine;
- }
-
- public static RemoteServiceDto remoteServicePost() {
- RemoteServiceDto remoteService = new RemoteServiceDto();
- remoteService.setType(RemoteServiceType.NODE_COLLECTOR);
- remoteService.setUri("http://localhost:80/nodecollector");
- remoteService.setStatus(0);
- return remoteService;
- }
-
- public static StorageDeviceDto storageDevicePost() {
- StorageDeviceDto storage = new StorageDeviceDto();
- storage.setName("Aloha aloha");
- storage.setIscsiIp("10.10.10.10");
- storage.setIscsiPort(99);
- storage.setManagementPort(90);
-
- return storage;
- }
-
- public static StoragePoolDto storagePoolPost() {
- StoragePoolDto storagePool = new StoragePoolDto();
- storagePool.setName("Hawaian Storage Pool");
- return storagePool;
- }
-
- public static DatacenterDto datacenterPut() {
- DatacenterDto datacenter = datacenterPost();
- datacenter.setId(1);
- datacenter.addLink(new RESTLink("checkmachinestate",
- "http://localhost/api/admin/datacenters/1/action/checkmachinestate"));
- datacenter.addLink(new RESTLink("checkmachineipmistate",
- "http://localhost/api/admin/datacenters/1/action/checkmachineipmistate"));
- datacenter.addLink(new RESTLink("checkremoteservice",
- "http://localhost/api/admin/datacenters/1/action/checkremoteservice"));
- datacenter.addLink(new RESTLink("devices", "http://localhost/api/admin/datacenters/1/storage/devices"));
- datacenter.addLink(new RESTLink("discovermultiple",
- "http://localhost/api/admin/datacenters/1/action/discovermultiple"));
- datacenter.addLink(new RESTLink("discoversingle",
- "http://localhost/api/admin/datacenters/1/action/discoversingle"));
- datacenter.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1"));
- datacenter.addLink(new RESTLink("getLimits", "http://localhost/api/admin/datacenters/1/action/getLimits"));
- datacenter.addLink(new RESTLink("racks", "http://localhost/api/admin/datacenters/1/racks"));
- datacenter.addLink(new RESTLink("remoteservices", "http://localhost/api/admin/datacenters/1/remoteservices"));
- datacenter.addLink(new RESTLink("tiers", "http://localhost/api/admin/datacenters/1/storage/tiers"));
- datacenter.addLink(new RESTLink("network", "http://localhost/api/admin/datacenters/1/network"));
- datacenter.addLink(new RESTLink("enterprises", "http://localhost/api/admin/datacenters/1/action/enterprises"));
- datacenter.addLink(new RESTLink("hypervisor", "http://localhost/api/admin/datacenters/1/action/hypervisor"));
- datacenter.addLink(new RESTLink("hypervisors", "http://localhost/api/admin/datacenters/1/hypervisors"));
- return datacenter;
- }
-
- public static RackDto rackPut() {
- RackDto rack = rackPost();
- rack.setId(1);
- rack.addLink(new RESTLink("datacenter", "http://localhost/api/admin/datacenters/1"));
- rack.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1/racks/1"));
- rack.addLink(new RESTLink("machines", "http://localhost/api/admin/datacenters/1/racks/1/machines"));
- return rack;
- }
-
- public static TierDto tierPut() {
- TierDto tier = new TierDto();
- tier.setId(1);
- tier.setEnabled(true);
- tier.setName("Tier");
- tier.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1/storage/tiers/1"));
- tier.addLink(new RESTLink("datacenter", "http://localhost/api/admin/datacenters/1"));
- tier.addLink(new RESTLink("pools", "http://localhost/api/admin/datacenters/1/storage/tiers/1/pools"));
-
- return tier;
- }
-
- public static StorageDeviceDto storageDevicePut() {
- StorageDeviceDto storageDevice = storageDevicePost();
- storageDevice.setId(1);
- storageDevice.addLink(new RESTLink("datacenter", "http://localhost/api/admin/datacenters/1"));
- storageDevice.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1/storage/devices/1"));
- storageDevice.addLink(new RESTLink("pools", "http://localhost/api/admin/datacenters/1/storage/devices/1/pools"));
-
- return storageDevice;
- }
-
- public static StoragePoolDto storagePoolPut() {
- StoragePoolDto storagePool = storagePoolPost();
- storagePool.setIdStorage("tururututu");
- storagePool.addLink(new RESTLink("device", "http://localhost/api/admin/datacenters/1/storage/devices/1"));
- storagePool.addLink(new RESTLink("edit",
- "http://localhost/api/admin/datacenters/1/storage/devices/1/pools/tururututu"));
-
- return storagePool;
- }
-
- public static RemoteServiceDto remoteServicePut() {
- RemoteServiceDto remoteService = remoteServicePost();
- remoteService.setId(1);
- remoteService.addLink(new RESTLink("check",
- "http://localhost/api/admin/datacenters/1/remoteservices/nodecollector/action/check"));
- remoteService.addLink(new RESTLink("datacenter", "http://localhost/api/admin/datacenters/1"));
- remoteService.addLink(new RESTLink("edit",
- "http://localhost/api/admin/datacenters/1/remoteservices/nodecollector"));
- return remoteService;
- }
-
- public static MachineDto machinePut() {
- MachineDto machine = machinePost();
- machine.setId(1);
- machine.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1/racks/1/machines/1"));
- machine.addLink(new RESTLink("rack", "http://localhost/api/admin/datacenters/1/racks/1"));
- machine.addLink(new RESTLink("checkstate",
- "http://localhost/api/admin/datacenters/1/racks/1/machines/1/action/checkstate"));
- machine.addLink(new RESTLink("checkipmistate",
- "http://localhost/api/admin/datacenters/1/racks/1/machines/1/action/checkipmistate"));
- machine.addLink(new RESTLink("led", "http://localhost/api/admin/datacenters/1/racks/1/machines/1/led"));
- machine.addLink(new RESTLink("ledoff",
- "http://localhost/api/admin/datacenters/1/racks/1/machines/1/action/ledoff"));
- machine
- .addLink(new RESTLink("ledon", "http://localhost/api/admin/datacenters/1/racks/1/machines/1/action/ledon"));
- machine.addLink(new RESTLink("logicserver",
- "http://localhost/api/admin/datacenters/1/racks/1/machines/1/logicserver"));
- machine.addLink(new RESTLink("poweroff",
- "http://localhost/api/admin/datacenters/1/racks/1/machines/1/action/poweroff"));
- machine.addLink(new RESTLink("poweron",
- "http://localhost/api/admin/datacenters/1/racks/1/machines/1/action/poweron"));
- machine.addLink(new RESTLink("virtualmachines",
- "http://localhost/api/admin/datacenters/1/racks/1/machines/1/virtualmachines"));
- machine.setVirtualCpuCores(5);
-
- return machine;
- }
-
- public static String datacenterPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<datacenter>");
- buffer.append("<location>Honolulu</location>");
- buffer.append("<name>DC</name>");
- buffer.append("</datacenter>");
- return buffer.toString();
- }
-
- public static String rackPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<rack>");
- buffer.append("<haEnabled>false</haEnabled>");
- buffer.append("<name>Aloha</name>");
- buffer.append("<nrsq>80</nrsq>");
- buffer.append("<shortDescription>A hawaian rack</shortDescription>");
- buffer.append("<vlanIdMax>3024</vlanIdMax>");
- buffer.append("<vlanIdMin>6</vlanIdMin>");
- buffer.append("<vlanPerVdcReserved>6</vlanPerVdcReserved>");
- buffer.append("</rack>");
- return buffer.toString();
- }
-
- public static String storagePoolPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<storagePool>");
- buffer.append("<availableSizeInMb>0</availableSizeInMb>");
- buffer.append("<enabled>false</enabled>");
- buffer.append("<name>Hawaian Storage Pool</name>");
- buffer.append("<totalSizeInMb>0</totalSizeInMb>");
- buffer.append("<usedSizeInMb>0</usedSizeInMb>");
- buffer.append("</storagePool>");
- return buffer.toString();
- }
-
- public static String storageDevicePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<device>");
- buffer.append("<iscsiIp>10.10.10.10</iscsiIp>");
- buffer.append("<iscsiPort>99</iscsiPort>");
- buffer.append("<managementPort>90</managementPort>");
- buffer.append("<name>Aloha aloha</name>");
- buffer.append("</device>");
- return buffer.toString();
- }
-
- public static String machinePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<machine>");
- buffer.append("<datastores/>");
- buffer.append("<description>A hawaian machine</description>");
- buffer.append("<name>Kamehameha</name>");
- buffer.append("<cpu>3</cpu>");
- buffer.append("<cpuUsed>1</cpuUsed>");
- buffer.append("<ram>512</ram>");
- buffer.append("<ramUsed>1</ramUsed>");
- buffer.append("<virtualSwitch>192.168.1.10</virtualSwitch>");
- buffer.append("</machine>");
- return buffer.toString();
- }
-
- public static String remoteServicePostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<remoteService>");
- buffer.append("<status>0</status>");
- buffer.append("<type>NODE_COLLECTOR</type>");
- buffer.append("<uri>http://localhost:80/nodecollector</uri>");
- buffer.append("</remoteService>");
- return buffer.toString();
- }
-
- public static String datacenterPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<datacenter>");
- buffer.append(link("/admin/datacenters/1/action/checkmachinestate", "checkmachinestate"));
- buffer.append(link("/admin/datacenters/1/action/checkmachineipmistate", "checkmachineipmistate"));
- buffer.append(link("/admin/datacenters/1/action/checkremoteservice", "checkremoteservice"));
- buffer.append(link("/admin/datacenters/1/storage/devices", "devices"));
- buffer.append(link("/admin/datacenters/1/action/discovermultiple", "discovermultiple"));
- buffer.append(link("/admin/datacenters/1/action/discoversingle", "discoversingle"));
- buffer.append(link("/admin/datacenters/1", "edit"));
- buffer.append(link("/admin/datacenters/1/action/getLimits", "getLimits"));
- buffer.append(link("/admin/datacenters/1/racks", "racks"));
- buffer.append(link("/admin/datacenters/1/remoteservices", "remoteservices"));
- buffer.append(link("/admin/datacenters/1/storage/tiers", "tiers"));
- buffer.append(link("/admin/datacenters/1/network", "network"));
- buffer.append(link("/admin/datacenters/1/action/enterprises", "enterprises"));
- buffer.append(link("/admin/datacenters/1/action/hypervisor", "hypervisor"));
- buffer.append(link("/admin/datacenters/1/hypervisors", "hypervisors"));
- buffer.append("<id>1</id>");
- buffer.append("<location>Honolulu</location>");
- buffer.append("<name>DC</name>");
- buffer.append("</datacenter>");
- return buffer.toString();
- }
-
- public static String storagePoolPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<storagePool>");
- buffer.append(link("/admin/datacenters/1/storage/devices/1", "device"));
- buffer.append(link("/admin/datacenters/1/storage/devices/1/pools/tururututu", "edit"));
- buffer.append("<availableSizeInMb>0</availableSizeInMb>");
- buffer.append("<enabled>false</enabled>");
- buffer.append("<idStorage>tururututu</idStorage>");
- buffer.append("<name>Hawaian Storage Pool</name>");
- buffer.append("<totalSizeInMb>0</totalSizeInMb>");
- buffer.append("<usedSizeInMb>0</usedSizeInMb>");
- buffer.append("</storagePool>");
- return buffer.toString();
- }
-
- public static String tierPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<tier>");
- buffer.append(link("/admin/datacenters/1/storage/tiers/1", "edit"));
- buffer.append(link("/admin/datacenters/1", "datacenter"));
- buffer.append(link("/admin/datacenters/1/storage/tiers/1/pools", "pools"));
- buffer.append("<enabled>true</enabled>");
- buffer.append("<id>1</id>");
- buffer.append("<name>Tier</name>");
- buffer.append("</tier>");
- return buffer.toString();
- }
-
- public static String rackPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<rack>");
- buffer.append(link("/admin/datacenters/1", "datacenter"));
- buffer.append(link("/admin/datacenters/1/racks/1", "edit"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines", "machines"));
- buffer.append("<haEnabled>false</haEnabled>");
- buffer.append("<id>1</id>");
- buffer.append("<name>Aloha</name>");
- buffer.append("<nrsq>80</nrsq>");
- buffer.append("<shortDescription>A hawaian rack</shortDescription>");
- buffer.append("<vlanIdMax>3024</vlanIdMax>");
- buffer.append("<vlanIdMin>6</vlanIdMin>");
- buffer.append("<vlanPerVdcReserved>6</vlanPerVdcReserved>");
- buffer.append("</rack>");
- return buffer.toString();
- }
-
- public static String storageDevicePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<device>");
- buffer.append(link("/admin/datacenters/1", "datacenter"));
- buffer.append(link("/admin/datacenters/1/storage/devices/1", "edit"));
- buffer.append(link("/admin/datacenters/1/storage/devices/1/pools", "pools"));
- buffer.append("<id>1</id>");
- buffer.append("<iscsiIp>10.10.10.10</iscsiIp>");
- buffer.append("<iscsiPort>99</iscsiPort>");
- buffer.append("<managementPort>90</managementPort>");
- buffer.append("<name>Aloha aloha</name>");
- buffer.append("</device>");
- return buffer.toString();
- }
-
- public static String remoteServicePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<remoteService>");
- buffer.append(link("/admin/datacenters/1/remoteservices/nodecollector/action/check", "check"));
- buffer.append(link("/admin/datacenters/1", "datacenter"));
- buffer.append(link("/admin/datacenters/1/remoteservices/nodecollector", "edit"));
- buffer.append("<id>1</id>");
- buffer.append("<status>0</status>");
- buffer.append("<type>NODE_COLLECTOR</type>");
- buffer.append("<uri>http://localhost:80/nodecollector</uri>");
- buffer.append("</remoteService>");
- return buffer.toString();
- }
-
- public static String machinePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<machine>");
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1", "edit"));
- buffer.append(link("/admin/datacenters/1/racks/1", "rack"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/action/checkstate", "checkstate"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/action/checkipmistate", "checkipmistate"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/led", "led"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/action/ledoff", "ledoff"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/action/ledon", "ledon"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/logicserver", "logicserver"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/action/poweroff", "poweroff"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/action/poweron", "poweron"));
- buffer.append(link("/admin/datacenters/1/racks/1/machines/1/virtualmachines", "virtualmachines"));
- buffer.append("<datastores/>");
- buffer.append("<description>A hawaian machine</description>");
- buffer.append("<id>1</id>");
- buffer.append("<name>Kamehameha</name>");
- buffer.append("<cpu>5</cpu>");
- buffer.append("<cpuUsed>1</cpuUsed>");
- buffer.append("<ram>512</ram>");
- buffer.append("<ramUsed>1</ramUsed>");
- buffer.append("<virtualSwitch>192.168.1.10</virtualSwitch>");
- buffer.append("</machine>");
- return buffer.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/java/org/jclouds/abiquo/domain/NetworkResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/NetworkResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/NetworkResources.java
deleted file mode 100644
index ad564ee..0000000
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/NetworkResources.java
+++ /dev/null
@@ -1,242 +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.abiquo.domain;
-
-import static org.jclouds.abiquo.domain.DomainUtils.link;
-
-import com.abiquo.model.enumerator.NetworkType;
-import com.abiquo.model.rest.RESTLink;
-import com.abiquo.model.transport.LinksDto;
-import com.abiquo.server.core.infrastructure.network.NicDto;
-import com.abiquo.server.core.infrastructure.network.PrivateIpDto;
-import com.abiquo.server.core.infrastructure.network.PublicIpDto;
-import com.abiquo.server.core.infrastructure.network.VLANNetworkDto;
-
-/**
- * Network domain utilities.
- */
-public class NetworkResources {
- public static VLANNetworkDto vlanPost() {
- VLANNetworkDto vlan = new VLANNetworkDto();
- vlan.setAddress("192.168.1.0");
- vlan.setDefaultNetwork(true);
- vlan.setName("DefaultNetwork");
- vlan.setGateway("192.168.1.1");
- vlan.setMask(24);
-
- return vlan;
- }
-
- public static PrivateIpDto privateIpPut() {
- PrivateIpDto ip = new PrivateIpDto();
- ip.setId(1);
- ip.setName("private ip");
- ip.setMac("00:58:5A:c0:C3:01");
- RESTLink self = new RESTLink("self", "http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips/1");
- self.setTitle("privateip");
- ip.addLink(self);
- return ip;
- }
-
- public static PublicIpDto publicIpToPurchase() {
- PublicIpDto ip = new PublicIpDto();
- RESTLink self = new RESTLink("purchase", "http://localhost/api/cloud/virtualdatacenters/5/publicips/purchased/1");
- ip.addLink(self);
- return ip;
- }
-
- public static PublicIpDto publicIpToRelease() {
- PublicIpDto ip = new PublicIpDto();
- RESTLink self = new RESTLink("release", "http://localhost/api/cloud/virtualdatacenters/5/publicips/topurchase/1");
- ip.addLink(self);
- return ip;
- }
-
- public static NicDto nicPut() {
- NicDto nic = new NicDto();
- nic.setId(1);
- nic.setIp("123.123.123.123");
- nic.setMac("00:58:5A:c0:C3:01");
- nic.addLink(new RESTLink("edit",
- "http://localhost/api/cloud/virtualdatacenters/1/virtualappliances/1/virtualmachines/1/network/nics/1"));
-
- return nic;
- }
-
- public static VLANNetworkDto privateNetworkPut() {
- VLANNetworkDto vlan = new VLANNetworkDto();
- vlan.setId(1);
- vlan.setAddress("192.168.1.0");
- vlan.setDefaultNetwork(true);
- vlan.setName("DefaultNetwork");
- vlan.setGateway("192.168.1.1");
- vlan.setMask(24);
- vlan.setType(NetworkType.INTERNAL);
- vlan.addLink(new RESTLink("edit", "http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1"));
- vlan.addLink(new RESTLink("ips", "http://localhost/api/cloud/virtualdatacenters/1/privatenetworks/1/ips"));
-
- return vlan;
- }
-
- public static VLANNetworkDto publicNetworkPut() {
- VLANNetworkDto vlan = new VLANNetworkDto();
- vlan.setId(1);
- vlan.setAddress("192.168.1.0");
- vlan.setDefaultNetwork(true);
- vlan.setName("PublicNetwork");
- vlan.setGateway("192.168.1.1");
- vlan.setMask(24);
- vlan.setType(NetworkType.PUBLIC);
- vlan.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1/network/1"));
- vlan.addLink(new RESTLink("ips", "http://localhost/api/admin/datacenters/1/network/1/ips"));
-
- return vlan;
- }
-
- public static VLANNetworkDto externalNetworkPut() {
- VLANNetworkDto vlan = new VLANNetworkDto();
- vlan.setId(1);
- vlan.setAddress("192.168.1.0");
- vlan.setDefaultNetwork(true);
- vlan.setName("ExternalNetwork");
- vlan.setGateway("192.168.1.1");
- vlan.setMask(24);
- vlan.setType(NetworkType.EXTERNAL);
- vlan.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1/network/1"));
- vlan.addLink(new RESTLink("enterprise", "http://localhost/api/admin/enterprises/1"));
- vlan.addLink(new RESTLink("ips", "http://localhost/api/admin/enterprises/1/limits/1/externalnetworks/1/ips"));
-
- return vlan;
- }
-
- public static VLANNetworkDto unmanagedNetworkPut() {
- VLANNetworkDto vlan = new VLANNetworkDto();
- vlan.setId(1);
- vlan.setAddress("192.168.1.0");
- vlan.setDefaultNetwork(true);
- vlan.setName("UnmanagedNetwork");
- vlan.setGateway("192.168.1.1");
- vlan.setMask(24);
- vlan.setType(NetworkType.UNMANAGED);
- vlan.addLink(new RESTLink("edit", "http://localhost/api/admin/datacenters/1/network/1"));
- vlan.addLink(new RESTLink("enterprise", "http://localhost/api/admin/enterprises/1"));
- vlan.addLink(new RESTLink("ips", "http://localhost/api/admin/enterprises/1/limits/1/externalnetworks/1/ips"));
-
- return vlan;
- }
-
- public static String vlanNetworkPostPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<network>");
- buffer.append("<address>192.168.1.0</address>");
- buffer.append("<defaultNetwork>true</defaultNetwork>");
- buffer.append("<gateway>192.168.1.1</gateway>");
- buffer.append("<mask>24</mask>");
- buffer.append("<name>DefaultNetwork</name>");
- buffer.append("</network>");
- return buffer.toString();
- }
-
- public static String privateNetworkPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<network>");
- buffer.append(link("/cloud/virtualdatacenters/1/privatenetworks/1", "edit"));
- buffer.append(link("/cloud/virtualdatacenters/1/privatenetworks/1/ips", "ips"));
- buffer.append("<address>192.168.1.0</address>");
- buffer.append("<defaultNetwork>true</defaultNetwork>");
- buffer.append("<gateway>192.168.1.1</gateway>");
- buffer.append("<id>1</id>");
- buffer.append("<mask>24</mask>");
- buffer.append("<name>DefaultNetwork</name>");
- buffer.append("<type>INTERNAL</type>");
- buffer.append("</network>");
- return buffer.toString();
- }
-
- public static String publicNetworkPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<network>");
- buffer.append(link("/admin/datacenters/1/network/1", "edit"));
- buffer.append(link("/admin/datacenters/1/network/1/ips", "ips"));
- buffer.append("<address>192.168.1.0</address>");
- buffer.append("<defaultNetwork>true</defaultNetwork>");
- buffer.append("<gateway>192.168.1.1</gateway>");
- buffer.append("<id>1</id>");
- buffer.append("<mask>24</mask>");
- buffer.append("<name>PublicNetwork</name>");
- buffer.append("<type>PUBLIC</type>");
- buffer.append("</network>");
- return buffer.toString();
- }
-
- public static String externalNetworkPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<network>");
- buffer.append(link("/admin/datacenters/1/network/1", "edit"));
- buffer.append(link("/admin/enterprises/1", "enterprise"));
- buffer.append(link("/admin/enterprises/1/limits/1/externalnetworks/1/ips", "ips"));
- buffer.append("<address>192.168.1.0</address>");
- buffer.append("<defaultNetwork>true</defaultNetwork>");
- buffer.append("<gateway>192.168.1.1</gateway>");
- buffer.append("<id>1</id>");
- buffer.append("<mask>24</mask>");
- buffer.append("<name>ExternalNetwork</name>");
- buffer.append("<type>EXTERNAL</type>");
- buffer.append("</network>");
- return buffer.toString();
- }
-
- public static String unmanagedNetworkPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<network>");
- buffer.append(link("/admin/datacenters/1/network/1", "edit"));
- buffer.append(link("/admin/enterprises/1", "enterprise"));
- buffer.append(link("/admin/enterprises/1/limits/1/externalnetworks/1/ips", "ips"));
- buffer.append("<address>192.168.1.0</address>");
- buffer.append("<defaultNetwork>true</defaultNetwork>");
- buffer.append("<gateway>192.168.1.1</gateway>");
- buffer.append("<id>1</id>");
- buffer.append("<mask>24</mask>");
- buffer.append("<name>UnmanagedNetwork</name>");
- buffer.append("<type>UNMANAGED</type>");
- buffer.append("</network>");
- return buffer.toString();
- }
-
- public static String privateIpPutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<ipPoolManagement>");
- buffer.append(link("/cloud/virtualdatacenters/1/privatenetworks/1/ips/1", "self", "privateip"));
- buffer.append("<available>false</available>");
- buffer.append("<id>1</id>");
- buffer.append("<mac>00:58:5A:c0:C3:01</mac>");
- buffer.append("<name>private ip</name>");
- buffer.append("<quarantine>false</quarantine>");
- buffer.append("</ipPoolManagement>");
- return buffer.toString();
- }
-
- public static String linksDtoPayload(final LinksDto dto) {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<links>");
- for (RESTLink link : dto.getLinks()) {
- buffer.append(link(link));
- }
- buffer.append("</links>");
- return buffer.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1b689dc1/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java
----------------------------------------------------------------------
diff --git a/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java b/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java
deleted file mode 100644
index 36a51f3..0000000
--- a/abiquo/src/test/java/org/jclouds/abiquo/domain/TemplateResources.java
+++ /dev/null
@@ -1,169 +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.abiquo.domain;
-
-import static org.jclouds.abiquo.domain.DomainUtils.link;
-
-import com.abiquo.model.enumerator.ConversionState;
-import com.abiquo.model.enumerator.DiskFormatType;
-import com.abiquo.model.enumerator.OSType;
-import com.abiquo.model.enumerator.VMTemplateState;
-import com.abiquo.model.rest.RESTLink;
-import com.abiquo.server.core.appslibrary.ConversionDto;
-import com.abiquo.server.core.appslibrary.DatacenterRepositoryDto;
-import com.abiquo.server.core.appslibrary.VirtualMachineTemplateDto;
-import com.abiquo.server.core.appslibrary.VirtualMachineTemplatePersistentDto;
-
-/**
- * VM template domain utilities.
- */
-public class TemplateResources {
- public static DatacenterRepositoryDto datacenterRepositoryPut() {
- DatacenterRepositoryDto dcRepository = new DatacenterRepositoryDto();
- dcRepository.setName("Datacenter Repo");
- dcRepository.setRepositoryCapacityMb(0);
- dcRepository.setRepositoryLocation("10.60.1.104:/volume1/nfs-devel");
- dcRepository.setRepositoryRemainingMb(0);
- dcRepository.addLink(new RESTLink("applianceManagerRepositoryUri", "http://localhost/am/erepos/1"));
- dcRepository.addLink(new RESTLink("datacenter", "http://localhost/api/admin/datacenters/1"));
- dcRepository.addLink(new RESTLink("edit", "http://localhost/api/admin/enterprises/1/datacenterrepositories/1"));
- dcRepository.addLink(new RESTLink("enterprise", "http://localhost/api/admin/enterprises/1"));
- dcRepository.addLink(new RESTLink("refresh",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories/1/actions/refresh"));
- dcRepository.addLink(new RESTLink("virtualmachinetemplates",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates"));
-
- return dcRepository;
- }
-
- public static VirtualMachineTemplateDto virtualMachineTemplatePut() {
- VirtualMachineTemplateDto template = new VirtualMachineTemplateDto();
- template.setName("Template");
- template.setId(1);
- template.setDescription("Description");
- template.addLink(new RESTLink("edit",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1"));
- template.addLink(new RESTLink("enterprise", "http://localhost/api/admin/enterprises/1"));
- template.addLink(new RESTLink("conversions", "http://localhost/api/admin/enterprises/1"
- + "/datacenterrepositories/1/virtualmachinetemplates/1/conversions"));
- template.addLink(new RESTLink("tasks", "http://localhost/api/admin/enterprises/1"
- + "/datacenterrepositories/1/virtualmachinetemplates/1/tasks"));
- template.addLink(new RESTLink("diskfile", "http://somewhere.com/file.vmdk"));
- template.setDiskFormatType("RAW");
- template.setOsType(OSType.MACOS);
- template.setLoginUser("myuser");
- template.setLoginPassword("mypass");
- template.setState(VMTemplateState.DONE);
- template.setCpuRequired(1);
- template.setRamRequired(1);
- template.setHdRequired(20l);
- template.setDiskFileSize(30l);
-
- template.setCostCode(0);
- return template;
- }
-
- public static String virtualMachineTemplatePutPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualMachineTemplate>");
- buffer.append(link("/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1", "edit"));
- buffer.append(link("/admin/enterprises/1", "enterprise"));
- buffer.append(link("/admin/enterprises/1" + "/datacenterrepositories/1/virtualmachinetemplates/1/conversions",
- "conversions"));
-
- buffer.append(link("/admin/enterprises/1" + "/datacenterrepositories/1/virtualmachinetemplates/1/tasks", "tasks"));
- buffer.append(link(new RESTLink("diskfile", "http://somewhere.com/file.vmdk")));
- buffer.append("<id>1</id>");
- buffer.append("<name>Template</name>");
- buffer.append("<description>Description</description>");
- buffer.append("<diskFormatType>RAW</diskFormatType>");
- buffer.append("<osType>MACOS</osType>");
- buffer.append("<loginUser>myuser</loginUser>");
- buffer.append("<loginPassword>mypass</loginPassword>");
- buffer.append("<state>DONE</state>");
-
- buffer.append("<diskFileSize>30</diskFileSize>");
- buffer.append("<cpuRequired>1</cpuRequired>");
- buffer.append("<ramRequired>1</ramRequired>");
- buffer.append("<hdRequired>20</hdRequired>");
- buffer.append("<shared>false</shared>");
- buffer.append("<costCode>0</costCode>");
- buffer.append("<chefEnabled>false</chefEnabled>");
- buffer.append("</virtualMachineTemplate>");
- return buffer.toString();
- }
-
- public static VirtualMachineTemplatePersistentDto persistentData() {
- VirtualMachineTemplatePersistentDto dto = new VirtualMachineTemplatePersistentDto();
- dto.setPersistentTemplateName("New persistent template name");
- dto.setPersistentVolumeName("New persistent volume name");
- dto.addLink(new RESTLink("tier", "http://localhost/api/cloud/virtualdatacenters/1/tiers/1"));
- dto.addLink(new RESTLink("virtualdatacenter", "http://localhost/api/cloud/virtualdatacenters/1"));
- dto.addLink(new RESTLink("virtualmachinetemplate",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1"));
- return dto;
- }
-
- public static String persistentPayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<virtualmachinetemplatepersistent>");
- buffer.append(link("/cloud/virtualdatacenters/1/tiers/1", "tier"));
- buffer.append(link("/cloud/virtualdatacenters/1", "virtualdatacenter"));
- buffer.append(link("/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1",
- "virtualmachinetemplate"));
- buffer.append("<persistentTemplateName>New persistent template name</persistentTemplateName>");
- buffer.append("<persistentVolumeName>New persistent volume name</persistentVolumeName>");
- buffer.append("</virtualmachinetemplatepersistent>");
- return buffer.toString();
- }
-
- public static ConversionDto conversionPut() {
- ConversionDto conversion = new ConversionDto();
- conversion.setState(ConversionState.ENQUEUED);
- conversion.setSourceFormat(DiskFormatType.VMDK_STREAM_OPTIMIZED);
- conversion.setSourcePath("source/path.vmkd");
- conversion.setTargetFormat(DiskFormatType.RAW);
- conversion.setTargetPath("target/path.raw");
- conversion.setTargetSizeInBytes(1000000l);
- conversion
- .addLink(new RESTLink("edit",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1/conversions/RAW"));
- conversion
- .addLink(new RESTLink("tasks",
- "http://localhost/api/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1/conversions/RAW/tasks"));
-
- return conversion;
- }
-
- public static String conversionPutPlayload() {
- StringBuilder buffer = new StringBuilder();
- buffer.append("<conversion>");
- buffer.append(link("/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1/conversions/RAW",
- "edit"));
- buffer.append(link(
- "/admin/enterprises/1/datacenterrepositories/1/virtualmachinetemplates/1/conversions/RAW/tasks", "tasks"));
-
- buffer.append("<state>ENQUEUED</state>");
- buffer.append("<sourceFormat>VMDK_STREAM_OPTIMIZED</sourceFormat>");
- buffer.append("<sourcePath>source/path.vmkd</sourcePath>");
- buffer.append("<targetFormat>RAW</targetFormat>");
- buffer.append("<targetPath>target/path.raw</targetPath>");
- buffer.append("<targetSizeInBytes>1000000</targetSizeInBytes>");
- buffer.append("</conversion>");
- return buffer.toString();
- }
-}