You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/17 17:19:18 UTC

[02/19] jclouds git commit: JCLOUDS-780 Remove vcloud.

http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/versions-vcd15.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/versions-vcd15.xml b/apis/vcloud/src/test/resources/versions-vcd15.xml
deleted file mode 100644
index ed24d3a..0000000
--- a/apis/vcloud/src/test/resources/versions-vcd15.xml
+++ /dev/null
@@ -1,906 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SupportedVersions xmlns="http://www.vmware.com/vcloud/versions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/versions https://zone.myvcloud.com/api/versions/schema/versions.xsd">
-    <VersionInfo>
-        <Version>1.0</Version>
-        <LoginUrl>https://zone.myvcloud.com/api/v1.0/login</LoginUrl>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.customizationSection+xml</MediaType>
-            <ComplexTypeName>CustomizationSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.catalogItem+xml</MediaType>
-            <ComplexTypeName>CatalogItemType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.networkConnectionSection+xml</MediaType>
-            <ComplexTypeName>NetworkConnectionSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.owner+xml</MediaType>
-            <ComplexTypeName>OwnerType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.licensingReportList+xml</MediaType>
-            <ComplexTypeName>LicensingReportListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.group+xml</MediaType>
-            <ComplexTypeName>GroupType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vdc+xml</MediaType>
-            <ComplexTypeName>AdminVdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.licensingReport+xml</MediaType>
-            <ComplexTypeName>LicensingReportType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importVmAsVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>ImportVmAsVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwVimServerReferences+xml</MediaType>
-            <ComplexTypeName>VMWVimServerReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vm+xml</MediaType>
-            <ComplexTypeName>VmType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.uploadVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>UploadVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.composeVAppParams+xml</MediaType>
-            <ComplexTypeName>ComposeVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.orgList+xml</MediaType>
-            <ComplexTypeName>OrgListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.cloneMediaParams+xml</MediaType>
-            <ComplexTypeName>CloneMediaParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vmPendingQuestion+xml</MediaType>
-            <ComplexTypeName>VmPendingQuestionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwHostReferences+xml</MediaType>
-            <ComplexTypeName>VMWHostReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.undeployVAppParams+xml</MediaType>
-            <ComplexTypeName>UndeployVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.leaseSettingsSection+xml</MediaType>
-            <ComplexTypeName>LeaseSettingsSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.network+xml</MediaType>
-            <ComplexTypeName>OrgNetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.deployVAppParams+xml</MediaType>
-            <ComplexTypeName>DeployVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.cloneVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>CloneVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.media+xml</MediaType>
-            <ComplexTypeName>MediaType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwprovidervdc+xml</MediaType>
-            <ComplexTypeName>VMWProviderVdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vAppTemplate+xml</MediaType>
-            <ComplexTypeName>VAppTemplateType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.org+xml</MediaType>
-            <ComplexTypeName>OrgType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vApp+xml</MediaType>
-            <ComplexTypeName>VAppType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.catalog+xml</MediaType>
-            <ComplexTypeName>CatalogType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwNetworkPool+xml</MediaType>
-            <ComplexTypeName>VMWNetworkPoolType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.tasksList+xml</MediaType>
-            <ComplexTypeName>TasksListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vdcReferences+xml</MediaType>
-            <ComplexTypeName>VdcReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.screenTicket+xml</MediaType>
-            <ComplexTypeName>ScreenTicketType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.prepareHostParams+xml</MediaType>
-            <ComplexTypeName>PrepareHostParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vcloud+xml</MediaType>
-            <ComplexTypeName>VCloudType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.publishCatalogParams+xml</MediaType>
-            <ComplexTypeName>PublishCatalogParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.networkConfigSection+xml</MediaType>
-            <ComplexTypeName>NetworkConfigSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.resourcePoolList+xml</MediaType>
-            <ComplexTypeName>ResourcePoolListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.right+xml</MediaType>
-            <ComplexTypeName>RightType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwExtension+xml</MediaType>
-            <ComplexTypeName>VMWExtensionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importVmAsVAppParams+xml</MediaType>
-            <ComplexTypeName>ImportVmAsVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwvirtualcenter+xml</MediaType>
-            <ComplexTypeName>VimServerType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmsObjectRefsList+xml</MediaType>
-            <ComplexTypeName>VmObjectRefsListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.controlAccess+xml</MediaType>
-            <ComplexTypeName>ControlAccessParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vdc+xml</MediaType>
-            <ComplexTypeName>VdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.role+xml</MediaType>
-            <ComplexTypeName>RoleType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.cloneVAppParams+xml</MediaType>
-            <ComplexTypeName>CloneVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.host+xml</MediaType>
-            <ComplexTypeName>HostType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.organization+xml</MediaType>
-            <ComplexTypeName>AdminOrgType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.providervdc+xml</MediaType>
-            <ComplexTypeName>ProviderVdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.user+xml</MediaType>
-            <ComplexTypeName>UserType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwProviderVdcReferences+xml</MediaType>
-            <ComplexTypeName>VMWProviderVdcReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml</MediaType>
-            <ComplexTypeName>MediaInsertOrEjectParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>InstantiateVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.rasdItemsList+xml</MediaType>
-            <ComplexTypeName>RasdItemsListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.task+xml</MediaType>
-            <ComplexTypeName>TaskType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwNetworkPoolReferences+xml</MediaType>
-            <ComplexTypeName>VMWNetworkPoolReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.guestCustomizationSection+xml</MediaType>
-            <ComplexTypeName>GuestCustomizationSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.recomposeVAppParams+xml</MediaType>
-            <ComplexTypeName>RecomposeVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importMediaParams+xml</MediaType>
-            <ComplexTypeName>ImportMediaParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwExternalNetworkReferences+xml</MediaType>
-            <ComplexTypeName>VMWExternalNetworkReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwexternalnet+xml</MediaType>
-            <ComplexTypeName>VMWExternalNetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.captureVAppParams+xml</MediaType>
-            <ComplexTypeName>CaptureVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vmPendingAnswer+xml</MediaType>
-            <ComplexTypeName>VmQuestionAnswerType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.registerVimServerParams+xml</MediaType>
-            <ComplexTypeName>RegisterVimServerParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.rasdItem+xml</MediaType>
-            <ComplexTypeName>RASD_Type</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.0/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.startupSection+xml</MediaType>
-            <ComplexTypeName>StartupSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.virtualHardwareSection+xml</MediaType>
-            <ComplexTypeName>VirtualHardwareSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.operatingSystemSection+xml</MediaType>
-            <ComplexTypeName>OperatingSystemSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.networkSection+xml</MediaType>
-            <ComplexTypeName>NetworkSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-    </VersionInfo>
-    <VersionInfo>
-        <Version>1.5</Version>
-        <LoginUrl>https://zone.myvcloud.com/api/sessions</LoginUrl>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>InstantiateVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwProviderVdcReferences+xml</MediaType>
-            <ComplexTypeName>VMWProviderVdcReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.customizationSection+xml</MediaType>
-            <ComplexTypeName>CustomizationSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.prepareHostParams+xml</MediaType>
-            <ComplexTypeName>PrepareHostParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.relocateVmParams+xml</MediaType>
-            <ComplexTypeName>RelocateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.org+xml</MediaType>
-            <ComplexTypeName>OrgType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwExternalNetworkReferences+xml</MediaType>
-            <ComplexTypeName>VMWExternalNetworkReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.networkConnectionSection+xml</MediaType>
-            <ComplexTypeName>NetworkConnectionSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.host+xml</MediaType>
-            <ComplexTypeName>HostType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.catalogItem+xml</MediaType>
-            <ComplexTypeName>CatalogItemType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.owner+xml</MediaType>
-            <ComplexTypeName>OwnerType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vdc+xml</MediaType>
-            <ComplexTypeName>VdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vdc+xml</MediaType>
-            <ComplexTypeName>AdminVdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.catalog+xml</MediaType>
-            <ComplexTypeName>AdminCatalogType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.recomposeVAppParams+xml</MediaType>
-            <ComplexTypeName>RecomposeVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importVmIntoExistingVAppParams+xml</MediaType>
-            <ComplexTypeName>ImportVmIntoExistingVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.taskExtensionRequestUpdateProgressOperationParams+xml</MediaType>
-            <ComplexTypeName>TaskExtensionRequestUpdateProgressParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.catalog+xml</MediaType>
-            <ComplexTypeName>CatalogType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.cloneVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>CloneVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.providervdc+xml</MediaType>
-            <ComplexTypeName>ProviderVdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmsObjectRefsList+xml</MediaType>
-            <ComplexTypeName>VmObjectRefsListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.undeployVAppParams+xml</MediaType>
-            <ComplexTypeName>UndeployVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vdcReferences+xml</MediaType>
-            <ComplexTypeName>VdcReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.systemPasswordPolicySettings+xml</MediaType>
-            <ComplexTypeName>SystemPasswordPolicySettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vApp+xml</MediaType>
-            <ComplexTypeName>VAppType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.taskExtensionRequest+xml</MediaType>
-            <ComplexTypeName>TaskExtensionRequestType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vimServerNetworks+xml</MediaType>
-            <ComplexTypeName>VimObjectRefListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwprovidervdc+xml</MediaType>
-            <ComplexTypeName>VMWProviderVdcType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.orgSettings+xml</MediaType>
-            <ComplexTypeName>OrgSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.captureVAppParams+xml</MediaType>
-            <ComplexTypeName>CaptureVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.screenTicket+xml</MediaType>
-            <ComplexTypeName>ScreenTicketType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.runtimeInfoSection+xml</MediaType>
-            <ComplexTypeName>RuntimeInfoSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.tasksList+xml</MediaType>
-            <ComplexTypeName>TasksListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.amqpSettingsTest+xml</MediaType>
-            <ComplexTypeName>AmqpSettingsTestType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.extensionSettings+xml</MediaType>
-            <ComplexTypeName>TaskExtensionSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importVmAsVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>ImportVmAsVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.organizationGeneralSettings+xml</MediaType>
-            <ComplexTypeName>OrgGeneralSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.registerVimServerParams+xml</MediaType>
-            <ComplexTypeName>RegisterVimServerParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.network+xml</MediaType>
-            <ComplexTypeName>OrgNetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.uploadVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>UploadVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.datastore+xml</MediaType>
-            <ComplexTypeName>DatastoreType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.metadata+xml</MediaType>
-            <ComplexTypeName>MetadataType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.licensingReportList+xml</MediaType>
-            <ComplexTypeName>LicensingReportListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwNetworkPool+xml</MediaType>
-            <ComplexTypeName>VMWNetworkPoolType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.systemSettings+xml</MediaType>
-            <ComplexTypeName>SystemSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwHostReferences+xml</MediaType>
-            <ComplexTypeName>VMWHostReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.taskExtensionRequestOperationParams+xml</MediaType>
-            <ComplexTypeName>TaskExtensionRequestOperationParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.metadata.value+xml</MediaType>
-            <ComplexTypeName>MetadataValueType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.taskOperationList+xml</MediaType>
-            <ComplexTypeName>TaskOperationListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.media+xml</MediaType>
-            <ComplexTypeName>MediaType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.productSections+xml</MediaType>
-            <ComplexTypeName>ProductSectionListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.amqpSettings+xml</MediaType>
-            <ComplexTypeName>AmqpSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vAppTemplate+xml</MediaType>
-            <ComplexTypeName>VAppTemplateType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.deployVAppParams+xml</MediaType>
-            <ComplexTypeName>DeployVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importVmIntoExistingVAppTemplateParams+xml</MediaType>
-            <ComplexTypeName>ImportVmIntoExistingVAppTemplateParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.resourcePoolList+xml</MediaType>
-            <ComplexTypeName>ResourcePoolListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.networkConfigSection+xml</MediaType>
-            <ComplexTypeName>NetworkConfigSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.OrganizationVdcResourcePoolSet+xml</MediaType>
-            <ComplexTypeName>OrganizationResourcePoolSetType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.organizationPasswordPolicySettings+xml</MediaType>
-            <ComplexTypeName>OrgPasswordPolicySettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.publishCatalogParams+xml</MediaType>
-            <ComplexTypeName>PublishCatalogParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwExtension+xml</MediaType>
-            <ComplexTypeName>VMWExtensionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml</MediaType>
-            <ComplexTypeName>MediaInsertOrEjectParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vmPendingQuestion+xml</MediaType>
-            <ComplexTypeName>VmPendingQuestionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.notificationsSettings+xml</MediaType>
-            <ComplexTypeName>NotificationsSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.ldapUserSettings+xml</MediaType>
-            <ComplexTypeName>LdapUserAttributesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.right+xml</MediaType>
-            <ComplexTypeName>RightType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.ldapSettings+xml</MediaType>
-            <ComplexTypeName>LdapSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.organization+xml</MediaType>
-            <ComplexTypeName>AdminOrgType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.orgList+xml</MediaType>
-            <ComplexTypeName>OrgListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml</MediaType>
-            <ComplexTypeName>OrgVAppTemplateLeaseSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwVimServerReferences+xml</MediaType>
-            <ComplexTypeName>VMWVimServerReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwexternalnet+xml</MediaType>
-            <ComplexTypeName>VMWExternalNetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.entity+xml</MediaType>
-            <ComplexTypeName>EntityType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.cloneMediaParams+xml</MediaType>
-            <ComplexTypeName>CloneMediaParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.licensingReport+xml</MediaType>
-            <ComplexTypeName>LicensingReportType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importMediaParams+xml</MediaType>
-            <ComplexTypeName>ImportMediaParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.resourcePoolSetUpdateParams+xml</MediaType>
-            <ComplexTypeName>UpdateResourcePoolSetParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.taskExtensionRequestList+xml</MediaType>
-            <ComplexTypeName>ReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vmPendingAnswer+xml</MediaType>
-            <ComplexTypeName>VmQuestionAnswerType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.rasdItemsList+xml</MediaType>
-            <ComplexTypeName>RasdItemsListType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.generalSettings+xml</MediaType>
-            <ComplexTypeName>GeneralSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwNetworkPoolReferences+xml</MediaType>
-            <ComplexTypeName>VMWNetworkPoolReferencesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.group+xml</MediaType>
-            <ComplexTypeName>GroupType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.controlAccess+xml</MediaType>
-            <ComplexTypeName>ControlAccessParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.ldapGroupSettings+xml</MediaType>
-            <ComplexTypeName>LdapGroupAttributesType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.user+xml</MediaType>
-            <ComplexTypeName>UserType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vcloud+xml</MediaType>
-            <ComplexTypeName>VCloudType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.uberAdminSettings+xml</MediaType>
-            <ComplexTypeName>UberAdminSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwvirtualcenter+xml</MediaType>
-            <ComplexTypeName>VimServerType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.leaseSettingsSection+xml</MediaType>
-            <ComplexTypeName>LeaseSettingsSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.composeVAppParams+xml</MediaType>
-            <ComplexTypeName>ComposeVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.organizationEmailSettings+xml</MediaType>
-            <ComplexTypeName>OrgEmailSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vm+xml</MediaType>
-            <ComplexTypeName>VmType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwProviderVdcResourcePoolSet+xml</MediaType>
-            <ComplexTypeName>VMWProviderVdcResourcePoolSetType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.cloneVAppParams+xml</MediaType>
-            <ComplexTypeName>CloneVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.guestCustomizationSection+xml</MediaType>
-            <ComplexTypeName>GuestCustomizationSectionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.task+xml</MediaType>
-            <ComplexTypeName>TaskType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.session+xml</MediaType>
-            <ComplexTypeName>SessionType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vAppLeaseSettings+xml</MediaType>
-            <ComplexTypeName>OrgLeaseSettingsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.importVmAsVAppParams+xml</MediaType>
-            <ComplexTypeName>ImportVmAsVAppParamsType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.role+xml</MediaType>
-            <ComplexTypeName>RoleType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.rasdItem+xml</MediaType>
-            <ComplexTypeName>RASD_Type</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.startupSection+xml</MediaType>
-            <ComplexTypeName>StartupSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.virtualHardwareSection+xml</MediaType>
-            <ComplexTypeName>VirtualHardwareSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.operatingSystemSection+xml</MediaType>
-            <ComplexTypeName>OperatingSystemSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.networkSection+xml</MediaType>
-            <ComplexTypeName>NetworkSection_Type</ComplexTypeName>
-            <SchemaLocation>http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.vAppNetwork+xml</MediaType>
-            <ComplexTypeName>VAppNetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.network+xml</MediaType>
-            <ComplexTypeName>NetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.vcloud.orgNetwork+xml</MediaType>
-            <ComplexTypeName>OrgNetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/master.xsd</SchemaLocation>
-        </MediaTypeMapping>
-        <MediaTypeMapping>
-            <MediaType>application/vnd.vmware.admin.vmwexternalnet+xml</MediaType>
-            <ComplexTypeName>VMWExternalNetworkType</ComplexTypeName>
-            <SchemaLocation>https://zone.myvcloud.com/api/v1.5/schema/vmwextensions.xsd</SchemaLocation>
-        </MediaTypeMapping>
-    </VersionInfo>
-</SupportedVersions>

http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/versions.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/versions.xml b/apis/vcloud/src/test/resources/versions.xml
deleted file mode 100644
index 4651754..0000000
--- a/apis/vcloud/src/test/resources/versions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<SupportedVersions xmlns="http://www.vmware.com/vcloud/versions"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <VersionInfo>
-        <Version>0.8</Version>
-        <LoginUrl>https://services.vcloudexpress.terremark.com/api/v0.8/login</LoginUrl>
-    </VersionInfo>
-</SupportedVersions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/virtualhardwaresection.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/virtualhardwaresection.xml b/apis/vcloud/src/test/resources/virtualhardwaresection.xml
deleted file mode 100644
index 24a0dd6..0000000
--- a/apis/vcloud/src/test/resources/virtualhardwaresection.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-<ovf:VirtualHardwareSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"
-    vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/"
-    vcloud:type="application/vnd.vmware.vcloud.virtualHardwareSection+xml">
-    <ovf:Info>Virtual hardware requirements</ovf:Info>
-    <ovf:System>
-        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-        <vssd:InstanceID>0</vssd:InstanceID>
-        <vssd:VirtualSystemIdentifier>RHEL5</vssd:VirtualSystemIdentifier>
-        <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-    </ovf:System>
-    <ovf:Item>
-        <rasd:Address>00:50:56:01:01:f2</rasd:Address>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-        <rasd:Connection vcloud:ipAddress="174.47.101.164"
-            vcloud:primaryNetworkConnection="true"
-            vcloud:ipAddressingMode="POOL">internet01</rasd:Connection>
-        <rasd:Description>PCNet32 ethernet adapter</rasd:Description>
-        <rasd:ElementName>Network adapter 0</rasd:ElementName>
-        <rasd:InstanceID>1</rasd:InstanceID>
-        <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
-        <rasd:ResourceType>10</rasd:ResourceType>
-    </ovf:Item>
-    <ovf:Item>
-        <rasd:Address>0</rasd:Address>
-        <rasd:Description>SCSI Controller</rasd:Description>
-        <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-        <rasd:InstanceID>2</rasd:InstanceID>
-        <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
-        <rasd:ResourceType>6</rasd:ResourceType>
-    </ovf:Item>
-    <ovf:Item>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:Description>Hard disk</rasd:Description>
-        <rasd:ElementName>Hard disk 1</rasd:ElementName>
-        <rasd:HostResource vcloud:capacity="30720"
-            vcloud:busType="6" vcloud:busSubType="lsilogic" />
-        <rasd:InstanceID>2000</rasd:InstanceID>
-        <rasd:Parent>2</rasd:Parent>
-        <rasd:ResourceType>17</rasd:ResourceType>
-    </ovf:Item>
-    <ovf:Item>
-        <rasd:Address>0</rasd:Address>
-        <rasd:Description>IDE Controller</rasd:Description>
-        <rasd:ElementName>IDE Controller 0</rasd:ElementName>
-        <rasd:InstanceID>3</rasd:InstanceID>
-        <rasd:ResourceType>5</rasd:ResourceType>
-    </ovf:Item>
-    <ovf:Item>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-        <rasd:Description>CD/DVD Drive</rasd:Description>
-        <rasd:ElementName>CD/DVD Drive 1</rasd:ElementName>
-        <rasd:HostResource />
-        <rasd:InstanceID>3002</rasd:InstanceID>
-        <rasd:Parent>3</rasd:Parent>
-        <rasd:ResourceType>15</rasd:ResourceType>
-    </ovf:Item>
-    <ovf:Item>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-        <rasd:Description>Floppy Drive</rasd:Description>
-        <rasd:ElementName>Floppy Drive 1</rasd:ElementName>
-        <rasd:HostResource />
-        <rasd:InstanceID>8000</rasd:InstanceID>
-        <rasd:ResourceType>14</rasd:ResourceType>
-    </ovf:Item>
-    <ovf:Item
-        vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu"
-        vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml">
-        <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-        <rasd:Description>Number of Virtual CPUs</rasd:Description>
-        <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-        <rasd:InstanceID>4</rasd:InstanceID>
-        <rasd:Reservation>0</rasd:Reservation>
-        <rasd:ResourceType>3</rasd:ResourceType>
-        <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-        <rasd:Weight>0</rasd:Weight>
-        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-    </ovf:Item>
-    <ovf:Item
-        vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory"
-        vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml">
-        <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-        <rasd:Description>Memory Size</rasd:Description>
-        <rasd:ElementName>384 MB of memory</rasd:ElementName>
-        <rasd:InstanceID>5</rasd:InstanceID>
-        <rasd:Reservation>0</rasd:Reservation>
-        <rasd:ResourceType>4</rasd:ResourceType>
-        <rasd:VirtualQuantity>384</rasd:VirtualQuantity>
-        <rasd:Weight>0</rasd:Weight>
-        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-    </ovf:Item>
-    <Link rel="edit"
-        type="application/vnd.vmware.vcloud.virtualHardwareSection+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/" />
-    <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-    <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-    <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-    <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-    <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/disks" />
-    <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/disks" />
-    <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/media" />
-    <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/networkCards" />
-    <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/networkCards" />
-</ovf:VirtualHardwareSection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/apis/vcloud/src/test/resources/vm-rhel-off-static.xml
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/test/resources/vm-rhel-off-static.xml b/apis/vcloud/src/test/resources/vm-rhel-off-static.xml
deleted file mode 100644
index 1df38a3..0000000
--- a/apis/vcloud/src/test/resources/vm-rhel-off-static.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<Vm xmlns="http://www.vmware.com/vcloud/v1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-    xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-    xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-    deployed="false" status="8" name="RHEL5"
-    type="application/vnd.vmware.vcloud.vm+xml" href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_VirtualSystemSettingData.xsd http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd http://www.vmware.com/vcloud/v1 http://vcenterprise.bluelock.com/api/v1.0/schema/master.xsd">
-    <Link rel="power:powerOn"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/power/action/powerOn" />
-    <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/action/deploy" />
-    <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vapp-607806320" />
-    <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248" />
-    <Link rel="remove"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248" />
-    <Link rel="screen:thumbnail"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/screen" />
-    <Link rel="screen:acquireTicket"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/screen/action/acquireTicket" />
-    <Link rel="media:insertMedia"
-        type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/media/action/insertMedia" />
-    <Link rel="media:ejectMedia"
-        type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/media/action/ejectMedia" />
-    <Description />
-    <ovf:VirtualHardwareSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"
-        vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/"
-        vcloud:type="application/vnd.vmware.vcloud.virtualHardwareSection+xml">
-        <ovf:Info>Virtual hardware requirements</ovf:Info>
-        <ovf:System>
-            <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-            <vssd:InstanceID>0</vssd:InstanceID>
-            <vssd:VirtualSystemIdentifier>RHEL5</vssd:VirtualSystemIdentifier>
-            <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-        </ovf:System>
-        <ovf:Item>
-            <rasd:Address>00:50:56:01:01:f2</rasd:Address>
-            <rasd:AddressOnParent>0</rasd:AddressOnParent>
-            <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-            <rasd:Connection vcloud:ipAddress="174.47.101.164"
-                vcloud:primaryNetworkConnection="true"
-                vcloud:ipAddressingMode="POOL">internet01</rasd:Connection>
-            <rasd:Description>PCNet32 ethernet adapter</rasd:Description>
-            <rasd:ElementName>Network adapter 0</rasd:ElementName>
-            <rasd:InstanceID>1</rasd:InstanceID>
-            <rasd:ResourceSubType>PCNet32</rasd:ResourceSubType>
-            <rasd:ResourceType>10</rasd:ResourceType>
-        </ovf:Item>
-        <ovf:Item>
-            <rasd:Address>0</rasd:Address>
-            <rasd:Description>SCSI Controller</rasd:Description>
-            <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-            <rasd:InstanceID>2</rasd:InstanceID>
-            <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
-            <rasd:ResourceType>6</rasd:ResourceType>
-        </ovf:Item>
-        <ovf:Item>
-            <rasd:AddressOnParent>0</rasd:AddressOnParent>
-            <rasd:Description>Hard disk</rasd:Description>
-            <rasd:ElementName>Hard disk 1</rasd:ElementName>
-            <rasd:HostResource vcloud:capacity="30720"
-                vcloud:busType="6" vcloud:busSubType="lsilogic" />
-            <rasd:InstanceID>2000</rasd:InstanceID>
-            <rasd:Parent>2</rasd:Parent>
-            <rasd:ResourceType>17</rasd:ResourceType>
-        </ovf:Item>
-        <ovf:Item>
-            <rasd:Address>0</rasd:Address>
-            <rasd:Description>IDE Controller</rasd:Description>
-            <rasd:ElementName>IDE Controller 0</rasd:ElementName>
-            <rasd:InstanceID>3</rasd:InstanceID>
-            <rasd:ResourceType>5</rasd:ResourceType>
-        </ovf:Item>
-        <ovf:Item>
-            <rasd:AddressOnParent>0</rasd:AddressOnParent>
-            <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-            <rasd:Description>CD/DVD Drive</rasd:Description>
-            <rasd:ElementName>CD/DVD Drive 1</rasd:ElementName>
-            <rasd:HostResource />
-            <rasd:InstanceID>3002</rasd:InstanceID>
-            <rasd:Parent>3</rasd:Parent>
-            <rasd:ResourceType>15</rasd:ResourceType>
-        </ovf:Item>
-        <ovf:Item>
-            <rasd:AddressOnParent>0</rasd:AddressOnParent>
-            <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
-            <rasd:Description>Floppy Drive</rasd:Description>
-            <rasd:ElementName>Floppy Drive 1</rasd:ElementName>
-            <rasd:HostResource />
-            <rasd:InstanceID>8000</rasd:InstanceID>
-            <rasd:ResourceType>14</rasd:ResourceType>
-        </ovf:Item>
-        <ovf:Item
-            vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu"
-            vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml">
-            <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-            <rasd:Description>Number of Virtual CPUs</rasd:Description>
-            <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-            <rasd:InstanceID>4</rasd:InstanceID>
-            <rasd:Reservation>0</rasd:Reservation>
-            <rasd:ResourceType>3</rasd:ResourceType>
-            <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-            <rasd:Weight>0</rasd:Weight>
-            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-        </ovf:Item>
-        <ovf:Item
-            vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory"
-            vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml">
-            <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-            <rasd:Description>Memory Size</rasd:Description>
-            <rasd:ElementName>384 MB of memory</rasd:ElementName>
-            <rasd:InstanceID>5</rasd:InstanceID>
-            <rasd:Reservation>0</rasd:Reservation>
-            <rasd:ResourceType>4</rasd:ResourceType>
-            <rasd:VirtualQuantity>384</rasd:VirtualQuantity>
-            <rasd:Weight>0</rasd:Weight>
-            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-                href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-        </ovf:Item>
-        <Link rel="edit"
-            type="application/vnd.vmware.vcloud.virtualHardwareSection+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/" />
-        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/cpu" />
-        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/memory" />
-        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/disks" />
-        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/disks" />
-        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/media" />
-        <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/networkCards" />
-        <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/virtualHardwareSection/networkCards" />
-    </ovf:VirtualHardwareSection>
-    <ovf:OperatingSystemSection xmlns:vcloud="http://www.vmware.com/vcloud/v1"
-        xmlns:vmw="http://www.vmware.com/schema/ovf" ovf:id="80"
-        vcloud:href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/operatingSystemSection/"
-        vcloud:type="application/vnd.vmware.vcloud.operatingSystemSection+xml"
-        vmw:osType="rhel5_64Guest">
-        <ovf:Info>Specifies the operating system installed</ovf:Info>
-        <ovf:Description>Red Hat Enterprise Linux 5 (64-bit)</ovf:Description>
-        <Link rel="edit"
-            type="application/vnd.vmware.vcloud.operatingSystemSection+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/operatingSystemSection/" />
-    </ovf:OperatingSystemSection>
-    <NetworkConnectionSection
-        type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/"
-        ovf:required="false">
-        <ovf:Info>Specifies the available VM network connections</ovf:Info>
-        <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-        <NetworkConnection network="internet01">
-            <NetworkConnectionIndex>0</NetworkConnectionIndex>
-            <IpAddress>174.47.101.164</IpAddress>
-            <IsConnected>true</IsConnected>
-            <MACAddress>00:50:56:01:01:f2</MACAddress>
-            <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-        </NetworkConnection>
-        <Link rel="edit"
-            type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/networkConnectionSection/" />
-    </NetworkConnectionSection>
-    <GuestCustomizationSection
-        type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
-        href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/"
-        ovf:required="false">
-        <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
-        <Enabled>true</Enabled>
-        <ChangeSid>false</ChangeSid>
-        <VirtualMachineId>2087535248</VirtualMachineId>
-        <JoinDomainEnabled>false</JoinDomainEnabled>
-        <UseOrgSettings>false</UseOrgSettings>
-        <AdminPasswordEnabled>true</AdminPasswordEnabled>
-        <AdminPasswordAuto>true</AdminPasswordAuto>
-        <ResetPasswordRequired>false</ResetPasswordRequired>
-        <CustomizationScript>cat &gt; /root/foo.txt&lt;&lt;EOF
-I '"love"' {asc|!}*&amp;
-EOF
-</CustomizationScript>
-        <ComputerName>RHEL5</ComputerName>
-        <Link rel="edit"
-            type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
-            href="https://vcenterprise.bluelock.com/api/v1.0/vApp/vm-2087535248/guestCustomizationSection/" />
-    </GuestCustomizationSection>
-    <VAppScopedLocalId>10_rhel_template</VAppScopedLocalId>
-</Vm>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/compute/src/main/clojure/org/jclouds/compute2.clj
----------------------------------------------------------------------
diff --git a/compute/src/main/clojure/org/jclouds/compute2.clj b/compute/src/main/clojure/org/jclouds/compute2.clj
index 75d80ba..f9653a4 100644
--- a/compute/src/main/clojure/org/jclouds/compute2.clj
+++ b/compute/src/main/clojure/org/jclouds/compute2.clj
@@ -19,8 +19,8 @@
   "A clojure binding to the jclouds ComputeService.
 
  jclouds supports many compute providers including Amazon EC2 (aws-ec2),
- Rackspace Cloud Servers (cloudservers-us), GoGrid (gogrid), and BlueLock
- vCloud (bluelock-vcloud-zone01).  There are over a dozen to choose from.  
+ Rackspace Cloud Servers (cloudservers-us), GoGrid (gogrid), 
+ There are over a dozen to choose from.  
 
  Current supported providers are available via the following dependency:
   org.jclouds/jclouds-allcompute
@@ -338,7 +338,7 @@ Here's an example of creating and running a small linux node in the group webser
   (merge
     (make-option-map
       kw-memfn-0arg
-      [;; ec2 trmk-ecloud trmk-vcloudexpress
+      [;; ec2
          :no-key-pair
        ;; aws-ec2
          :enable-monitoring :no-placement-group])
@@ -368,11 +368,7 @@ Here's an example of creating and running a small linux node in the group webser
        ;; cloudstack aws-ec2
          :security-group-ids
        ;; softlayer
-         :domain-name
-       ;; trmk-ecloud trmk-vcloudexpress
-         :ssh-key-fingerprint
-       ;; vcloud
-         :description :customization-script :ip-address-allocation-mode])
+         :domain-name])
     (make-option-map
       kw-memfn-varargs
       [;; from TemplateOptions

http://git-wip-us.apache.org/repos/asf/jclouds/blob/6f974f34/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java b/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java
deleted file mode 100644
index abe2b7e..0000000
--- a/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java
+++ /dev/null
@@ -1,59 +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.cim.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-
-import org.jclouds.cim.ResourceAllocationSettingData;
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code ResourceAllocationSettingDataHandler}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "ResourceAllocationSettingDataHandlerTest")
-public class ResourceAllocationSettingDataHandlerTest extends BaseHandlerTest {
-
-   public void testNormal() {
-      InputStream is = getClass().getResourceAsStream("/resourceallocation.xml");
-
-      ResourceAllocationSettingData result = factory.create(
-               injector.getInstance(ResourceAllocationSettingDataHandler.class)).parse(is);
-
-      ResourceAllocationSettingData expects = ResourceAllocationSettingData.builder().allocationUnits("Gigabytes")
-               .caption("1234568").description("Hard Disk").elementName("D:\\").hostResource("data").instanceID("6")
-               .resourceType(ResourceAllocationSettingData.ResourceType.PARTITIONABLE_UNIT).virtualQuantity(50l)
-               .build();
-      assertEquals(result.toString(), expects.toString());
-   }
-
-   public void testHosting() {
-      InputStream is = getClass().getResourceAsStream("/resourceallocation-hosting.xml");
-
-      ResourceAllocationSettingData result = factory.create(
-               injector.getInstance(ResourceAllocationSettingDataHandler.class)).parse(is);
-
-      ResourceAllocationSettingData expects = ResourceAllocationSettingData.builder().elementName("1 virtual CPU(s)")
-               .allocationUnits("hertz * 10^6").instanceID("1").resourceType(ResourceAllocationSettingData.ResourceType.PROCESSOR)
-               .virtualQuantity(1l).description("Number of Virtual CPUs").virtualQuantityUnits("count").build();
-      assertEquals(result.toString(), expects.toString());
-
-   }
-}