deleteVAppTemplateMetadataValue(@EndpointParam URI templateURI,
- @PathParam("key") String key);
-
/**
* @see VAppTemplateClient#getVAppTemplateNetworkConfigSection(URI)
*/
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java
index 68bb19dd3d..7e6d72949d 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java
@@ -26,7 +26,6 @@ import org.jclouds.rest.annotations.Delegate;
import org.jclouds.vcloud.director.v1_5.domain.CustomizationSection;
import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection;
import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection;
import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection;
import org.jclouds.vcloud.director.v1_5.domain.Owner;
@@ -39,7 +38,7 @@ import org.jclouds.vcloud.director.v1_5.domain.ovf.Envelope;
import org.jclouds.vcloud.director.v1_5.domain.ovf.NetworkSection;
/**
- * Provides synchronous access to {@link org.jclouds.vcloud.director.v1_5.domain.VAppTemplate} objects.
+ * Provides synchronous access to {@link VAppTemplate} objects.
*
* @author Adam Lowe
* @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncClient
@@ -49,15 +48,24 @@ public interface VAppTemplateClient {
/**
* Retrieves a vApp template (can be used also to retrieve a VM from a vApp Template).
- * The vApp could be in one of these statues: FAILED_CREATION(-1) - Transient entity state,
- * e.g., model object is created but the corresponding VC backing does not exist yet. This
- * is further sub-categorized in the respective entities. UNRESOLVED(0) - Entity is whole,
- * e.g., VM creation is complete and all the required model objects and VC backings are created.
- * RESOLVED(1) - Entity is resolved. UNKNOWN(6) - Entity state could not be retrieved from
- * the inventory, e.g., VM power state is null. POWERED_OFF(8) - All VMs of the vApp template
- * are powered off. MIXED(10) - vApp template status is set to MIXED when the VMs in the
- * vApp are in different power states.
*
+ * The vApp could be in one of these statues:
+ *
+ * - {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#FAILED_CREATION} -
+ * Transient entity state, e.g., model object is created but the corresponding VC backing
+ * does not exist yet. This is further sub-categorized in the respective entities.
+ *
- {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED} -
+ * Entity is whole, e.g., VM creation is complete and all the required model objects and VC backings are created.
+ *
- {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#RESOLVED} -
+ * Entity is resolved.
+ *
- {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNKNOWN} -
+ * Entity state could not be retrieved from the inventory, e.g., VM power state is null.
+ *
- {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#POWERED_OFF} -
+ * All VMs of the vApp template
+ * are powered off.
+ *
- {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#MIXED} -
+ * vApp template status is set to MIXED when the VMs in the vApp are in different power states.
+ *
*
* GET /vAppTemplate/{id}
*
@@ -236,17 +244,7 @@ public interface VAppTemplateClient {
NetworkConfigSection getVAppTemplateNetworkConfigSection(URI templateUri);
/**
- * Modifies the network config section of a vApp. There are three general types of vApp
- * networks which could be configured from this section. They are specified by the element
- * value in /. isolated - this is a vApp network which is not connected to any external
- * organization network and is used only to connect VMs internally in a vApp. In this
- * network you could configure only its element of /. bridged - this is a vApp network
- * which is directly connected to an external organization network. In this network you
- * should configure only the element of /. In this case the element is inherit from the
- * parent network. natRouted - this is a vApp network which is NAT routed to an external
- * organization network. In this network you could configure the and also you should
- * specify and the element of /. When the network is NAT routed you could specify DHCP,
- * firewall rules and NAT rules, for fine-grained configuration of your network.
+ * Modifies the network config section of a vApp.
*
*
* PUT /vAppTemplate/{id}/networkConfigSection
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java
index 0fb42dc06b..7883701d11 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java
@@ -41,7 +41,6 @@ import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams;
import org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams;
import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppParamsType;
import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
import org.jclouds.vcloud.director.v1_5.domain.UploadVAppTemplateParams;
import org.jclouds.vcloud.director.v1_5.domain.VApp;
import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java
index 1370411731..787e0b06e2 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java
@@ -54,8 +54,11 @@ public interface VdcClient {
Vdc getVdc(URI vdcUri);
/**
- * Captures a vApp into vApp template.
- * The status of vApp template will be in UNRESOLVED(0) until the capture task is finished.
+ * Captures a vApp into vApp template.
+ *
+ * The status of vApp template will be in
+ * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)}
+ * until the capture task is finished.
*
* @return a VApp resource which will contain a task.
* The user should should wait for this task to finish to be able to use the vApp.
@@ -64,7 +67,9 @@ public interface VdcClient {
/**
* Clones a media into new one.
- * The status of the returned media is UNRESOLVED(0) until the task for cloning finish.
+ * The status of the returned media is
+ * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)}
+ * until the task for cloning finish.
*
* @return a Media resource which will contain a task.
* The user should monitor the contained task status in order to check when it is completed.
@@ -80,8 +85,11 @@ public interface VdcClient {
VApp cloneVApp(URI vdcUri, CloneVAppParams params);
/**
- * Clones a vApp template into new one.
- * The status of vApp template will be in UNRESOLVED(0) until the clone task is finished.
+ * Clones a vApp template into new one.
+ *
+ * The status of vApp template will be in
+ * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)}
+ * until the clone task is finished.
*
* @return a VAppTemplate resource which will contain a task.
* The user should should wait for this task to finish to be able to use the VAppTemplate.
@@ -89,23 +97,32 @@ public interface VdcClient {
VAppTemplate cloneVAppTemplate(URI vdcUri, CloneVAppTemplateParams params);
/**
- * Composes a new vApp using VMs from other vApps or vApp templates. The vCloud API supports
- * composing a vApp from any combination of vApp templates, vApps, or virtual machines.
- * When you compose a vApp, all children of each composition source become peers in the
- * Children collection of the composed vApp. To compose a vApp, a client makes a compose
- * vApp request whose body is a ComposeVAppParams element, includes the following information:
- * - An InstantiationParams element that applies to the composed vApp itself and any vApp
- * templates referenced in Item elements. - A SourcedItem element for each virtual machine,
- * vApp, or vAppTemplate to include in the composition. Each SourcedItem can contain the
- * following elements: - A required Source element whose href attribute value is a reference
- * to a vApp template, vApp, or VM to include in the composition. If the Source element
- * references a VM, the Item must also include an InstantiationParams element specific to
- * that VM. - An optional NetworkAssignment element that specifies how the network connections
- * of child VM elements are mapped to vApp networks in the parent. - If any of the composition
- * items is subject to a EULA, the ComposeVAppParams element must include an AllEULAsAccepted
- * element that has a value of true, indicating that you accept the EULA. Otherwise, composition
- * fails. The composed vApp must be deployed and powered on before it can be used. The status
- * of vApp will be UNRESOLVED(0) until the compose task is finished.
+ * Composes a new vApp using VMs from other vApps or vApp templates.
+ *
+ * The vCloud API supports composing a vApp from any combination of vApp templates, vApps,
+ * or virtual machines. When you compose a vApp, all children of each composition source
+ * become peers in the Children collection of the composed vApp. To compose a vApp, a client
+ * makes a compose vApp request whose body is a ComposeVAppParams element, includes the
+ * following information:
+ *
+ * - An InstantiationParams element that applies to the composed vApp itself and any vApp
+ * templates referenced in Item elements.
+ *
- A SourcedItem element for each virtual machine, vApp, or vAppTemplate to include in
+ * the composition. Each SourcedItem can contain the following elements:
+ *
+ * - A required Source element whose href attribute value is a reference
+ * to a vApp template, vApp, or VM to include in the composition. If the Source element
+ * references a VM, the Item must also include an InstantiationParams element specific to
+ * that VM.
+ *
- An optional NetworkAssignment element that specifies how the network connections
+ * of child VM elements are mapped to vApp networks in the parent.
+ *
+ * - If any of the composition items is subject to a EULA, the ComposeVAppParams element
+ * must include an AllEULAsAccepted element that has a value of true, indicating that you
+ * accept the EULA. Otherwise, composition fails. The composed vApp must be deployed and
+ * powered on before it can be used. The status of vApp will be
+ * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)}
+ * until the compose task is finished.
*
* @return a VApp resource which will contain a task.
* The user should should wait for this task to finish to be able to use the vApp.
@@ -114,7 +131,10 @@ public interface VdcClient {
/**
* Instantiate a vApp template into a new vApp.
- * The status of vApp will be in UNRESOLVED(0) until the instantiate task is finished.
+ *
+ * The status of vApp will be in
+ * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED UNRESOLVED(0)}
+ * until the instantiate task is finished.
*
*
* POST /vdc/{id}/action/instantiateVAppTemplate
@@ -126,13 +146,17 @@ public interface VdcClient {
VApp instantiateVApp(URI vdcUri, InstantiateVAppParamsType params);
/**
- * Uploading vApp template to a vDC. The operation is separate on several steps:
- * 1. creating empty vApp template entity
- * 2. uploading an OVF of vApp template
- * 3. uploading disks described from the OVF
- * 4. finishing task for uploading
- * The status of vApp template will be NOT_READY(0) until the ovf and all disks are uploaded
- * to the transfer site. After this a task will run on the vApp template uploading.
+ * Uploading vApp template to a vDC.
+ *
+ * The operation is separate on several steps:
+ *
+ * - creating empty vApp template entity
+ *
- uploading an OVF of vApp template
+ *
- uploading disks described from the OVF
+ *
- finishing task for uploading
+ *
+ * The status of vApp template will be {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#NOT_READY NOT_READY(0)}
+ * until the ovf and all disks are uploaded to the transfer site. After this a task will run on the vApp template uploading.
*
* Note that the empty vApp template's getFiles() returns a file of size -1 after step one above,
* because the descriptor.ovf does not yet exist.
diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java
index 3ce56c12fc..d14f1c6a9c 100644
--- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java
+++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminCatalogClientExpectTest.java
@@ -46,7 +46,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx
private Reference orgRef = Reference.builder()
.type("application/vnd.vmware.vcloud.catalog+xml")
.name("QunyingTestCatalog")
- .href(URI.create(endpoint + "/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
+ .href(URI.create(endpoint + "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
.build();
private Reference catalogRef = Reference.builder()
@@ -59,7 +59,7 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx
public void testCreateCatalog() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/admin/org/???/catalogs")
+ .apiCommand("POST", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/catalogs")
.xmlFilePayload("/catalog/admin/createCatalogSource.xml", VCloudDirectorMediaType.ADMIN_CATALOG)
.acceptMedia(VCloudDirectorMediaType.ADMIN_CATALOG)
.httpRequestBuilder().build(),
@@ -70,16 +70,10 @@ public class AdminCatalogClientExpectTest extends BaseVCloudDirectorRestClientEx
AdminCatalog source = createCatalogSource();
AdminCatalog expected = createCatalog();
- assertEquals(client.getAdminCatalogClient().createCatalog(catalogRef.getHref(), source), expected);
+ assertEquals(client.getAdminCatalogClient().createCatalog(orgRef.getHref(), source), expected);
}
- // FIXME temporarily disabling this test due to JAXB error:
- // javax.xml.bind.UnmarshalException: unexpected element (uri:"http://www.vmware.com/vcloud/v1.5", local:"AdminCatalog").
- // Expected elements are <{http://www.vmware.com/vcloud/v1.5}Catalog>,<{http://www.vmware.com/vcloud/v1.5}CatalogItems>,
- // <{http://www.vmware.com/vcloud/v1.5}CatalogReference>,<{http://www.vmware.com/vcloud/v1.5}Error>,
- // <{http://www.vmware.com/vcloud/v1.5}Link>,<{http://www.vmware.com/vcloud/v1.5}Owner>,
- // <{http://www.vmware.com/vcloud/v1.5}Task>
- @Test(enabled = false)
+ @Test
public void testGetCatalog() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer()