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:21:08 UTC
[01/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Repository: jclouds-labs
Updated Branches:
refs/heads/master db7a37ce6 -> 775b89fdb
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vdc/instantiateVAppTemplate.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vdc/instantiateVAppTemplate.xml b/vcloud-director/src/test/resources/vdc/instantiateVAppTemplate.xml
deleted file mode 100644
index ecd5128..0000000
--- a/vcloud-director/src/test/resources/vdc/instantiateVAppTemplate.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InstantiateVAppTemplateParams
- xmlns="http://www.vmware.com/vcloud/v1.5"
- name="test-vapp"
- deploy="false"
- powerOn="false"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
- <Description>Test VApp</Description>
- <InstantiationParams>
- <NetworkConfigSection>
- <ovf:Info>Configuration parameters for logical networks</ovf:Info>
- <NetworkConfig networkName="vAppNetwork">
- <Configuration>
- <ParentNetwork href="https://mycloud.greenhousedatavcloud.example.com/api/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1" />
- <FenceMode>bridged</FenceMode>
- </Configuration>
- </NetworkConfig>
- </NetworkConfigSection>
- </InstantiationParams>
- <Source href="https://mycloud.greenhousedata.com/api/vAppTemplate/vappTemplate-33578b29-1437-4b30-9f9a-4d4a3393b913" />
- <AllEULAsAccepted>true</AllEULAsAccepted>
-</InstantiateVAppTemplateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vdc/metadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vdc/metadata.xml b/vcloud-director/src/test/resources/vdc/metadata.xml
deleted file mode 100644
index 58682fa..0000000
--- a/vcloud-director/src/test/resources/vdc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata" xmlns:xsi="http://www.w3.vdc/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://vcloudbeta.bluelock.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
- <MetadataEntry>
- <Key>key</Key>
- <Value>value</Value>
- </MetadataEntry>
-</Metadata>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vdc/vdc.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vdc/vdc.xml b/vcloud-director/src/test/resources/vdc/vdc.xml
deleted file mode 100644
index ac1e2f9..0000000
--- a/vcloud-director/src/test/resources/vdc/vdc.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Vdc xmlns="http://www.vmware.com/vcloud/v1.5" status="1" name="orgVDC-cloudsoft-Tier1-PAYG" id="urn:vcloud:vdc:e9cd3387-ac57-4d27-a481-9bee75e0690f" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://mycloud.greenhousedata.com/api/org/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.uploadVAppTemplateParams+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/uploadVAppTemplate"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/instantiateVAppTemplate"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.cloneVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVApp"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.cloneVAppTemplateParams+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.cloneMediaParams+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.captureVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.composeVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/composeVApp"/>
- <Description>Pay As You go resources for organization cloudsoft </Description>
- <AllocationModel>AllocationVApp</AllocationModel>
- <StorageCapacity>
- <Units>MB</Units>
- <Allocated>0</Allocated>
- <Limit>0</Limit>
- <Used>4519</Used>
- <Overhead>0</Overhead>
- </StorageCapacity>
- <ComputeCapacity>
- <Cpu>
- <Units>MHz</Units>
- <Allocated>0</Allocated>
- <Limit>0</Limit>
- <Used>0</Used>
- <Overhead>0</Overhead>
- </Cpu>
- <Memory>
- <Units>MB</Units>
- <Allocated>0</Allocated>
- <Limit>0</Limit>
- <Used>0</Used>
- <Overhead>0</Overhead>
- </Memory>
- </ComputeCapacity>
- <ResourceEntities>
- <ResourceEntity type="application/vnd.vmware.vcloud.vApp+xml" name="vcdcap-db9" href="https://mycloud.greenhousedata.com/api/vApp/vapp-e2a4ab74-ea62-4afa-8bb7-0c11259044fb"/>
- <ResourceEntity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="adriancolecap" href="https://mycloud.greenhousedata.com/api/vAppTemplate/vappTemplate-5571eb21-f532-4506-9737-01a4635a04cb"/>
- <ResourceEntity type="application/vnd.vmware.vcloud.media+xml" name="DansTestMedia" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- </ResourceEntities>
- <AvailableNetworks>
- <Network type="application/vnd.vmware.vcloud.network+xml" name="orgNet-cloudsoft-Isolated" href="https://mycloud.greenhousedata.com/api/network/a604f3c2-0343-453e-ae1f-cddac5b7bd94"/>
- <Network type="application/vnd.vmware.vcloud.network+xml" name="orgNet-cloudsoft-External" href="https://mycloud.greenhousedata.com/api/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1"/>
- <Network type="application/vnd.vmware.vcloud.network+xml" name="orgNet-cloudsoft-Internal-Routed" href="https://mycloud.greenhousedata.com/api/network/6d7392e2-c816-43fb-99be-f9ebcd70abf6"/>
- </AvailableNetworks>
- <Capabilities>
- <SupportedHardwareVersions>
- <SupportedHardwareVersion>vmx-04</SupportedHardwareVersion>
- <SupportedHardwareVersion>vmx-07</SupportedHardwareVersion>
- <SupportedHardwareVersion>vmx-08</SupportedHardwareVersion>
- </SupportedHardwareVersions>
- </Capabilities>
- <NicQuota>0</NicQuota>
- <NetworkQuota>10</NetworkQuota>
- <VmQuota>10</VmQuota>
- <IsEnabled>true</IsEnabled>
-</Vdc>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vm/vm.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vm/vm.xml b/vcloud-director/src/test/resources/vm/vm.xml
deleted file mode 100644
index 5fbad3a..0000000
--- a/vcloud-director/src/test/resources/vm/vm.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Vm xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:ovfenv="http://schemas.dmtf.org/ovf/environment/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" nestedHypervisorEnabled="false" needsCustomization="false" deployed="true" status="4" name="ubuntu" id="urn:vcloud:vm:dea05479-d7c1-4710-ba1a-a1a18cd0d455" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455" 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://www.vmware.com/schema/ovf http://www.vmware.com/schema/ovf http://schemas
.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://schemas.dmtf.org/ovf/environment/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8027_1.1.0.xsd http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.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">
- <Link rel="power:powerOff" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/powerOff"/>
- <Link rel="power:reboot" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/reboot"/>
- <Link rel="power:reset" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/reset"/>
- <Link rel="power:shutdown" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/shutdown"/>
- <Link rel="power:suspend" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/suspend"/>
- <Link rel="undeploy" type="application/vnd.vmware.vcloud.undeployVAppParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/undeploy"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/metadata"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.productSections+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/productSections/"/>
- <Link rel="screen:thumbnail" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/screen"/>
- <Link rel="screen:acquireTicket" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/screen/action/acquireTicket"/>
- <Link rel="media:insertMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/media/action/insertMedia"/>
- <Link rel="media:ejectMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/media/action/ejectMedia"/>
- <Link rel="disk:attach" type="application/vnd.vmware.vcloud.diskAttachOrDetachParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/disk/action/attach"/>
- <Link rel="disk:detach" type="application/vnd.vmware.vcloud.diskAttachOrDetachParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/disk/action/detach"/>
- <Link rel="installVmwareTools" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/installVMwareTools"/>
- <Link rel="snapshot:create" type="application/vnd.vmware.vcloud.createSnapshotParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/createSnapshot"/>
- <Link rel="reconfigureVm" type="application/vnd.vmware.vcloud.vm+xml" name="ubuntu" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/reconfigureVm"/>
- <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145"/>
- <Description/>
- <ovf:VirtualHardwareSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ovf:transport="" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/" ns12: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>ubuntu</vssd:VirtualSystemIdentifier>
- <vssd:VirtualSystemType>vmx-09</vssd:VirtualSystemType>
- </ovf:System>
- <ovf:Item>
- <rasd:Address>00:50:56:0a:02:13</rasd:Address>
- <rasd:AddressOnParent>0</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection ns12:ipAddress="192.168.10.2" ns12:primaryNetworkConnection="false" ns12:ipAddressingMode="POOL">Routed01-Cloudsoft</rasd:Connection>
- <rasd:Description>E1000 ethernet adapter on "Routed01-Cloudsoft"</rasd:Description>
- <rasd:ElementName>Network adapter 0</rasd:ElementName>
- <rasd:InstanceID>1</rasd:InstanceID>
- <rasd:ResourceSubType>E1000</rasd:ResourceSubType>
- <rasd:ResourceType>10</rasd:ResourceType>
- </ovf:Item>
- <ovf:Item>
- <rasd:Address>00:50:56:0a:02:14</rasd:Address>
- <rasd:AddressOnParent>1</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection ns12:ipAddress="173.240.104.172" ns12:primaryNetworkConnection="true" ns12:ipAddressingMode="POOL">internet01-Cloudsoft</rasd:Connection>
- <rasd:Description>E1000 ethernet adapter on "internet01-Cloudsoft"</rasd:Description>
- <rasd:ElementName>Network adapter 1</rasd:ElementName>
- <rasd:InstanceID>2</rasd:InstanceID>
- <rasd:ResourceSubType>E1000</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>3</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 ns12:capacity="8192" ns12:busSubType="lsilogic" ns12:busType="6"/>
- <rasd:InstanceID>2000</rasd:InstanceID>
- <rasd:Parent>3</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>4</rasd:InstanceID>
- <rasd:ResourceType>5</rasd:ResourceType>
- </ovf:Item>
- <ovf:Item>
- <rasd:AddressOnParent>1</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>3000</rasd:InstanceID>
- <rasd:Parent>4</rasd:Parent>
- <rasd:ResourceType>15</rasd:ResourceType>
- </ovf:Item>
- <ovf:Item>
- <rasd:Address>1</rasd:Address>
- <rasd:Description>IDE Controller</rasd:Description>
- <rasd:ElementName>IDE Controller 1</rasd:ElementName>
- <rasd:InstanceID>5</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 2</rasd:ElementName>
- <rasd:HostResource/>
- <rasd:InstanceID>3002</rasd:InstanceID>
- <rasd:Parent>5</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 ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu" ns12: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>6</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://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu"/>
- </ovf:Item>
- <ovf:Item ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml">
- <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
- <rasd:Description>Memory Size</rasd:Description>
- <rasd:ElementName>1024 MB of memory</rasd:ElementName>
- <rasd:InstanceID>7</rasd:InstanceID>
- <rasd:Reservation>0</rasd:Reservation>
- <rasd:ResourceType>4</rasd:ResourceType>
- <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
- <rasd:Weight>0</rasd:Weight>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory"/>
- </ovf:Item>
- <Link rel="edit" type="application/vnd.vmware.vcloud.virtualHardwareSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/disks"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/disks"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/media"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/networkCards"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/networkCards"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/serialPorts"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/serialPorts"/>
- </ovf:VirtualHardwareSection>
- <ovf:OperatingSystemSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ovf:id="94" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/operatingSystemSection/" ns12:type="application/vnd.vmware.vcloud.operatingSystemSection+xml" vmw:osType="ubuntu64Guest">
- <ovf:Info>Specifies the operating system installed</ovf:Info>
- <ovf:Description>Ubuntu Linux (64-bit)</ovf:Description>
- <Link rel="edit" type="application/vnd.vmware.vcloud.operatingSystemSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/operatingSystemSection/"/>
- </ovf:OperatingSystemSection>
- <NetworkConnectionSection type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/networkConnectionSection/" ovf:required="false">
- <ovf:Info>Specifies the available VM network connections</ovf:Info>
- <PrimaryNetworkConnectionIndex>1</PrimaryNetworkConnectionIndex>
- <NetworkConnection network="Routed01-Cloudsoft" needsCustomization="false">
- <NetworkConnectionIndex>0</NetworkConnectionIndex>
- <IpAddress>192.168.10.2</IpAddress>
- <IsConnected>true</IsConnected>
- <MACAddress>00:50:56:0a:02:13</MACAddress>
- <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
- </NetworkConnection>
- <NetworkConnection network="internet01-Cloudsoft" needsCustomization="false">
- <NetworkConnectionIndex>1</NetworkConnectionIndex>
- <IpAddress>173.240.104.172</IpAddress>
- <IsConnected>true</IsConnected>
- <MACAddress>00:50:56:0a:02:14</MACAddress>
- <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
- </NetworkConnection>
- <Link rel="edit" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/networkConnectionSection/"/>
- </NetworkConnectionSection>
- <GuestCustomizationSection type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/guestCustomizationSection/" ovf:required="false">
- <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
- <Enabled>true</Enabled>
- <ChangeSid>false</ChangeSid>
- <VirtualMachineId>dea05479-d7c1-4710-ba1a-a1a18cd0d455</VirtualMachineId>
- <JoinDomainEnabled>false</JoinDomainEnabled>
- <UseOrgSettings>false</UseOrgSettings>
- <AdminPasswordEnabled>true</AdminPasswordEnabled>
- <AdminPasswordAuto>true</AdminPasswordAuto>
- <AdminPassword>A%6kC9pq</AdminPassword>
- <ResetPasswordRequired>false</ResetPasswordRequired>
- <ComputerName>Ubuntu-1110-001</ComputerName>
- <Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/guestCustomizationSection/"/>
- </GuestCustomizationSection>
- <RuntimeInfoSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/runtimeInfoSection" ns12:type="application/vnd.vmware.vcloud.virtualHardwareSection+xml">
- <ovf:Info>Specifies Runtime info</ovf:Info>
- <VMWareTools version="9281"/>
- </RuntimeInfoSection>
- <SnapshotSection type="application/vnd.vmware.vcloud.snapshotSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/snapshotSection" ovf:required="false">
- <ovf:Info>Snapshot information section</ovf:Info>
- </SnapshotSection>
- <DateCreated>2012-11-15T12:06:35.120-05:00</DateCreated>
- <VAppScopedLocalId>vm</VAppScopedLocalId>
- <ovfenv:Environment xmlns:ns12="http://www.vmware.com/schema/ovfenv" ovfenv:id="" ns12:vCenterId="vm-1072">
- <ovfenv:PlatformSection>
- <ovfenv:Kind>VMware ESXi</ovfenv:Kind>
- <ovfenv:Version>5.1.0</ovfenv:Version>
- <ovfenv:Vendor>VMware, Inc.</ovfenv:Vendor>
- <ovfenv:Locale>en</ovfenv:Locale>
- </ovfenv:PlatformSection>
- <ovfenv:PropertySection>
- <ovfenv:Property ovfenv:value="None" ovfenv:key="vCloud_UseSysPrep"/>
- <ovfenv:Property ovfenv:value="" ovfenv:key="vCloud_adminPassword"/>
- <ovfenv:Property ovfenv:value="11" ovfenv:key="vCloud_bitMask"/>
- <ovfenv:Property ovfenv:value="static" ovfenv:key="vCloud_bootproto_0"/>
- <ovfenv:Property ovfenv:value="static" ovfenv:key="vCloud_bootproto_1"/>
- <ovfenv:Property ovfenv:value="Ubuntu-1110-001" ovfenv:key="vCloud_computerName"/>
- <ovfenv:Property ovfenv:value="173.240.111.52" ovfenv:key="vCloud_dns1_0"/>
- <ovfenv:Property ovfenv:value="173.240.111.52" ovfenv:key="vCloud_dns1_1"/>
- <ovfenv:Property ovfenv:value="173.240.111.53" ovfenv:key="vCloud_dns2_0"/>
- <ovfenv:Property ovfenv:value="173.240.111.53" ovfenv:key="vCloud_dns2_1"/>
- <ovfenv:Property ovfenv:value="192.168.10.1" ovfenv:key="vCloud_gateway_0"/>
- <ovfenv:Property ovfenv:value="173.240.104.1" ovfenv:key="vCloud_gateway_1"/>
- <ovfenv:Property ovfenv:value="192.168.10.2" ovfenv:key="vCloud_ip_0"/>
- <ovfenv:Property ovfenv:value="173.240.104.172" ovfenv:key="vCloud_ip_1"/>
- <ovfenv:Property ovfenv:value="00:50:56:0a:02:13" ovfenv:key="vCloud_macaddr_0"/>
- <ovfenv:Property ovfenv:value="00:50:56:0a:02:14" ovfenv:key="vCloud_macaddr_1"/>
- <ovfenv:Property ovfenv:value="da0ad29e-1345-47d7-9f4d-d6b9391e7703" ovfenv:key="vCloud_markerid"/>
- <ovfenv:Property ovfenv:value="255.255.255.0" ovfenv:key="vCloud_netmask_0"/>
- <ovfenv:Property ovfenv:value="255.255.255.0" ovfenv:key="vCloud_netmask_1"/>
- <ovfenv:Property ovfenv:value="2" ovfenv:key="vCloud_numnics"/>
- <ovfenv:Property ovfenv:value="1" ovfenv:key="vCloud_primaryNic"/>
- <ovfenv:Property ovfenv:value="308709094" ovfenv:key="vCloud_reconfigToken"/>
- <ovfenv:Property ovfenv:value="0" ovfenv:key="vCloud_resetPassword"/>
- <ovfenv:Property ovfenv:value="" ovfenv:key="vCloud_suffix_0"/>
- <ovfenv:Property ovfenv:value="" ovfenv:key="vCloud_suffix_1"/>
- </ovfenv:PropertySection>
- <ve:EthernetAdapterSection xmlns:ve="http://www.vmware.com/schema/ovfenv" xmlns="http://schemas.dmtf.org/ovf/environment/1" xmlns:oe="http://schemas.dmtf.org/ovf/environment/1">
- <ve:Adapter ve:mac="00:50:56:0a:02:13" ve:network="dvs.VCDVSRouted01-Cloudsoft-cfc25721-2dde-4f8e-9b2e-cdc45f280624" ve:unitNumber="7"/>
- <ve:Adapter ve:mac="00:50:56:0a:02:14" ve:network="pcep_internet_336" ve:unitNumber="8"/>
-
- </ve:EthernetAdapterSection>
- </ovfenv:Environment>
- <VmCapabilities type="application/vnd.vmware.vcloud.vmCapabilitiesSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/vmCapabilities/">
- <Link rel="edit" type="application/vnd.vmware.vcloud.vmCapabilitiesSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/vmCapabilities/"/>
- <MemoryHotAddEnabled>true</MemoryHotAddEnabled>
- <CpuHotAddEnabled>true</CpuHotAddEnabled>
- </VmCapabilities>
- <StorageProfile type="application/vnd.vmware.vcloud.vdcStorageProfile+xml" name="*" href="https://vcloudbeta.bluelock.com/api/vdcStorageProfile/ba343e95-c9e2-4da8-b185-6c7410bd920a"/>
-</Vm>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vm/vmRebootTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vm/vmRebootTask.xml b/vcloud-director/src/test/resources/vm/vmRebootTask.xml
deleted file mode 100644
index efd5d87..0000000
--- a/vcloud-director/src/test/resources/vm/vmRebootTask.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-11-21T08:51:42.300-05:00" serviceNamespace="com.vmware.vcloud" operationName="vappRebootGuest" operation="Rebooting Virtual Machine ubuntu(dea05479-d7c1-4710-ba1a-a1a18cd0d455)" expiryTime="2013-02-19T08:51:42.300-05:00" cancelRequested="false" name="task" id="urn:vcloud:task:8d188b18-c2dd-4e29-a1b2-118e5f6a8276" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/8d188b18-c2dd-4e29-a1b2-118e5f6a8276" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/8d188b18-c2dd-4e29-a1b2-118e5f6a8276/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.vm+xml" name="ubuntu" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455"/>
- <User type="application/vnd.vmware.admin.user+xml" name="switbeck" href="https://vcloudbeta.bluelock.com/api/admin/user/9d9a4da6-4b54-4797-98d8-068819001c0f"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="jclouds" href="https://vcloudbeta.bluelock.com/api/org/4559b367-8af2-4ee1-8429-a0d39e7df3de"/>
- <Progress>0</Progress>
- <Details/>
-</Task>
[19/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
deleted file mode 100644
index ab2a0c5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
+++ /dev/null
@@ -1,545 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "VdcRecord")
-@XmlType(name = "QueryResultAdminVdcRecordType")
-public class QueryResultAdminVdcRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultAdminVdcRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private Boolean isEnabled;
- private Long cpuAllocationMhz;
- private Long cpuLimitMhz;
- private Long cpuUsedMhz;
- private Long memoryAllocationMB;
- private Long memoryLimitMB;
- private Long memoryUsedMB;
- private Long storageAllocationMB;
- private Long storageLimitMB;
- private Long storageUsedMB;
- private String providerVdcName;
- private String providerVdc;
- private String orgName;
- private String org;
- private Integer numberOfVApps;
- private Integer numberOfMedia;
- private Integer numberOfVAppTemplates;
- private Boolean isSystemVdc;
- private Boolean isBusy;
- private String status;
- private String networkPool;
-
- /**
- * @see QueryResultAdminVdcRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#isEnabled()
- */
- public B isEnabled(Boolean val) {
- this.isEnabled = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getCpuAllocationMhz()
- */
- public B cpuAllocationMhz(Long val) {
- this.cpuAllocationMhz = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getCpuLimitMhz()
- */
- public B cpuLimitMhz(Long val) {
- this.cpuLimitMhz = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getCpuUsedMhz()
- */
- public B cpuUsedMhz(Long val) {
- this.cpuUsedMhz = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getMemoryAllocationMB()
- */
- public B memoryAllocationMB(Long val) {
- this.memoryAllocationMB = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getMemoryLimitMB()
- */
- public B memoryLimitMB(Long val) {
- this.memoryLimitMB = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getMemoryUsedMB()
- */
- public B memoryUsedMB(Long val) {
- this.memoryUsedMB = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getStorageAllocationMB()
- */
- public B storageAllocationMB(Long val) {
- this.storageAllocationMB = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getStorageLimitMB()
- */
- public B storageLimitMB(Long val) {
- this.storageLimitMB = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getStorageUsedMB()
- */
- public B storageUsedMB(Long val) {
- this.storageUsedMB = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getProviderVdcName()
- */
- public B providerVdcName(String val) {
- this.providerVdcName = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getProviderVdc()
- */
- public B providerVdc(String val) {
- this.providerVdc = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getOrgName()
- */
- public B orgName(String val) {
- this.orgName = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#get()
- */
- public B org(String val) {
- this.org = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getNumberOfVApps()
- */
- public B numberOfVApps(Integer val) {
- this.numberOfVApps = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getNumberOfMedia()
- */
- public B numberOfMedia(Integer val) {
- this.numberOfMedia = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getNumberOfVAppTemplates()
- */
- public B numberOfVAppTemplates(Integer val) {
- this.numberOfVAppTemplates = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#isSystemVdc()
- */
- public B isSystemVdc(Boolean val) {
- this.isSystemVdc = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#isBusy()
- */
- public B isBusy(Boolean val) {
- this.isBusy = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getStatus()
- */
- public B status(String val) {
- this.status = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminVdcRecord#getNetworkPool()
- */
- public B networkPool(String val) {
- this.networkPool = val;
- return self();
- }
-
- @Override
- public QueryResultAdminVdcRecord build() {
- return new QueryResultAdminVdcRecord(this);
- }
-
- public B fromQueryResultAdminVdcRecord(QueryResultAdminVdcRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .isEnabled(in.isEnabled())
- .cpuAllocationMhz(in.getCpuAllocationMhz())
- .cpuLimitMhz(in.getCpuLimitMhz())
- .cpuUsedMhz(in.getCpuUsedMhz())
- .memoryAllocationMB(in.getMemoryAllocationMB())
- .memoryLimitMB(in.getMemoryLimitMB())
- .memoryUsedMB(in.getMemoryUsedMB())
- .storageAllocationMB(in.getStorageAllocationMB())
- .storageLimitMB(in.getStorageLimitMB())
- .storageUsedMB(in.getStorageUsedMB())
- .providerVdcName(in.getProviderVdcName())
- .providerVdc(in.getProviderVdc())
- .orgName(in.getOrgName())
- .org(in.get())
- .numberOfVApps(in.getNumberOfVApps())
- .numberOfMedia(in.getNumberOfMedia())
- .numberOfVAppTemplates(in.getNumberOfVAppTemplates())
- .isSystemVdc(in.isSystemVdc())
- .isBusy(in.isBusy())
- .status(in.getStatus())
- .networkPool(in.getNetworkPool());
- }
-
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private Boolean isEnabled;
- @XmlAttribute
- private Long cpuAllocationMhz;
- @XmlAttribute
- private Long cpuLimitMhz;
- @XmlAttribute
- private Long cpuUsedMhz;
- @XmlAttribute
- private Long memoryAllocationMB;
- @XmlAttribute
- private Long memoryLimitMB;
- @XmlAttribute
- private Long memoryUsedMB;
- @XmlAttribute
- private Long storageAllocationMB;
- @XmlAttribute
- private Long storageLimitMB;
- @XmlAttribute
- private Long storageUsedMB;
- @XmlAttribute
- private String providerVdcName;
- @XmlAttribute
- private String providerVdc;
- @XmlAttribute
- private String orgName;
- @XmlAttribute
- private String org;
- @XmlAttribute
- private Integer numberOfVApps;
- @XmlAttribute
- private Integer numberOfMedia;
- @XmlAttribute
- private Integer numberOfVAppTemplates;
- @XmlAttribute
- private Boolean isSystemVdc;
- @XmlAttribute
- private Boolean isBusy;
- @XmlAttribute
- private String status;
- @XmlAttribute
- private String networkPool;
-
- protected QueryResultAdminVdcRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.isEnabled = builder.isEnabled;
- this.cpuAllocationMhz = builder.cpuAllocationMhz;
- this.cpuLimitMhz = builder.cpuLimitMhz;
- this.cpuUsedMhz = builder.cpuUsedMhz;
- this.memoryAllocationMB = builder.memoryAllocationMB;
- this.memoryLimitMB = builder.memoryLimitMB;
- this.memoryUsedMB = builder.memoryUsedMB;
- this.storageAllocationMB = builder.storageAllocationMB;
- this.storageLimitMB = builder.storageLimitMB;
- this.storageUsedMB = builder.storageUsedMB;
- this.providerVdcName = builder.providerVdcName;
- this.providerVdc = builder.providerVdc;
- this.orgName = builder.orgName;
- this.org = builder.org;
- this.numberOfVApps = builder.numberOfVApps;
- this.numberOfMedia = builder.numberOfMedia;
- this.numberOfVAppTemplates = builder.numberOfVAppTemplates;
- this.isSystemVdc = builder.isSystemVdc;
- this.isBusy = builder.isBusy;
- this.status = builder.status;
- this.networkPool = builder.networkPool;
- }
-
- protected QueryResultAdminVdcRecord() {
- // for JAXB
- }
-
- /**
- * name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Shows whether it is enabled
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Cpu allocation in Mhz
- */
- public Long getCpuAllocationMhz() {
- return cpuAllocationMhz;
- }
-
- /**
- * Cpu limit in Mhz
- */
- public Long getCpuLimitMhz() {
- return cpuLimitMhz;
- }
-
- /**
- * Cpu used in Mhz
- */
- public Long getCpuUsedMhz() {
- return cpuUsedMhz;
- }
-
- /**
- * Memory allocation in MB
- */
- public Long getMemoryAllocationMB() {
- return memoryAllocationMB;
- }
-
- /**
- * Memory limit in MB
- */
- public Long getMemoryLimitMB() {
- return memoryLimitMB;
- }
-
- /**
- * Memory used in MB
- */
- public Long getMemoryUsedMB() {
- return memoryUsedMB;
- }
-
- /**
- * Storage allocation in MB
- */
- public Long getStorageAllocationMB() {
- return storageAllocationMB;
- }
-
- /**
- * Storage limit in MB
- */
- public Long getStorageLimitMB() {
- return storageLimitMB;
- }
-
- /**
- * Storage used in MB
- */
- public Long getStorageUsedMB() {
- return storageUsedMB;
- }
-
- /**
- * provider vDC name
- */
- public String getProviderVdcName() {
- return providerVdcName;
- }
-
- /**
- * vDC reference or id
- */
- public String getProviderVdc() {
- return providerVdc;
- }
-
- /**
- * Organization name
- */
- public String getOrgName() {
- return orgName;
- }
-
- /**
- * Organization reference or id
- */
- public String get() {
- return org;
- }
-
- /**
- * Number of vApps
- */
- public Integer getNumberOfVApps() {
- return numberOfVApps;
- }
-
- /**
- * Number of media
- */
- public Integer getNumberOfMedia() {
- return numberOfMedia;
- }
-
- /**
- * Number of vApp templates
- */
- public Integer getNumberOfVAppTemplates() {
- return numberOfVAppTemplates;
- }
-
- /**
- * Shows whether it is a system vDC
- */
- public Boolean isSystemVdc() {
- return isSystemVdc;
- }
-
- /**
- * Shows whether it is busy
- */
- public Boolean isBusy() {
- return isBusy;
- }
-
- /**
- * Status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * Network pool reference or id
- */
- public String getNetworkPool() {
- return networkPool;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultAdminVdcRecord that = QueryResultAdminVdcRecord.class.cast(o);
-
- return super.equals(that) && equal(name, that.name) && equal(isEnabled, that.isEnabled)
- && equal(cpuAllocationMhz, that.cpuAllocationMhz) && equal(cpuLimitMhz, that.cpuLimitMhz)
- && equal(cpuUsedMhz, that.cpuUsedMhz) && equal(memoryAllocationMB, that.memoryAllocationMB)
- && equal(memoryLimitMB, that.memoryLimitMB) && equal(memoryUsedMB, that.memoryUsedMB)
- && equal(storageAllocationMB, that.storageAllocationMB) && equal(storageLimitMB, that.storageLimitMB)
- && equal(storageUsedMB, that.storageUsedMB) && equal(providerVdcName, that.providerVdcName)
- && equal(providerVdc, that.providerVdc) && equal(orgName, that.orgName) && equal(org, that.org)
- && equal(numberOfVApps, that.numberOfVApps) && equal(numberOfMedia, that.numberOfMedia)
- && equal(numberOfVAppTemplates, that.numberOfVAppTemplates) && equal(isSystemVdc, that.isSystemVdc)
- && equal(isBusy, that.isBusy) && equal(status, that.status) && equal(networkPool, that.networkPool);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, isEnabled, cpuAllocationMhz, cpuLimitMhz, cpuUsedMhz,
- memoryAllocationMB, memoryLimitMB, memoryUsedMB, storageAllocationMB, storageLimitMB, storageUsedMB,
- providerVdcName, providerVdc, orgName, org, numberOfVApps, numberOfMedia, numberOfVAppTemplates,
- isSystemVdc, isBusy, status, networkPool);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("isEnabled", isEnabled).add("cpuAllocationMhz", cpuAllocationMhz)
- .add("cpuLimitMhz", cpuLimitMhz).add("cpuUsedMhz", cpuUsedMhz).add("memoryAllocationMB", memoryAllocationMB)
- .add("memoryLimitMB", memoryLimitMB).add("memoryUsedMB", memoryUsedMB)
- .add("storageAllocationMB", storageAllocationMB).add("storageLimitMB", storageLimitMB)
- .add("storageUsedMB", storageUsedMB).add("providerVdcName", providerVdcName).add("providerVdc", providerVdc)
- .add("orgName", orgName).add("org", org).add("numberOfVApps", numberOfVApps).add("numberOfMedia", numberOfMedia)
- .add("numberOfVAppTemplates", numberOfVAppTemplates).add("isSystemVdc", isSystemVdc).add("isBusy", isBusy)
- .add("status", status).add("networkPool", networkPool);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
deleted file mode 100644
index 1ce5ede..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
+++ /dev/null
@@ -1,307 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import java.net.URI;
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "CatalogRecord")
-@XmlType(name = "QueryResultCatalogRecordType")
-public class QueryResultCatalogRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultCatalogRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private Boolean isPublished;
- private Boolean isShared;
- private Date creationDate;
- private String orgName;
- private String ownerName;
- private Integer numberOfVAppTemplates;
- private Integer numberOfMedia;
- private URI owner;
-
- /**
- * @see QueryResultCatalogRecord#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#isPublished()
- */
- public B isPublished(Boolean isPublished) {
- this.isPublished = isPublished;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#isPublished()
- */
- public B published() {
- this.isPublished = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#isPublished()
- */
- public B notPublished() {
- this.isPublished = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#isShared()
- */
- public B isShared(Boolean isShared) {
- this.isShared = isShared;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#isShared()
- */
- public B shared() {
- this.isShared = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#isShared()
- */
- public B notShared() {
- this.isShared = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#getCreationDate()
- */
- public B creationDate(Date creationDate) {
- this.creationDate = creationDate;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#getOrgName()
- */
- public B orgName(String orgName) {
- this.orgName = orgName;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#getOwnerName()
- */
- public B ownerName(String ownerName) {
- this.ownerName = ownerName;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#getNumberOfVAppTemplates()
- */
- public B numberOfVAppTemplates(Integer numberOfVAppTemplates) {
- this.numberOfVAppTemplates = numberOfVAppTemplates;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#getNumberOfMedia()
- */
- public B numberOfMedia(Integer numberOfMedia) {
- this.numberOfMedia = numberOfMedia;
- return self();
- }
-
- /**
- * @see QueryResultCatalogRecord#getOwner()
- */
- public B owner(URI owner) {
- this.owner = owner;
- return self();
- }
-
- @Override
- public QueryResultCatalogRecord build() {
- return new QueryResultCatalogRecord(this);
- }
-
- public B fromQueryResultCatalogRecord(QueryResultCatalogRecord in) {
- return fromQueryResultRecordType(in).name(in.getName()).isPublished(in.isPublished()).isShared(in.isShared()).creationDate(in.getCreationDate()).orgName(in.getOrgName()).ownerName(
- in.getOwnerName()).numberOfVAppTemplates(in.getNumberOfVAppTemplates()).numberOfMedia(in.getNumberOfMedia()).owner(in.getOwner());
- }
- }
-
- private QueryResultCatalogRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.isPublished = builder.isPublished;
- this.isShared = builder.isShared;
- this.creationDate = builder.creationDate;
- this.orgName = builder.orgName;
- this.ownerName = builder.ownerName;
- this.numberOfVAppTemplates = builder.numberOfVAppTemplates;
- this.numberOfMedia = builder.numberOfMedia;
- this.owner = builder.owner;
- }
-
- private QueryResultCatalogRecord() {
- // for JAXB
- }
-
-
- @XmlAttribute
- protected String name;
- @XmlAttribute
- protected Boolean isPublished;
- @XmlAttribute
- protected Boolean isShared;
- @XmlAttribute
- @XmlSchemaType(name = "dateTime")
- protected Date creationDate;
- @XmlAttribute
- protected String orgName;
- @XmlAttribute
- protected String ownerName;
- @XmlAttribute
- protected Integer numberOfVAppTemplates;
- @XmlAttribute
- protected Integer numberOfMedia;
- @XmlAttribute
- protected URI owner;
-
- /**
- * Gets the value of the name property.
- */
- public String getName() {
- return name;
- }
-
-
- /**
- * Gets the value of the isPublished property.
- */
- public Boolean isPublished() {
- return isPublished;
- }
-
- /**
- * Gets the value of the isShared property.
- */
- public Boolean isShared() {
- return isShared;
- }
-
- /**
- * Gets the value of the creationDate property.
- */
- public Date getCreationDate() {
- return creationDate;
- }
-
- /**
- * Gets the value of the orgName property.
- */
- public String getOrgName() {
- return orgName;
- }
-
- /**
- * Gets the value of the ownerName property.
- */
- public String getOwnerName() {
- return ownerName;
- }
-
- /**
- * Gets the value of the numberOfVAppTemplates property.
- */
- public Integer getNumberOfVAppTemplates() {
- return numberOfVAppTemplates;
- }
-
- /**
- * Gets the value of the numberOfMedia property.
- */
- public Integer getNumberOfMedia() {
- return numberOfMedia;
- }
-
- /**
- * Gets the value of the owner property.
- */
- public URI getOwner() {
- return owner;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultCatalogRecord that = QueryResultCatalogRecord.class.cast(o);
- return super.equals(that) &&
- equal(this.name, that.name) && equal(this.isPublished, that.isPublished) &&
- equal(this.isShared, that.isShared) && equal(this.creationDate, that.creationDate) &&
- equal(this.orgName, that.orgName) && equal(this.ownerName, that.ownerName) &&
- equal(this.numberOfVAppTemplates, that.numberOfVAppTemplates) &&
- equal(this.numberOfMedia, that.numberOfMedia) && equal(this.owner, that.owner);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, isPublished, isShared, creationDate,
- orgName, ownerName, numberOfVAppTemplates, numberOfMedia, owner);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("name", name).add("isPublished", isPublished).add("isShared", isShared)
- .add("creationDate", creationDate).add("orgName", orgName).add("ownerName", ownerName)
- .add("numberOfVAppTemplates", numberOfVAppTemplates).add("numberOfMedia", numberOfMedia)
- .add("owner", owner);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
deleted file mode 100644
index 0e136a7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
+++ /dev/null
@@ -1,507 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "DatastoreRecord")
-@XmlType(name = "QueryResultDatastoreRecordType")
-public class QueryResultDatastoreRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultDatastoreRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String datastoreType;
- private Boolean isEnabled;
- private Boolean isDeleted;
- private Long storageUsedMB;
- private Long storageMB;
- private Long provisionedStorageMB;
- private Long requestedStorageMB;
- private String vc;
- private String vcName;
- private String moref;
- private Integer numberOfProviderVdcs;
-
- /**
- * @see QueryResultDatastoreRecord#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getDatastoreType()
- */
- public B datastoreType(String datastoreType) {
- this.datastoreType = datastoreType;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#isEnabled()
- */
- public B isEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#isEnabled()
- */
- public B enabled() {
- this.isEnabled = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#isEnabled()
- */
- public B disabled() {
- this.isEnabled = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#isDeleted()
- */
- public B isDeleted(Boolean isDeleted) {
- this.isDeleted = isDeleted;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#isDeleted()
- */
- public B deleted() {
- this.isDeleted = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#isDeleted()
- */
- public B notDeleted() {
- this.isDeleted = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getStorageUsedMB()
- */
- public B storageUsedMB(Long storageUsedMB) {
- this.storageUsedMB = storageUsedMB;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getStorageMB()
- */
- public B storageMB(Long storageMB) {
- this.storageMB = storageMB;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getProvisionedStorageMB()
- */
- public B provisionedStorageMB(Long provisionedStorageMB) {
- this.provisionedStorageMB = provisionedStorageMB;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getRequestedStorageMB()
- */
- public B requestedStorageMB(Long requestedStorageMB) {
- this.requestedStorageMB = requestedStorageMB;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getVc()
- */
- public B vc(String vc) {
- this.vc = vc;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getVcName()
- */
- public B vcName(String vcName) {
- this.vcName = vcName;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getMoref()
- */
- public B moref(String moref) {
- this.moref = moref;
- return self();
- }
-
- /**
- * @see QueryResultDatastoreRecord#getNumberOfProviderVdcs()
- */
- public B numberOfProviderVdcs(Integer numberOfProviderVdcs) {
- this.numberOfProviderVdcs = numberOfProviderVdcs;
- return self();
- }
-
- @Override
- public QueryResultDatastoreRecord build() {
- return new QueryResultDatastoreRecord(this);
- }
-
- public B fromQueryResultDatastoreRecord(QueryResultDatastoreRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .datastoreType(in.getDatastoreType())
- .isEnabled(in.isEnabled())
- .isDeleted(in.isDeleted())
- .storageUsedMB(in.getStorageUsedMB())
- .storageMB(in.getStorageMB())
- .provisionedStorageMB(in.getProvisionedStorageMB())
- .requestedStorageMB(in.getRequestedStorageMB())
- .vc(in.getVc())
- .vcName(in.getVcName())
- .moref(in.getMoref())
- .numberOfProviderVdcs(in.getNumberOfProviderVdcs());
- }
- }
-
- private QueryResultDatastoreRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.datastoreType = builder.datastoreType;
- this.isEnabled = builder.isEnabled;
- this.isDeleted = builder.isDeleted;
- this.storageUsedMB = builder.storageUsedMB;
- this.storageMB = builder.storageMB;
- this.provisionedStorageMB = builder.provisionedStorageMB;
- this.requestedStorageMB = builder.requestedStorageMB;
- this.vc = builder.vc;
- this.vcName = builder.vcName;
- this.moref = builder.moref;
- this.numberOfProviderVdcs = builder.numberOfProviderVdcs;
- }
-
- private QueryResultDatastoreRecord() {
- // for JAXB
- }
-
- @XmlAttribute
- protected String name;
- @XmlAttribute
- protected String datastoreType;
- @XmlAttribute
- protected Boolean isEnabled;
- @XmlAttribute
- protected Boolean isDeleted;
- @XmlAttribute
- protected Long storageUsedMB;
- @XmlAttribute
- protected Long storageMB;
- @XmlAttribute
- protected Long provisionedStorageMB;
- @XmlAttribute
- protected Long requestedStorageMB;
- @XmlAttribute
- protected String vc;
- @XmlAttribute
- protected String vcName;
- @XmlAttribute
- protected String moref;
- @XmlAttribute
- protected Integer numberOfProviderVdcs;
-
- /**
- * Gets the value of the name property.
- *
- * @return possible object is {@link String }
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is {@link String }
- */
- public void setName(String value) {
- this.name = value;
- }
-
- /**
- * Gets the value of the datastoreType property.
- *
- * @return possible object is {@link String }
- */
- public String getDatastoreType() {
- return datastoreType;
- }
-
- /**
- * Sets the value of the datastoreType property.
- *
- * @param value
- * allowed object is {@link String }
- */
- public void setDatastoreType(String value) {
- this.datastoreType = value;
- }
-
- /**
- * Gets the value of the isEnabled property.
- *
- * @return possible object is {@link Boolean }
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Sets the value of the isEnabled property.
- *
- * @param value
- * allowed object is {@link Boolean }
- */
- public void setIsEnabled(Boolean value) {
- this.isEnabled = value;
- }
-
- /**
- * Gets the value of the isDeleted property.
- *
- * @return possible object is {@link Boolean }
- */
- public Boolean isDeleted() {
- return isDeleted;
- }
-
- /**
- * Sets the value of the isDeleted property.
- *
- * @param value
- * allowed object is {@link Boolean }
- */
- public void setIsDeleted(Boolean value) {
- this.isDeleted = value;
- }
-
- /**
- * Gets the value of the storageUsedMB property.
- *
- * @return possible object is {@link Long }
- */
- public Long getStorageUsedMB() {
- return storageUsedMB;
- }
-
- /**
- * Sets the value of the storageUsedMB property.
- *
- * @param value
- * allowed object is {@link Long }
- */
- public void setStorageUsedMB(Long value) {
- this.storageUsedMB = value;
- }
-
- /**
- * Gets the value of the storageMB property.
- *
- * @return possible object is {@link Long }
- */
- public Long getStorageMB() {
- return storageMB;
- }
-
- /**
- * Sets the value of the storageMB property.
- *
- * @param value
- * allowed object is {@link Long }
- */
- public void setStorageMB(Long value) {
- this.storageMB = value;
- }
-
- /**
- * Gets the value of the provisionedStorageMB property.
- *
- * @return possible object is {@link Long }
- */
- public Long getProvisionedStorageMB() {
- return provisionedStorageMB;
- }
-
- /**
- * Sets the value of the provisionedStorageMB property.
- *
- * @param value
- * allowed object is {@link Long }
- */
- public void setProvisionedStorageMB(Long value) {
- this.provisionedStorageMB = value;
- }
-
- /**
- * Gets the value of the requestedStorageMB property.
- *
- * @return possible object is {@link Long }
- */
- public Long getRequestedStorageMB() {
- return requestedStorageMB;
- }
-
- /**
- * Sets the value of the requestedStorageMB property.
- *
- * @param value
- * allowed object is {@link Long }
- */
- public void setRequestedStorageMB(Long value) {
- this.requestedStorageMB = value;
- }
-
- /**
- * Gets the value of the vc property.
- *
- * @return possible object is {@link String }
- */
- public String getVc() {
- return vc;
- }
-
- /**
- * Sets the value of the vc property.
- *
- * @param value
- * allowed object is {@link String }
- */
- public void setVc(String value) {
- this.vc = value;
- }
-
- /**
- * Gets the value of the vcName property.
- *
- * @return possible object is {@link String }
- */
- public String getVcName() {
- return vcName;
- }
-
- /**
- * Sets the value of the vcName property.
- *
- * @param value
- * allowed object is {@link String }
- */
- public void setVcName(String value) {
- this.vcName = value;
- }
-
- /**
- * Gets the value of the moref property.
- *
- * @return possible object is {@link String }
- */
- public String getMoref() {
- return moref;
- }
-
- /**
- * Sets the value of the moref property.
- *
- * @param value
- * allowed object is {@link String }
- */
- public void setMoref(String value) {
- this.moref = value;
- }
-
- /**
- * Gets the value of the numberOfProviderVdcs property.
- *
- * @return possible object is {@link Integer }
- */
- public Integer getNumberOfProviderVdcs() {
- return numberOfProviderVdcs;
- }
-
- /**
- * Sets the value of the numberOfProviderVdcs property.
- *
- * @param value
- * allowed object is {@link Integer }
- */
- public void setNumberOfProviderVdcs(Integer value) {
- this.numberOfProviderVdcs = value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultDatastoreRecord that = QueryResultDatastoreRecord.class.cast(o);
- return super.equals(that) && equal(name, that.name) && equal(datastoreType, that.datastoreType) && equal(isEnabled, that.isEnabled) && equal(isDeleted, that.isDeleted)
- && equal(storageUsedMB, that.storageUsedMB) && equal(storageMB, that.storageMB) && equal(provisionedStorageMB, that.provisionedStorageMB)
- && equal(requestedStorageMB, that.requestedStorageMB) && equal(vc, that.vc) && equal(vcName, that.vcName) && equal(moref, that.moref)
- && equal(numberOfProviderVdcs, that.numberOfProviderVdcs);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, datastoreType, isEnabled, isDeleted, storageUsedMB, storageMB, provisionedStorageMB, requestedStorageMB, vc, vcName, moref, numberOfProviderVdcs);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("datastoreType", datastoreType).add("isEnabled", isEnabled).add("isDeleted", isDeleted).add("storageUsedMB", storageUsedMB).add("storageMB",
- storageMB).add("provisionedStorageMB", provisionedStorageMB).add("requestedStorageMB", requestedStorageMB).add("vc", vc).add("vcName", vcName).add("moref", moref).add(
- "numberOfProviderVdcs", numberOfProviderVdcs);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
deleted file mode 100644
index d701b0e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
+++ /dev/null
@@ -1,372 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-public class QueryResultMediaRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultMediaRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String ownerName;
- private String catalogName;
- private Boolean isPublished;
- private String name;
- private String vdc;
- private String vdcName;
- private String org;
- private Date creationDate;
- private Boolean isBusy;
- private Long storageB;
- private String owner;
- private String catalog;
- private String catalogItem;
- private String status;
-
- /**
- * @see QueryResultMediaRecord#getOwnerName()
- */
- public B ownerName(String val) {
- this.ownerName = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getCatalogName()
- */
- public B catalogName(String val) {
- this.catalogName = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#isPublished()
- */
- public B isPublished(Boolean val) {
- this.isPublished = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getVdc()
- */
- public B vdc(String val) {
- this.vdc = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getVdcName()
- */
- public B vdcName(String val) {
- this.vdcName = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#get()
- */
- public B org(String val) {
- this.org = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getCreationDate()
- */
- public B creationDate(Date val) {
- this.creationDate = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#isBusy()
- */
- public B isBusy(Boolean val) {
- this.isBusy = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getStorageB()
- */
- public B storageB(Long val) {
- this.storageB = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getOwner()
- */
- public B owner(String val) {
- this.owner = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getCatalog()
- */
- public B catalog(String val) {
- this.catalog = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getCatalogItem()
- */
- public B catalogItem(String val) {
- this.catalogItem = val;
- return self();
- }
-
- /**
- * @see QueryResultMediaRecord#getStatus()
- */
- public B status(String val) {
- this.status = val;
- return self();
- }
-
- @Override
- public QueryResultMediaRecord build() {
- return new QueryResultMediaRecord(this);
- }
-
- public B fromQueryResultMediaRecord(QueryResultMediaRecord in) {
- return fromQueryResultRecordType(in)
- .ownerName(in.getOwnerName())
- .catalogName(in.getCatalogName())
- .isPublished(in.isPublished())
- .name(in.getName())
- .vdc(in.getVdc())
- .vdcName(in.getVdcName())
- .org(in.get())
- .creationDate(in.getCreationDate())
- .isBusy(in.isBusy())
- .storageB(in.getStorageB())
- .owner(in.getOwner())
- .catalog(in.getCatalog())
- .catalogItem(in.getCatalogItem())
- .status(in.getStatus());
- }
-
- }
-
- @XmlAttribute
- private String ownerName;
- @XmlAttribute
- private String catalogName;
- @XmlAttribute
- private Boolean isPublished;
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String vdc;
- @XmlAttribute
- private String vdcName;
- @XmlAttribute
- private String org;
- @XmlAttribute
- private Date creationDate;
- @XmlAttribute
- private Boolean isBusy;
- @XmlAttribute
- private Long storageB;
- @XmlAttribute
- private String owner;
- @XmlAttribute
- private String catalog;
- @XmlAttribute
- private String catalogItem;
- @XmlAttribute
- private String status;
-
- protected QueryResultMediaRecord(Builder<?> builder) {
- super(builder);
- this.ownerName = builder.ownerName;
- this.catalogName = builder.catalogName;
- this.isPublished = builder.isPublished;
- this.name = builder.name;
- this.vdc = builder.vdc;
- this.vdcName = builder.vdcName;
- this.org = builder.org;
- this.creationDate = builder.creationDate;
- this.isBusy = builder.isBusy;
- this.storageB = builder.storageB;
- this.owner = builder.owner;
- this.catalog = builder.catalog;
- this.catalogItem = builder.catalogItem;
- this.status = builder.status;
- }
-
- protected QueryResultMediaRecord() {
- // for JAXB
- }
-
- /**
- * Owner name
- */
- public String getOwnerName() {
- return ownerName;
- }
-
- /**
- * Catalog name
- */
- public String getCatalogName() {
- return catalogName;
- }
-
- /**
- * Shows whether it is in published catalog
- */
- public Boolean isPublished() {
- return isPublished;
- }
-
- /**
- * Media name
- */
- public String getName() {
- return name;
- }
-
- /**
- * vDC reference or id
- */
- public String getVdc() {
- return vdc;
- }
-
- /**
- * vDC name
- */
- public String getVdcName() {
- return vdcName;
- }
-
- /**
- * Organization reference or id
- */
- public String get() {
- return org;
- }
-
- /**
- * Creation date
- */
- public Date getCreationDate() {
- return creationDate;
- }
-
- /**
- * Shows whether it is busy
- */
- public Boolean isBusy() {
- return isBusy;
- }
-
- /**
- * Media storage in Bytes
- */
- public Long getStorageB() {
- return storageB;
- }
-
- /**
- * Owner reference or id
- */
- public String getOwner() {
- return owner;
- }
-
- /**
- * Catalog reference or id
- */
- public String getCatalog() {
- return catalog;
- }
-
- /**
- * Catalog item reference or id
- */
- public String getCatalogItem() {
- return catalogItem;
- }
-
- /**
- * Media status
- */
- public String getStatus() {
- return status;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultMediaRecord that = QueryResultMediaRecord.class.cast(o);
-
- return super.equals(that) && equal(ownerName, that.ownerName) && equal(catalogName, that.catalogName)
- && equal(isPublished, that.isPublished) && equal(name, that.name) && equal(vdc, that.vdc)
- && equal(vdcName, that.vdcName) && equal(org, that.org) && equal(creationDate, that.creationDate)
- && equal(isBusy, that.isBusy) && equal(storageB, that.storageB) && equal(owner, that.owner)
- && equal(catalog, that.catalog) && equal(catalogItem, that.catalogItem) && equal(status, that.status);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), ownerName, catalogName, isPublished, name, vdc, vdcName, org,
- creationDate, isBusy, storageB, owner, catalog, catalogItem, status);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("ownerName", ownerName).add("catalogName", catalogName)
- .add("isPublished", isPublished).add("name", name).add("vdc", vdc).add("vdcName", vdcName)
- .add("org", org).add("creationDate", creationDate).add("isBusy", isBusy).add("storageB", storageB)
- .add("owner", owner).add("catalog", catalog).add("catalogItem", catalogItem).add("status", status);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
deleted file mode 100644
index 9f5684f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
+++ /dev/null
@@ -1,260 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "OrgNetworkRecord")
-@XmlType(name = "QueryResultNetworkRecordType")
-public class QueryResultNetworkRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultNetworkRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String ipScopeId;
- private String gateway;
- private String netmask;
- private String dns1;
- private String dns2;
- private String dnsSuffix;
- private Boolean isBusy;
-
- /**
- * @see QueryResultNetworkRecord#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#getIpScopeId()
- */
- public B ipScopeId(String ipScopeId) {
- this.ipScopeId = ipScopeId;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#getGateway()
- */
- public B gateway(String gateway) {
- this.gateway = gateway;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#getNetmask()
- */
- public B netmask(String netmask) {
- this.netmask = netmask;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#getDns1()
- */
- public B dns1(String dns1) {
- this.dns1 = dns1;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#getDns2()
- */
- public B dns2(String dns2) {
- this.dns2 = dns2;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#getDnsSuffix()
- */
- public B dnsSuffix(String dnsSuffix) {
- this.dnsSuffix = dnsSuffix;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#isBusy()
- */
- public B isBusy(Boolean isBusy) {
- this.isBusy = isBusy;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#isBusy()
- */
- public B busy() {
- this.isBusy = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see QueryResultNetworkRecord#isBusy()
- */
- public B notBusy() {
- this.isBusy = Boolean.FALSE;
- return self();
- }
-
- @Override
- public QueryResultNetworkRecord build() {
- return new QueryResultNetworkRecord(this);
- }
-
- public B fromQueryResultNetworkRecord(QueryResultNetworkRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName()).ipScopeId(in.getIpScopeId()).gateway(in.getGateway())
- .netmask(in.getNetmask()).dns1(in.getDns1()).dns2(in.getDns2())
- .dnsSuffix(in.getDnsSuffix()).isBusy(in.isBusy());
- }
- }
-
- public QueryResultNetworkRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.ipScopeId = builder.ipScopeId;
- this.gateway = builder.gateway;
- this.netmask = builder.netmask;
- this.dns1 = builder.dns1;
- this.dns2 = builder.dns2;
- this.dnsSuffix = builder.dnsSuffix;
- isBusy = builder.isBusy;
- }
-
- QueryResultNetworkRecord() {
- // for JAXB
- }
-
- @XmlAttribute
- protected String name;
- @XmlAttribute
- protected String ipScopeId;
- @XmlAttribute
- protected String gateway;
- @XmlAttribute
- protected String netmask;
- @XmlAttribute
- protected String dns1;
- @XmlAttribute
- protected String dns2;
- @XmlAttribute
- protected String dnsSuffix;
- @XmlAttribute
- protected Boolean isBusy;
-
- /**
- * name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * IP scope object of this network.
- */
- public String getIpScopeId() {
- return ipScopeId;
- }
-
-
- /**
- * Gateway for the network.
- */
- public String getGateway() {
- return gateway;
- }
-
- /**
- * Netmask for the network.
- */
- public String getNetmask() {
- return netmask;
- }
-
- /**
- * Primary DNS for the network.
- */
- public String getDns1() {
- return dns1;
- }
-
- /**
- * Secondary DNS for the network.
- */
- public String getDns2() {
- return dns2;
- }
-
- /**
- * DNS suffix for the network.
- */
- public String getDnsSuffix() {
- return dnsSuffix;
- }
-
- /**
- * Shows whether it is busy.
- */
- public Boolean isBusy() {
- return isBusy;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultNetworkRecord that = QueryResultNetworkRecord.class.cast(o);
- return super.equals(that) && equal(name, that.name) && equal(ipScopeId, that.ipScopeId) && equal(gateway, that.gateway) && equal(netmask, that.netmask) && equal(dns1, that.dns1)
- && equal(dns2, that.dns2) && equal(dnsSuffix, that.dnsSuffix) && equal(isBusy, that.isBusy);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name, ipScopeId, gateway, netmask, dns1, dns2, dnsSuffix, isBusy);
- }
-
- @Override
- public ToStringHelper string() {
- return Objects.toStringHelper(this).add("name", name).add("ipScopeId", ipScopeId).add("gateway", gateway).add("netmask", netmask).add("dns1", dns1).add("dns2", dns2).add("dnsSuffix", dnsSuffix).add("isBusy",
- isBusy);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java
deleted file mode 100644
index 08c21a2..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java
+++ /dev/null
@@ -1,217 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Sets;
-
-@XmlSeeAlso({
- QueryResultVAppTemplateRecord.class,
- QueryResultVAppRecord.class,
- QueryResultVMRecord.class,
- QueryResultDatastoreRecord.class,
- QueryResultCatalogRecord.class,
- QueryResultNetworkRecord.class,
- QueryResultRoleRecord.class,
- QueryResultAdminGroupRecord.class,
- QueryResultAdminVdcRecord.class,
- QueryResultAdminUserRecord.class,
- QueryResultStrandedUserRecord.class,
- QueryResultMediaRecord.class}
-)
-public class QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromQueryResultRecordType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> {
-
- private URI href;
- private String id;
- private String type;
- private Set<Link> links = Sets.newLinkedHashSet();
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see QueryResultRecord#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see QueryResultRecord#getId()
- */
- public B id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see QueryResultRecord#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see QueryResultRecord#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return self();
- }
-
- /**
- * @see QueryResultRecord#getLinks()
- */
- public B link(Link link) {
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- public QueryResultRecord build() {
- return new QueryResultRecord(this);
- }
-
- public B fromQueryResultRecordType(QueryResultRecord in) {
- return href(in.getHref()).id(in.getId()).type(in.getType());
- }
- }
-
- @XmlElement(name = "Link")
- private Set<Link> links = Sets.newLinkedHashSet();
- @XmlAttribute
- private URI href;
- @XmlAttribute
- private String id;
- @XmlAttribute
- private String type;
-
- protected QueryResultRecord(Builder<?> builder) {
- this.links = builder.links;
- this.href = builder.href;
- this.id = builder.id;
- this.type = builder.type;
- }
-
- public QueryResultRecord(Set<Link> links, URI href, String id, String type) {
- this.links = links;
- this.href = href;
- this.id = id;
- this.type = type;
- }
-
- public QueryResultRecord(URI href) {
- this.href = href;
- }
-
- protected QueryResultRecord() {
- // For JAXB
- }
-
- /**
- * Set of optional links to an entity or operation associated with this object.
- */
- public Set<Link> getLinks() {
- return links;
- }
-
- /**
- * Contains the URI to the entity. An object reference, expressed in URL format. Because this URL includes the object identifier
- * portion of the id attribute value, it uniquely identifies the object, persists for the life of the object, and is never
- * reused. The value of the href attribute is a reference to a view of the object, and can be used to access a representation of
- * the object that is valid in a particular context. Although URLs have a well-known syntax and a well-understood interpretation,
- * a api should treat each href as an opaque string. The rules that govern how the server constructs href strings might change
- * in future releases.
- *
- * @return an opaque reference and should never be parsed
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * The resource identifier, expressed in URN format. The value of this attribute uniquely identifies the resource, persists for
- * the life of the resource, and is never reused.
- */
- public String getId() {
- return id;
- }
- /**
- * Contains the type of the the entity. The object type, specified as a MIME content type, of the object that the link
- * references. This attribute is present only for links to objects. It is not present for links to actions.
- *
- * @return type definition, type, expressed as an HTTP Content-Type
- */
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultRecord that = QueryResultRecord.class.cast(o);
- return equal(this.href, that.href) && equal(this.id, that.id) &&
- equal(this.type, that.type) && equal(this.links, that.links);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(href, id, type, links);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected ToStringHelper string() {
- return Objects.toStringHelper("").add("href", href).add("id", id)
- .add("type", type).add("links", links);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java
deleted file mode 100644
index eb239f0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java
+++ /dev/null
@@ -1,120 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "QueryResultRecords")
-public class QueryResultRecords extends Container {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.QUERY_RESULT_RECORDS;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultRecords(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Container.Builder<B> {
-
- private Set<QueryResultRecord> records = Sets.newLinkedHashSet();
-
- /**
- * @see QueryResultRecords#getRecords()
- */
- public B records(Set<QueryResultRecord> records) {
- this.records = Sets.newLinkedHashSet(checkNotNull(records, "records"));
- return self();
- }
-
- /**
- * @see QueryResultRecords#getRecords()
- */
- public B record(QueryResultRecord record) {
- this.records.add(checkNotNull(record, "record"));
- return self();
- }
-
- @Override
- public QueryResultRecords build() {
- return new QueryResultRecords(this);
- }
-
- public B fromQueryResultRecords(QueryResultRecords in) {
- return fromContainerType(in).records(in.getRecords());
- }
- }
-
- protected QueryResultRecords(Builder<?> builder) {
- super(builder);
- this.records = ImmutableSet.copyOf(builder.records);
- }
-
- protected QueryResultRecords() {
- // For JAXB
- }
-
- @XmlElementRef
- private Set<QueryResultRecord> records = Sets.newLinkedHashSet();
-
- /**
- * Set of records representing query results.
- */
- public Set<QueryResultRecord> getRecords() {
- return Collections.unmodifiableSet(records);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultRecords that = QueryResultRecords.class.cast(o);
- return super.equals(that) && equal(this.records, that.records);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), records);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("records", records);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java
deleted file mode 100644
index 893dccd..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java
+++ /dev/null
@@ -1,120 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElementRef;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-public class QueryResultReferences extends Container {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.QUERY_RESULT_REFERENCES;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultReferences(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Container.Builder<B> {
-
- private Set<Reference> references = Sets.newLinkedHashSet();
-
- /**
- * @see QueryResultReferences#getReferences()
- */
- public B references(Set<? extends Reference> references) {
- this.references = Sets.newLinkedHashSet(checkNotNull(references, "references"));
- return self();
- }
-
- /**
- * @see QueryResultReferences#getReferences()
- */
- public B reference(Reference reference) {
- this.references.add(reference);
- return self();
- }
-
- @Override
- public QueryResultReferences build() {
- return new QueryResultReferences(this);
- }
-
- public B fromQueryResultReferences(QueryResultReferences in) {
- return fromContainerType(in).references(in.getReferences());
- }
- }
-
- protected QueryResultReferences(Builder<?> builder) {
- super(builder);
- this.references = ImmutableSet.copyOf(builder.references);
- }
-
- protected QueryResultReferences() {
- // for JAXB
- }
-
- // NOTE add other types as they are used. probably not the best way to do this.
- @XmlElementRef
- private Set<Reference> references = Sets.newLinkedHashSet();
-
- /**
- * Set of references representing query results.
- */
- public Set<Reference> getReferences() {
- return references;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultReferences that = QueryResultReferences.class.cast(o);
- return super.equals(that) && equal(this.references, that.references);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), references);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("references", references);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java
deleted file mode 100644
index 921043e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java
+++ /dev/null
@@ -1,122 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-public class QueryResultRightRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultRightRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String category;
-
- /**
- * @see QueryResultRightRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultRightRecord#getCategory()
- */
- public B category(String val) {
- this.category = val;
- return self();
- }
-
- @Override
- public QueryResultRightRecord build() {
- return new QueryResultRightRecord(this);
- }
-
- public B fromQueryResultRightRecord(QueryResultRightRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .category(in.getCategory());
- }
-
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String category;
-
- protected QueryResultRightRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.category = builder.category;
- }
-
- protected QueryResultRightRecord() {
- // for JAXB
- }
-
- /**
- * name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Category
- */
- public String getCategory() {
- return category;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultRightRecord that = QueryResultRightRecord.class.cast(o);
-
- return super.equals(that) && equal(name, that.name) && equal(category, that.category);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, category);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("category", category);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java
deleted file mode 100644
index b833d7a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java
+++ /dev/null
@@ -1,126 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "RoleRecord")
-@XmlType(name = "QueryResultRoleRecordType")
-public class QueryResultRoleRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultRoleRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private Boolean isReadOnly;
-
- /**
- * @see QueryResultRoleRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultRoleRecord#isReadOnly()
- */
- public B isReadOnly(Boolean val) {
- this.isReadOnly = val;
- return self();
- }
-
- @Override
- public QueryResultRoleRecord build() {
- return new QueryResultRoleRecord(this);
- }
-
- public B fromQueryResultRoleRecord(QueryResultRoleRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .isReadOnly(in.isReadOnly());
- }
-
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private Boolean isReadOnly;
-
- protected QueryResultRoleRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.isReadOnly = builder.isReadOnly;
- }
-
- protected QueryResultRoleRecord() {
- // for JAXB
- }
-
- /**
- * name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Shows whether it is read only
- */
- public Boolean isReadOnly() {
- return isReadOnly;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultRoleRecord that = QueryResultRoleRecord.class.cast(o);
-
- return super.equals(that) && equal(name, that.name) && equal(isReadOnly, that.isReadOnly);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, isReadOnly);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("isReadOnly", isReadOnly);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java
deleted file mode 100644
index 535e65f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java
+++ /dev/null
@@ -1,189 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "StrandedUserRecord")
-@XmlType(name = "QueryResultStrandedUserRecordType")
-public class QueryResultStrandedUserRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultStrandedUserRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String fullName;
- private Boolean isInSync;
- private Integer numberOfDeployedVMs;
- private Integer numberOfStoredVMs;
-
- /**
- * @see QueryResultStrandedUserRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultStrandedUserRecord#getFullName()
- */
- public B fullName(String val) {
- this.fullName = val;
- return self();
- }
-
- /**
- * @see QueryResultStrandedUserRecord#isInSync()
- */
- public B isInSync(Boolean val) {
- this.isInSync = val;
- return self();
- }
-
- /**
- * @see QueryResultStrandedUserRecord#getNumberOfDeployedVMs()
- */
- public B numberOfDeployedVMs(Integer val) {
- this.numberOfDeployedVMs = val;
- return self();
- }
-
- /**
- * @see QueryResultStrandedUserRecord#getNumberOfStoredVMs()
- */
- public B numberOfStoredVMs(Integer val) {
- this.numberOfStoredVMs = val;
- return self();
- }
-
- @Override
- public QueryResultStrandedUserRecord build() {
- return new QueryResultStrandedUserRecord(this);
- }
-
- public B fromQueryResultStrandedUserRecord(QueryResultStrandedUserRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .fullName(in.getFullName())
- .isInSync(in.isInSync())
- .numberOfDeployedVMs(in.getNumberOfDeployedVMs())
- .numberOfStoredVMs(in.getNumberOfStoredVMs());
- }
-
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String fullName;
- @XmlAttribute
- private Boolean isInSync;
- @XmlAttribute
- private Integer numberOfDeployedVMs;
- @XmlAttribute
- private Integer numberOfStoredVMs;
-
- protected QueryResultStrandedUserRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.fullName = builder.fullName;
- this.isInSync = builder.isInSync;
- this.numberOfDeployedVMs = builder.numberOfDeployedVMs;
- this.numberOfStoredVMs = builder.numberOfStoredVMs;
- }
-
- protected QueryResultStrandedUserRecord() {
- // for JAXB
- }
-
- /**
- * name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Full name
- */
- public String getFullName() {
- return fullName;
- }
-
- /**
- * Shows whether it is in sync
- */
- public Boolean isInSync() {
- return isInSync;
- }
-
- /**
- * Number of deployed VMs
- */
- public Integer getNumberOfDeployedVMs() {
- return numberOfDeployedVMs;
- }
-
- /**
- * Number of stored VMs
- */
- public Integer getNumberOfStoredVMs() {
- return numberOfStoredVMs;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultStrandedUserRecord that = QueryResultStrandedUserRecord.class.cast(o);
-
- return super.equals(that) && equal(name, that.name) && equal(fullName, that.fullName)
- && equal(isInSync, that.isInSync) && equal(numberOfDeployedVMs, that.numberOfDeployedVMs)
- && equal(numberOfStoredVMs, that.numberOfStoredVMs);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, fullName, isInSync, numberOfDeployedVMs, numberOfStoredVMs);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("fullName", fullName).add("isInSync", isInSync)
- .add("numberOfDeployedVMs", numberOfDeployedVMs).add("numberOfStoredVMs", numberOfStoredVMs);
- }
-}
[05/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiExpectTest.java
deleted file mode 100644
index 60eb9a7..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiExpectTest.java
+++ /dev/null
@@ -1,94 +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.vcloud.director.v1_5.features.admin;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.Group;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-@Test(groups = { "unit", "admin" }, singleThreaded = true, testName = "GroupApiExpectTest")
-public class GroupApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private Reference groupRef = Reference.builder()
- .type("application/vnd.vmware.admin.group+xml")
- .name("fff")
- .href(URI.create(endpoint + "/admin/group/fff"))
- .build();
-
- @Test(enabled = false)
- public void testGetGroup() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/group/fff")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/group/group.xml", VCloudDirectorMediaType.GROUP)
- .httpResponseBuilder().build());
-
- Group expected = group();
-
- assertEquals(api.getGroupApi().get(groupRef.getHref()), expected);
- }
-
- public static final Group group() {
- return Group.builder()
-
- .build();
- }
-
- @Test(enabled = false)
- public void testEditGroup() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/admin/group/fff")
- .xmlFilePayload("/group/editGroupSource.xml", VCloudDirectorMediaType.GROUP)
- .acceptMedia(VCloudDirectorMediaType.GROUP)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/group/editGroup.xml", VCloudDirectorMediaType.GROUP)
- .httpResponseBuilder().build());
-
- Group expected = editGroup();
-
- assertEquals(api.getGroupApi().edit(groupRef.getHref(), expected), expected);
- }
-
- public static Group editGroup() {
- return null; // TODO chain onto group() then toBuilder() and edit?
- }
-
- @Test
- public void testRemoveGroup() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("DELETE", "/admin/group/fff")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder().statusCode(204).build());
-
- api.getGroupApi().remove(groupRef.getHref());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java
deleted file mode 100644
index 90db76a..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java
+++ /dev/null
@@ -1,132 +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.vcloud.director.v1_5.features.admin;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_UPDATABLE;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Group;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "GroupApiLiveTest")
-public class GroupApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String GROUP = "admin group";
-
- /*
- * Convenience references to API apis.
- */
- private GroupApi groupApi;
-
- /*
- * Shared state between dependant tests.
- */
- private Group group;
- private OrgLdapSettings oldLdapSettings;
- private OrgLdapSettings newLdapSettings;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- groupApi = adminContext.getApi().getGroupApi();
- Reference orgRef = null;
-
- // TODO: requisite LDAP settings
-// oldLdapSettings = adminContext.getApi().getAdminOrgApi().getLdapSettings(orgRef.getHref());
-// OrgLdapSettings newLdapSettings = oldLdapSettings.toBuilder()
-// .ldapMode(OrgLdapSettings.LdapMode.SYSTEM)
-// .build();
-// context.getApi().getAdminOrgApi().editLdapSettings(newLdapSettings);
- }
-
- @Test(description = "POST /admin/org/{id}/groups")
- public void testAddGroup() {
- fail("LDAP not configured, group api isn't currently testable.");
-// group = groupApi.createGroup(orgUri, Group.builder()
-// .build();
-
- Checks.checkGroup(group);
- }
-
- @Test(description = "GET /admin/group/{id}", dependsOnMethods = { "testAddGroup" })
- public void testGetGroup() {
- group = groupApi.get(group.getHref());
-
- Checks.checkGroup(group);
- }
-
- @Test(description = "PUT /admin/group/{id}", dependsOnMethods = { "testGetGroup" } )
- public void testEditGroup() {
- String oldName = group.getName();
- String newName = "new " + oldName;
- String oldDescription = group.getDescription();
- String newDescription = "new " + oldDescription;
- //TODO: check other modifiables
-
- try {
- group = group.toBuilder()
- .name(newName)
- .description(newDescription)
- .build();
-
- group = groupApi.edit(group.getHref(), group);
-
- assertTrue(equal(group.getName(), newName), String.format(OBJ_FIELD_UPDATABLE, GROUP, "name"));
- assertTrue(equal(group.getDescription(), newDescription),
- String.format(OBJ_FIELD_UPDATABLE, GROUP, "description"));
-
- //TODO negative tests?
-
- Checks.checkGroup(group);
- } finally {
- group = group.toBuilder()
- .name(oldName)
- .description(oldDescription)
- .build();
-
- group = groupApi.edit(group.getHref(), group);
- }
- }
-
- @Test(description = "DELETE /admin/group/{id}", dependsOnMethods = { "testEditGroup" } )
- public void testRemoveGroup() {
- groupApi.remove(group.getHref());
-
- // TODO stronger assertion of error expected
-// Error expected = Error.builder()
-// .message("???")
-// .majorErrorCode(403)
-// .minorErrorCode("ACCESS_TO_RESOURCE_IS_FORBIDDEN")
-// .build();
-
- try {
- group = groupApi.get(group.getHref());
- fail("Should give HTTP 403 error");
- } catch (VCloudDirectorException vde) {
- // success
- group = null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiExpectTest.java
deleted file mode 100644
index 12039f0..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiExpectTest.java
+++ /dev/null
@@ -1,225 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ERROR;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.USER;
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.User;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "admin" }, singleThreaded = true, testName = "UserApiExpectTest")
-public class UserApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private static String user = "7212e451-76e1-4631-b2de-ba1dfd8080e4";
- private static URI userHref = URI.create(endpoint + "/user/" + user);
-
- private static String org = "7212e451-76e1-4631-b2de-asdasdasd";
- private static URI orgAdminHref = URI.create(endpoint + "/admin/org/" + org);
-
- private HttpRequest add = HttpRequest.builder()
- .method("POST")
- .endpoint(orgAdminHref + "/users")
- .addHeader("Accept", USER)
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/user/addUserSource.xml", VCloudDirectorMediaType.USER))
- .build();
-
- private HttpResponse addResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/user/addUser.xml", USER + ";version=1.5"))
- .build();
-
- @Test
- public void testAddUserHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, add, addResponse);
- assertEquals(api.getUserApi().addUserToOrg(addUserSource(), orgAdminHref), addUser());
- }
-
- HttpRequest get = HttpRequest.builder()
- .method("GET")
- .endpoint(userHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/user/user.xml", ORG + ";version=1.5"))
- .build();
-
- @Test
- public void testGetUserHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, get, getResponse);
- assertEquals(api.getUserApi().get(userHref), user());
- }
-
- HttpRequest edit = HttpRequest.builder()
- .method("PUT")
- .endpoint(userHref)
- .addHeader("Accept", USER)
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/user/editUserSource.xml", USER))
- .build();
-
- HttpResponse editResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/user/editUser.xml", USER))
- .build();
-
- @Test
- public void testEditUserHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, edit, editResponse);
- assertEquals(api.getUserApi().edit(userHref, editUserSource()), editUser());
- }
-
- HttpRequest unlock = HttpRequest.builder()
- .method("POST")
- .endpoint(userHref + "/action/unlock")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse unlockResponse = HttpResponse.builder()
- .statusCode(204)
- .build();
-
- @Test
- public void testUnlockUserHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, unlock, unlockResponse);
- api.getUserApi().unlock(userHref);
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testUnlockUserHrefNotFound() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, unlock, HttpResponse.builder()
- .statusCode(403)
- .payload(payloadFromResourceWithContentType("/org/error400.xml", ERROR))
- .build());
- api.getUserApi().unlock(userHref);
- }
-
- HttpRequest remove = HttpRequest.builder()
- .method("DELETE")
- .endpoint(userHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse removeResponse = HttpResponse.builder()
- .statusCode(200)
- .build();
-
- @Test
- public void testRemoveUserHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, remove, removeResponse);
- api.getUserApi().remove(userHref);
- }
-
- public static final User addUserSource() {
- return User.builder()
- .name("test")
- .fullName("testFullName")
- .emailAddress("test@test.com")
- .telephone("555-1234")
- .isEnabled(false)
- .im("testIM")
- .isAlertEnabled(false)
- .alertEmailPrefix("testPrefix")
- .alertEmail("testAlert@test.com")
- .isExternal(false)
- .isGroupRole(false)
- .role(Reference.builder()
- .type("application/vnd.vmware.admin.role+xml")
- .name("vApp User")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/role/ff1e0c91-1288-3664-82b7-a6fa303af4d1"))
- .build())
- .password("password")
- .groups(ImmutableList.<Reference>of())
- .build();
- }
-
- public static final User addUser() {
- return addUserSource().toBuilder()
- .id("urn:vcloud:user:b37223f3-8792-477a-820f-334998f61cd6")
- .type("application/vnd.vmware.admin.user+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"))
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.user+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"))
- .build())
- .isLocked(false)
- .isDefaultCached(false)
- .storedVmQuota(0)
- .deployedVmQuota(0)
- .password(null)
- .build();
- }
-
- public static final User user() {
- return addUser().toBuilder()
- .nameInSource("test")
- .build();
- }
-
- public static final User editUserSource() {
- return user().toBuilder()
- .fullName("new" + user().getFullName())
- .emailAddress("new" + user().getEmailAddress())
- .telephone("1-" + user().getTelephone())
- .isEnabled(true)
- .im("new" + user().getIM())
- .isAlertEnabled(true)
- .alertEmailPrefix("new" + user().getAlertEmailPrefix())
- .alertEmail("new" + user().getAlertEmail())
- .storedVmQuota(1)
- .deployedVmQuota(1)
- .password("newPassword")
- .build();
- }
-
- public static final User editUser() {
- return editUserSource().toBuilder()
- .password(null)
- .build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiLiveTest.java
deleted file mode 100644
index 7d0e9a0..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApiLiveTest.java
+++ /dev/null
@@ -1,215 +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.vcloud.director.v1_5.features.admin;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_UPDATABLE;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkUser;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-import static org.testng.AssertJUnit.assertFalse;
-
-import java.net.URI;
-
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.vcloud.director.v1_5.domain.Role.DefaultRoles;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.jclouds.vcloud.director.v1_5.domain.User;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.login.SessionApi;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "UserApiLiveTest")
-public class UserApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String USER = "admin user";
-
- /*
- * Convenience references to API apis.
- */
- UserApi userApi;
-
- /*
- * Shared state between dependant tests.
- */
- private User user;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- userApi = adminContext.getApi().getUserApi();
- }
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() throws Exception {
- if (user != null) {
- try {
- userApi.remove(user.getHref());
- } catch (Exception e) {
- logger.warn(e, "Error deleting user '%s'", user.getName());
- }
- }
- }
-
- @Test(description = "POST /admin/org/{id}/users")
- public void testAddUser() {
- User newUser = randomTestUser("testAddUser");
- user = userApi.addUserToOrg(newUser, org.getHref());
- checkUser(newUser);
- }
-
- @Test(description = "GET /admin/user/{id}", dependsOnMethods = { "testAddUser" })
- public void testGetUser() {
- user = userApi.get(user.getHref());
-
- checkUser(user);
- }
-
- @Test(description = "PUT /admin/user/{id}", dependsOnMethods = { "testGetUser" })
- public void testEditUser() {
- User oldUser = user.toBuilder().build();
- User newUser = user.toBuilder()
- .fullName("new" + oldUser.getFullName())
- .emailAddress("new" + oldUser.getEmailAddress())
- .telephone("1-" + oldUser.getTelephone())
- .isEnabled(true)
- .im("new" + oldUser.getIM())
- .isAlertEnabled(true)
- .alertEmailPrefix("new" + oldUser.getAlertEmailPrefix())
- .alertEmail("new" + oldUser.getAlertEmail())
- .storedVmQuota(1)
- .deployedVmQuota(1)
- .password("newPassword")
- // TODO test setting other fields?
-// .name("new" + oldUser.getName())
- .role(getRoleReferenceFor(DefaultRoles.AUTHOR.value()))
- .build();
-
- userApi.edit(user.getHref(), newUser);
- user = userApi.get(user.getHref());
-
- checkUser(user);
- assertTrue(equal(user.getFullName(), newUser.getFullName()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "fullName"));
- assertTrue(equal(user.getEmailAddress(), newUser.getEmailAddress()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "emailAddress"));
- assertTrue(equal(user.getTelephone(), newUser.getTelephone()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "telephone"));
- assertTrue(equal(user.isEnabled(), newUser.isEnabled()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "isEnabled"));
- assertTrue(equal(user.getIM(), newUser.getIM()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "im"));
- assertTrue(equal(user.isAlertEnabled(), newUser.isAlertEnabled()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "isAlertEnabled"));
- assertTrue(equal(user.getAlertEmailPrefix(), newUser.getAlertEmailPrefix()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "alertEmailPrefix"));
- assertTrue(equal(user.getAlertEmail(), newUser.getAlertEmail()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "alertEmail"));
-// assertTrue(equal(user.getRole(), newUser.getRole()),
-// String.format(OBJ_FIELD_UPDATABLE, USER, "role"));
- assertTrue(equal(user.getStoredVmQuota(), newUser.getStoredVmQuota()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "storedVmQuota"));
- assertTrue(equal(user.getDeployedVmQuota(), newUser.getDeployedVmQuota()),
- String.format(OBJ_FIELD_UPDATABLE, USER, "deployedVmQuota"));
-
- // session api isn't typically exposed to the user, as it is implicit
- SessionApi sessionApi = context.utils().injector().getInstance(SessionApi.class);
-
- // Check the user can really login with the changed password
- // NOTE: the password is NOT returned in the User object returned from the server
- SessionWithToken sessionWithToken = sessionApi.loginUserInOrgWithPassword(URI.create(endpoint + "/sessions"), user.getName(), org.getName(), "newPassword");
- assertNotNull(sessionWithToken.getToken());
- sessionApi.logoutSessionWithToken(sessionWithToken.getSession().getHref(), sessionWithToken.getToken());
- }
-
- @Test(description = "POST /admin/user/{id}/action/unlock", dependsOnMethods = { "testEditUser" })
- public void testUnlockUser() {
- // Need to know how many times to fail login to lock account
- AdminOrgApi adminOrgApi = adminContext.getApi().getOrgApi();
- OrgPasswordPolicySettings settingsToRevertTo = null;
-
- // session api isn't typically exposed to the user, as it is implicit
- SessionApi sessionApi = context.utils().injector().getInstance(SessionApi.class);
-
- OrgPasswordPolicySettings settings = adminOrgApi.getSettings(org.getHref()).getPasswordPolicy();
- assertNotNull(settings);
-
- // Adjust account settings so we can lock the account - be careful to not set invalidLoginsBeforeLockout too low!
- if (!settings.isAccountLockoutEnabled()) {
- settingsToRevertTo = settings;
- settings = settings.toBuilder().accountLockoutEnabled(true).invalidLoginsBeforeLockout(5).build();
- settings = adminOrgApi.editPasswordPolicy(org.getHref(), settings);
- }
-
- assertTrue(settings.isAccountLockoutEnabled());
-
- for (int i = 0; i < settings.getInvalidLoginsBeforeLockout() + 1; i++) {
- try {
- sessionApi.loginUserInOrgWithPassword(URI.create(endpoint + "/sessions"), user.getName(), org.getName(), "wrongpassword!");
- fail("Managed to login using the wrong password!");
- } catch (AuthorizationException e) {
- } catch (Exception e) {
- fail("Expected AuthorizationException", e);
- }
- }
-
- user = userApi.get(user.getHref());
- assertTrue(user.isLocked());
-
- try {
- sessionApi.loginUserInOrgWithPassword(URI.create(endpoint + "/sessions"), user.getName(), org.getName(), "newPassword");
- fail("Managed to login to locked account!");
- } catch (AuthorizationException e) {
- } catch (Exception e) {
- fail("Expected AuthorizationException", e);
- }
-
- userApi.unlock(user.getHref());
-
- user = userApi.get(user.getHref());
- assertFalse(user.isLocked());
-
- // Double-check the user can now login again
- SessionWithToken sessionWithToken = sessionApi.loginUserInOrgWithPassword(URI.create(endpoint + "/sessions"), user.getName(), org.getName(), "newPassword");
- assertNotNull(sessionWithToken.getToken());
- sessionApi.logoutSessionWithToken(sessionWithToken.getSession().getHref(), sessionWithToken.getToken());
-
- // Return account settings to the previous values, if necessary
- if (settingsToRevertTo != null) {
- adminOrgApi.editPasswordPolicy(org.getHref(), settingsToRevertTo);
- }
- }
-
- @Test(description = "DELETE /admin/user/{id}", dependsOnMethods = { "testAddUser" })
- public void testRemoveUser() {
- // Create a user to be removed (so we remove dependencies on test ordering)
- User newUser = randomTestUser("testRemoveUser" + getTestDateTimeStamp());
- User userToBeDeleted = userApi.addUserToOrg(newUser, org.getHref());
-
- // Delete the user
- userApi.remove(userToBeDeleted.getHref());
-
- // Confirm cannot no longer be accessed
- User removed = userApi.get(userToBeDeleted.getHref());
- assertNull(removed);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiExpectTest.java
deleted file mode 100644
index 61cb6d9..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiExpectTest.java
+++ /dev/null
@@ -1,517 +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.vcloud.director.v1_5.features.systemadmin;
-
-import java.net.URI;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion;
-import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.internal.annotations.Sets;
-
-@Test(groups = { "unit", "systemAdmin" }, singleThreaded = true, testName = "SystemAdminVAppApiExpectTest")
-public class SystemAdminVAppApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private String vAppId = "vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be";
- private URI vAppURI = URI.create(endpoint + vAppId);
-
- @BeforeClass
- public void before() {
- }
-
- @Test(enabled = false)
- public void testEnterMaintenanceMode() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/enterMaintenanceMode")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder().statusCode(204).build());
-
- // TODO how to test?
- api.getVAppApi().enterMaintenanceMode(vAppURI);
- }
-
- @Test(enabled = false)
- public void testExitMaintenanceMode() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/exitMaintenanceMode")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder().statusCode(204).build());
-
- // TODO how to test?
- api.getVAppApi().exitMaintenanceMode(vAppURI);
- }
-
- public static VApp getVApp() {
- // FIXME Does not match XML
- VApp vApp = VApp.builder()
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"))
-// .link(Link.builder()
-// .href(URI.create())
-// .build())
- .build();
-
-// <Link rel="power:powerOn" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/power/action/powerOn"/>
-// <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/deploy"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.vAppNetwork+xml" name="orgNet-cloudsoft-External" href="https://mycloud.greenhousedata.com/api/network/2a2e2da4-446a-4ebc-a086-06df7c9570f0"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/controlAccess/"/>
-// <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/controlAccess"/>
-// <Link rel="recompose" type="application/vnd.vmware.vcloud.recomposeVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/recomposeVApp"/>
-// <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
-// <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="remove" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/owner"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/metadata"/>
-
- return vApp;
- }
-
- public static Task editVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task removeVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task consolidateVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams controlAccessParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static Task deployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task discardSuspendedStateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task installVMwareToolsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task recomposeVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task relocateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task undeployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task upgradeHardwareVersionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOffTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOnTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task rebootTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task resetTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task shutdownTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task suspendTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams getAccessControlParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static GuestCustomizationSection getGuestCustomizationSection() {
- GuestCustomizationSection section = GuestCustomizationSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editGuestCustomizationSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static LeaseSettingsSection getLeaseSettingsSection() {
- LeaseSettingsSection section = LeaseSettingsSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editLeaseSettingsSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task ejectMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task insertMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConfigSection getNetworkConfigSection() {
- NetworkConfigSection section = NetworkConfigSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConfigSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConnectionSection getNetworkConnectionSection() {
- NetworkConnectionSection section = NetworkConnectionSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConnectionSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkSection getNetworkSection() {
- NetworkSection section = NetworkSection.builder()
- .build();
-
- return section;
- }
-
- public static OperatingSystemSection getOperatingSystemSection() {
- OperatingSystemSection section = OperatingSystemSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editOperatingSystemSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Owner getOwner() {
- Owner owner = Owner.builder()
- .build();
-
- return owner;
- }
-
- public static Task editOwnerTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ProductSectionList getProductSections() {
- ProductSectionList sectionItems = ProductSectionList.builder()
- .build();
-
- return sectionItems;
- }
-
- public static Task editProductSectionsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VmPendingQuestion getPendingQuestion() {
- VmPendingQuestion question = VmPendingQuestion.builder()
- .build();
-
- return question;
- }
-
- public static VmQuestionAnswer answerQuestion() {
- VmQuestionAnswer answer = null; // = VmQuestionAnswer.builder()
-// .build();
-
- return answer;
- }
-
- public static RuntimeInfoSection getRuntimeInfoSection() {
- RuntimeInfoSection section = RuntimeInfoSection.builder()
- .build();
-
- return section;
- }
-
- public static byte[] getScreenImage() {
- byte[] image = new byte[0];
-
- return image;
- }
-
- public static ScreenTicket getScreenTicket() {
- ScreenTicket ticket = null; // = ScreenTicket.builder();
-// .build();
-
- return ticket;
- }
-
- public static StartupSection getStartupSection() {
- StartupSection section = null; // = StartupSection.builder();
-// .build();
-
- return section;
- }
-
- public static Task editStartupSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VirtualHardwareSection getVirtualHardwareSection() {
- VirtualHardwareSection section = VirtualHardwareSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editVirtualHardwareSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItem getVirtualHardwareSectionCpu() {
- RasdItem cpu = RasdItem.builder()
- .build();
-
- return cpu;
- }
-
- public static Task editVirtualHardwareSectionCpuTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionDisks() {
- RasdItemsList disks = RasdItemsList.builder()
- .build();
-
- return disks;
- }
-
- public static Task editVirtualHardwareSectionDisksTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionMedia() {
- RasdItemsList media = RasdItemsList.builder()
- .build();
-
- return media;
- }
-
- public static RasdItem getVirtualHardwareSectionMemory() {
- RasdItem memory = RasdItem.builder()
- .build();
-
- return memory;
- }
-
- public static Task editVirtualHardwareSectionMemoryTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionNetworkCards() {
- RasdItemsList networkCards = RasdItemsList.builder()
- .build();
-
- return networkCards;
- }
-
- public static Task editVirtualHardwareSectionNetworkCardsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionSerialPorts() {
- RasdItemsList serialPorts = RasdItemsList.builder()
- .build();
-
- return serialPorts;
- }
-
- public static Task editVirtualHardwareSectionSerialPortsTask() {
- return task("id", "name", "description", "status", "operation", "operationName", "startTime");
- }
-
- /** Used by other methods to add a custom {@link Task} object. */
- private static Task task(String taskId, String name, String description, String status, String operation, String operationName, String startTime) {
- Task task = Task.builder()
- .error(Error.builder().build())
- .org(Reference.builder().build())
- .owner(Reference.builder().build())
- .user(Reference.builder().build())
- .params(null)
- .progress(0)
- .status(status)
- .operation(operation)
- .operationName(operationName)
- .startTime(dateService.iso8601DateParse(startTime))
- .endTime(null)
- .expiryTime(null)
- .tasks(Sets.<Task>newLinkedHashSet())
- .description(description)
- .name(name)
- .id("urn:vcloud:" + taskId)
- .href(URI.create(endpoint + "/task/" + taskId))
- .links(Sets.<Link>newLinkedHashSet())
- .build();
-
- return task;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiLiveTest.java
deleted file mode 100644
index 438684b..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVAppApiLiveTest.java
+++ /dev/null
@@ -1,109 +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.vcloud.director.v1_5.features.systemadmin;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CONDITION_FMT;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
-import org.jclouds.vcloud.director.v1_5.AbstractVAppApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(singleThreaded = true, testName = "SystemAdminVAppApiLiveTest")
-public class SystemAdminVAppApiLiveTest extends AbstractVAppApiLiveTest {
-
- private boolean testUserCreated = false;
-
- @BeforeClass(alwaysRun = true)
- protected void setupRequiredEntities() {
-
- if (adminContext != null) {
- userId = adminContext.getApi().getUserApi().addUserToOrg(randomTestUser("VAppAccessTest"), org.getHref())
- .getId();
- }
- }
-
- @AfterClass(alwaysRun = true, dependsOnMethods = { "cleanUpEnvironment" })
- public void cleanUp() {
- if (adminContext != null && testUserCreated && userId != null) {
- try {
- adminContext.getApi().getUserApi().remove(context.resolveIdToHref(userId));
- } catch (Exception e) {
- logger.warn(e, "Error when deleting user");
- }
- }
- }
-
- @Test(description = "POST /vApp/{id}/action/enterMaintenanceMode", groups = { "systemAdmin" })
- public void testEnterMaintenanceMode() {
-
- // Do this to a new vApp, so don't mess up subsequent tests by making the vApp read-only
- VApp temp = instantiateVApp();
- DeployVAppParams params = DeployVAppParams.builder()
- .deploymentLeaseSeconds((int) TimeUnit.SECONDS.convert(1L, TimeUnit.HOURS)).notForceCustomization()
- .notPowerOn().build();
- Task deployVApp = vAppApi.deploy(temp.getHref(), params);
- assertTaskSucceedsLong(deployVApp);
-
- try {
- // Method under test
- vAppApi.enterMaintenanceMode(temp.getHref());
-
- temp = vAppApi.get(temp.getHref());
- assertTrue(temp.isInMaintenanceMode(),
- String.format(CONDITION_FMT, "InMaintenanceMode", "TRUE", temp.isInMaintenanceMode()));
-
- // Exit maintenance mode
- vAppApi.exitMaintenanceMode(temp.getHref());
- } finally {
- cleanUpVApp(temp);
- }
- }
-
- @Test(description = "POST /vApp/{id}/action/exitMaintenanceMode", dependsOnMethods = { "testEnterMaintenanceMode" }, groups = { "systemAdmin" })
- public void testExitMaintenanceMode() {
- // Do this to a new vApp, so don't mess up subsequent tests by making the vApp read-only
- VApp temp = instantiateVApp();
- DeployVAppParams params = DeployVAppParams.builder()
- .deploymentLeaseSeconds((int) TimeUnit.SECONDS.convert(1L, TimeUnit.HOURS)).notForceCustomization()
- .notPowerOn().build();
- Task deployVApp = vAppApi.deploy(temp.getHref(), params);
- assertTaskSucceedsLong(deployVApp);
-
- try {
- // Enter maintenance mode
- vAppApi.enterMaintenanceMode(temp.getHref());
-
- // Method under test
- vAppApi.exitMaintenanceMode(temp.getHref());
-
- temp = vAppApi.get(temp.getHref());
- assertFalse(temp.isInMaintenanceMode(),
- String.format(CONDITION_FMT, "InMaintenanceMode", "FALSE", temp.isInMaintenanceMode()));
- } finally {
- cleanUpVApp(temp);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiExpectTest.java
deleted file mode 100644
index befa61f..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiExpectTest.java
+++ /dev/null
@@ -1,515 +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.vcloud.director.v1_5.features.systemadmin;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion;
-import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Sets;
-
-@Test(groups = { "unit", "systemAdmin" }, singleThreaded = true, testName = "SystemAdminVmApiExpectTest")
-public class SystemAdminVmApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private String vmId = "vm-d0e2b6b9-4381-4ddc-9572-cdfae54059be";
- private URI vmURI = URI.create(endpoint + vmId);
-
- @BeforeClass
- public void before() {
- }
-
- @Test(enabled = false)
- public void testRelocate() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/relocate")
- .xmlFilePayload("/vApp/relocateParams.xml", VCloudDirectorMediaType.RELOCATE_VM_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/relocateTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RelocateParams params = RelocateParams.builder()
- .build();
-
- Task expected = relocateTask();
-
- assertEquals(api.getVmApi().relocate(vmURI, params), expected);
- }
-
-
- public static Vm getVm() {
- // FIXME Does not match XML
- Vm vm = Vm.builder()
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vm-d0e2b6b9-4381-4ddc-9572-cdfae54059be"))
-// .link(Link.builder()
-// .href(URI.create())
-// .build())
- .build();
-
-// <Link rel="power:powerOn" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/power/action/powerOn"/>
-// <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/deploy"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.vAppNetwork+xml" name="orgNet-cloudsoft-External" href="https://mycloud.greenhousedata.com/api/network/2a2e2da4-446a-4ebc-a086-06df7c9570f0"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/controlAccess/"/>
-// <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/controlAccess"/>
-// <Link rel="recompose" type="application/vnd.vmware.vcloud.recomposeVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/recomposeVApp"/>
-// <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
-// <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="remove" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/owner"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/metadata"/>
-
- return vm;
- }
-
- public static Task editVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task removeVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task consolidateVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams controlAccessParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static Task deployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task discardSuspendedStateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task installVMwareToolsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task recomposeVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task relocateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task undeployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task upgradeHardwareVersionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOffTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOnTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task rebootTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task resetTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task shutdownTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task suspendTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams getAccessControlParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static GuestCustomizationSection getGuestCustomizationSection() {
- GuestCustomizationSection section = GuestCustomizationSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editGuestCustomizationSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static LeaseSettingsSection getLeaseSettingsSection() {
- LeaseSettingsSection section = LeaseSettingsSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editLeaseSettingsSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task ejectMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task insertMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConfigSection getNetworkConfigSection() {
- NetworkConfigSection section = NetworkConfigSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConfigSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConnectionSection getNetworkConnectionSection() {
- NetworkConnectionSection section = NetworkConnectionSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConnectionSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkSection getNetworkSection() {
- NetworkSection section = NetworkSection.builder()
- .build();
-
- return section;
- }
-
- public static OperatingSystemSection getOperatingSystemSection() {
- OperatingSystemSection section = OperatingSystemSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editOperatingSystemSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Owner getOwner() {
- Owner owner = Owner.builder()
- .build();
-
- return owner;
- }
-
- public static Task editOwnerTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ProductSectionList getProductSections() {
- ProductSectionList sectionItems = ProductSectionList.builder()
- .build();
-
- return sectionItems;
- }
-
- public static Task editProductSectionsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VmPendingQuestion getPendingQuestion() {
- VmPendingQuestion question = VmPendingQuestion.builder()
- .build();
-
- return question;
- }
-
- public static VmQuestionAnswer answerQuestion() {
- VmQuestionAnswer answer = null; // = VmQuestionAnswer.builder()
-// .build();
-
- return answer;
- }
-
- public static RuntimeInfoSection getRuntimeInfoSection() {
- RuntimeInfoSection section = RuntimeInfoSection.builder()
- .build();
-
- return section;
- }
-
- public static byte[] getScreenImage() {
- byte[] image = new byte[0];
-
- return image;
- }
-
- public static ScreenTicket getScreenTicket() {
- ScreenTicket ticket = null; // = ScreenTicket.builder();
-// .build();
-
- return ticket;
- }
-
- public static StartupSection getStartupSection() {
- StartupSection section = null; // = StartupSection.builder();
-// .build();
-
- return section;
- }
-
- public static Task editStartupSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VirtualHardwareSection getVirtualHardwareSection() {
- VirtualHardwareSection section = VirtualHardwareSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editVirtualHardwareSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItem getVirtualHardwareSectionCpu() {
- RasdItem cpu = RasdItem.builder()
- .build();
-
- return cpu;
- }
-
- public static Task editVirtualHardwareSectionCpuTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionDisks() {
- RasdItemsList disks = RasdItemsList.builder()
- .build();
-
- return disks;
- }
-
- public static Task editVirtualHardwareSectionDisksTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionMedia() {
- RasdItemsList media = RasdItemsList.builder()
- .build();
-
- return media;
- }
-
- public static RasdItem getVirtualHardwareSectionMemory() {
- RasdItem memory = RasdItem.builder()
- .build();
-
- return memory;
- }
-
- public static Task editVirtualHardwareSectionMemoryTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionNetworkCards() {
- RasdItemsList networkCards = RasdItemsList.builder()
- .build();
-
- return networkCards;
- }
-
- public static Task editVirtualHardwareSectionNetworkCardsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionSerialPorts() {
- RasdItemsList serialPorts = RasdItemsList.builder()
- .build();
-
- return serialPorts;
- }
-
- public static Task editVirtualHardwareSectionSerialPortsTask() {
- return task("id", "name", "description", "status", "operation", "operationName", "startTime");
- }
-
- /** Used by other methods to add a custom {@link Task} object. */
- private static Task task(String taskId, String name, String description, String status, String operation, String operationName, String startTime) {
- Task task = Task.builder()
- .error(Error.builder().build())
- .org(Reference.builder().build())
- .owner(Reference.builder().build())
- .user(Reference.builder().build())
- .params(null)
- .progress(0)
- .status(status)
- .operation(operation)
- .operationName(operationName)
- .startTime(dateService.iso8601DateParse(startTime))
- .endTime(null)
- .expiryTime(null)
- .tasks(Sets.<Task>newLinkedHashSet())
- .description(description)
- .name(name)
- .id("urn:vcloud:" + taskId)
- .href(URI.create(endpoint + "/task/" + taskId))
- .links(Sets.<Link>newLinkedHashSet())
- .build();
-
- return task;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiLiveTest.java
deleted file mode 100644
index 8cbc652..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/systemadmin/SystemAdminVmApiLiveTest.java
+++ /dev/null
@@ -1,125 +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.vcloud.director.v1_5.features.systemadmin;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkVm;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
-import org.jclouds.vcloud.director.v1_5.AbstractVAppApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-
-@Test(groups = { "live", "systemAdmin" }, singleThreaded = true, testName = "SystemAdminVmApiLiveTest")
-public class SystemAdminVmApiLiveTest extends AbstractVAppApiLiveTest {
-
- private boolean testUserCreated = false;
-
- @BeforeClass(alwaysRun = true)
- protected void setupRequiredEntities() {
-
- if (adminContext != null) {
- userId = adminContext.getApi().getUserApi().addUserToOrg(randomTestUser("VAppAccessTest"), org.getHref())
- .getId();
- }
- }
-
- @AfterClass(alwaysRun = true, dependsOnMethods = { "cleanUpEnvironment" })
- public void cleanUp() {
- if (adminContext != null && testUserCreated && userId != null) {
- try {
- adminContext.getApi().getUserApi().remove(context.resolveIdToHref(userId));
- } catch (Exception e) {
- logger.warn("Error when deleting user: %s", e.getMessage());
- }
- }
- }
-
- @Test(description = "GET /vApp/{id}")
- public void testGetVm() {
- // The method under test
- vm = vmApi.get(context.resolveIdToHref(vmId));
-
- // Check the retrieved object is well formed
- checkVm(vm);
-
- // Check the required fields are set
- assertEquals(vm.isDeployed(), Boolean.FALSE,
- String.format(OBJ_FIELD_EQ, VM, "deployed", "FALSE", vm.isDeployed().toString()));
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- // NOTE This test is disabled, as it is not possible to look up datastores using the User API
- @Test(description = "POST /vApp/{id}/action/relocate", dependsOnMethods = { "testGetVm" })
- public void testRelocate() {
- // Relocate to the last of the available datastores
- QueryResultRecords records = adminContext.getApi().getQueryApi().queryAll("datastore");
- QueryResultRecord datastore = Iterables.getLast(records.getRecords());
- RelocateParams params = RelocateParams.builder().datastore(Reference.builder().href(datastore.getHref()).build())
- .build();
-
- // The method under test
- Task relocate = vmApi.relocate(vm.getHref(), params);
- assertTrue(retryTaskSuccess.apply(relocate), String.format(TASK_COMPLETE_TIMELY, "relocate"));
- }
-
- @Test(description = "POST /vApp/{id}/action/deploy", dependsOnMethods = { "testGetVm" })
- public void testDeployVm() {
- DeployVAppParams params = DeployVAppParams.builder()
- .deploymentLeaseSeconds((int) TimeUnit.SECONDS.convert(1L, TimeUnit.HOURS)).notForceCustomization()
- .notPowerOn().build();
-
- // The method under test
- Task deployVm = vmApi.deploy(vm.getHref(), params);
- assertTrue(retryTaskSuccessLong.apply(deployVm), String.format(TASK_COMPLETE_TIMELY, "deployVm"));
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check the required fields are set
- assertTrue(vm.isDeployed(), String.format(OBJ_FIELD_EQ, VM, "deployed", "TRUE", vm.isDeployed().toString()));
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- @Test(description = "POST /vApp/{id}/action/consolidate", dependsOnMethods = { "testDeployVm" })
- public void testConsolidateVm() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- Task consolidateVm = vmApi.consolidate(vm.getHref());
- assertTrue(retryTaskSuccess.apply(consolidateVm), String.format(TASK_COMPLETE_TIMELY, "consolidateVm"));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java
deleted file mode 100644
index 890c150..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java
+++ /dev/null
@@ -1,85 +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.vcloud.director.v1_5.handlers;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.domain.Credentials;
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.jclouds.vcloud.director.v1_5.login.SessionApi;
-import org.testng.annotations.Test;
-
-import com.google.common.cache.LoadingCache;
-
-/**
- * Tests behavior of {@code InvalidateSessionAndRetryOn401AndLogoutOnClose} handler
- */
-@Test(groups = "unit", testName = "InvalidateSessionAndRetryOn401AndLogoutOnCloseTest")
-public class InvalidateSessionAndRetryOn401AndLogoutOnCloseTest {
- @SuppressWarnings("unchecked")
- @Test
- public void test401ShouldInvalidateSessionAndRetry() {
- HttpCommand command = createMock(HttpCommand.class);
- SessionApi sessionApi = createMock(SessionApi.class);
- LoadingCache<Credentials, SessionWithToken> cache = createMock(LoadingCache.class);
-
- cache.invalidateAll();
- expectLastCall();
- expect(command.incrementFailureCount()).andReturn(1);
- expect(command.isReplayable()).andReturn(true);
- expect(command.getFailureCount()).andReturn(1).atLeastOnce();
-
- replay(cache, command);
-
- HttpResponse response = HttpResponse.builder().statusCode(401).build();
-
- InvalidateSessionAndRetryOn401AndLogoutOnClose retry = new InvalidateSessionAndRetryOn401AndLogoutOnClose(cache,
- sessionApi);
-
- assertTrue(retry.shouldRetryRequest(command, response));
-
- verify(cache, command);
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void test403ShouldNotInvalidateSessionOrRetry() {
- HttpCommand command = createMock(HttpCommand.class);
- SessionApi sessionApi = createMock(SessionApi.class);
- LoadingCache<Credentials, SessionWithToken> cache = createMock(LoadingCache.class);
-
- replay(cache, command);
-
- HttpResponse response = HttpResponse.builder().statusCode(403).build();
-
- InvalidateSessionAndRetryOn401AndLogoutOnClose retry = new InvalidateSessionAndRetryOn401AndLogoutOnClose(cache,
- sessionApi);
-
- assertFalse(retry.shouldRetryRequest(command, response));
-
- verify(cache, command);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandlerTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandlerTest.java
deleted file mode 100644
index 208e146..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandlerTest.java
+++ /dev/null
@@ -1,96 +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.vcloud.director.v1_5.handlers;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.reportMatcher;
-import static org.easymock.EasyMock.verify;
-
-import java.net.URI;
-
-import org.easymock.IArgumentMatcher;
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-
-@Test(groups = { "unit" })
-public class VCloudDirectorErrorHandlerTest {
-
- @Test
- public void test401MakesAuthorizationException() {
- assertCodeMakes("GET", URI.create("https://api.vcloud.director.com/foo"), 401, "", "Unauthorized",
- AuthorizationException.class);
- }
-
- @Test
- public void test404MakesResourceNotFoundException() {
- assertCodeMakes("GET", URI.create("https://api.vcloud.director.com/foo"), 404, "", "Not Found",
- ResourceNotFoundException.class);
- }
-
- private void assertCodeMakes(String method, URI uri, int statusCode, String message, String content,
- Class<? extends Exception> expected) {
- assertCodeMakes(method, uri, statusCode, message, "text/xml", content, expected);
- }
-
- private void assertCodeMakes(String method, URI uri, int statusCode, String message, String contentType,
- String content, Class<? extends Exception> expected) {
-
- VCloudDirectorErrorHandler function = Guice.createInjector().getInstance(VCloudDirectorErrorHandler.class);
-
- HttpCommand command = createMock(HttpCommand.class);
- HttpRequest request = HttpRequest.builder().method(method).endpoint(uri).build();
- HttpResponse response = HttpResponse.builder().statusCode(statusCode).message(message).payload(content).build();
- response.getPayload().getContentMetadata().setContentType(contentType);
-
- expect(command.getCurrentRequest()).andReturn(request).atLeastOnce();
- command.setException(classEq(expected));
-
- replay(command);
-
- function.handleError(command, response);
-
- verify(command);
- }
-
- public static Exception classEq(final Class<? extends Exception> in) {
- reportMatcher(new IArgumentMatcher() {
-
- @Override
- public void appendTo(StringBuffer buffer) {
- buffer.append("classEq(");
- buffer.append(in);
- buffer.append(")");
- }
-
- @Override
- public boolean matches(Object arg) {
- return arg.getClass() == in;
- }
-
- });
- return null;
- }
-
-}
[02/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/query/admin/allRoles.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/query/admin/allRoles.xml b/vcloud-director/src/test/resources/query/admin/allRoles.xml
deleted file mode 100644
index 52f3c7d..0000000
--- a/vcloud-director/src/test/resources/query/admin/allRoles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<QueryResultRecords xmlns="http://www.vmware.com/vcloud/v1.5" total="1" pageSize="25" page="1" name="role" type="application/vnd.vmware.vcloud.query.records+xml" href="https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=records" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.references+xml" href="https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=references"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.idrecords+xml" href="https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=idrecords"/>
- <RoleRecord name="vApp Author" isReadOnly="false" href="https://vcloudbeta.bluelock.com/api/admin/role/1bf4457f-a253-3cf1-b163-f319f1a31802"/>
-</QueryResultRecords>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/query/allCatalogReferences.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/query/allCatalogReferences.xml b/vcloud-director/src/test/resources/query/allCatalogReferences.xml
deleted file mode 100644
index 1f1cd5d..0000000
--- a/vcloud-director/src/test/resources/query/allCatalogReferences.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogReferences xmlns="http://www.vmware.com/vcloud/v1.5" total="4" pageSize="25" page="1" name="catalog" type="application/vnd.vmware.vcloud.query.references+xml" href="https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=references" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.records+xml" href="https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=records"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.idrecords+xml" href="https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=idrecords"/>
- <CatalogReference type="application/vnd.vmware.vcloud.catalog+xml" name="QunyingTestCatalog" id="urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <CatalogReference type="application/vnd.vmware.vcloud.catalog+xml" name="Public" id="urn:vcloud:catalog:9e08c2f6-077a-42ce-bece-d5332e2ebb5c" href="https://vcloudbeta.bluelock.com/api/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"/>
- <CatalogReference type="application/vnd.vmware.vcloud.catalog+xml" name="dantest" id="urn:vcloud:catalog:b542aff4-9f97-4f51-a126-4330fbf62f02" href="https://vcloudbeta.bluelock.com/api/catalog/b542aff4-9f97-4f51-a126-4330fbf62f02"/>
- <CatalogReference type="application/vnd.vmware.vcloud.catalog+xml" name="test" id="urn:vcloud:catalog:b7289d54-4ca4-497f-9a93-2d4afc97e3da" href="https://vcloudbeta.bluelock.com/api/catalog/b7289d54-4ca4-497f-9a93-2d4afc97e3da"/>
-</CatalogReferences>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/query/allCatalogs.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/query/allCatalogs.xml b/vcloud-director/src/test/resources/query/allCatalogs.xml
deleted file mode 100644
index da80169..0000000
--- a/vcloud-director/src/test/resources/query/allCatalogs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<QueryResultRecords xmlns="http://www.vmware.com/vcloud/v1.5" total="3" pageSize="25" page="1" name="catalog" type="application/vnd.vmware.vcloud.query.records+xml" href="https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=records" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.references+xml" href="https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=references"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.idrecords+xml" href="https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=idrecords"/>
- <CatalogRecord ownerName="qunying.huang@enstratus.com" owner="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69" orgName="JClouds" numberOfVAppTemplates="0" numberOfMedia="0" name="QunyingTestCatalog" isShared="true" isPublished="false" creationDate="2012-02-07T00:16:28.323-05:00" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <CatalogRecord ownerName="system" owner="https://vcloudbeta.bluelock.com/api/admin/user/0ebf2453-5e95-48ab-b223-02671965ee91" orgName="Bluelock" numberOfVAppTemplates="0" numberOfMedia="0" name="Public" isShared="false" isPublished="true" creationDate="2011-09-28T13:45:44.207-04:00" href="https://vcloudbeta.bluelock.com/api/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"/>
- <CatalogRecord ownerName="adk@cloudsoftcorp.com" owner="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9" orgName="JClouds" numberOfVAppTemplates="0" numberOfMedia="0" name="test" isShared="true" isPublished="false" creationDate="2012-02-09T12:32:17.723-05:00" href="https://vcloudbeta.bluelock.com/api/catalog/b7289d54-4ca4-497f-9a93-2d4afc97e3da"/>
-</QueryResultRecords>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/query/queryList.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/query/queryList.xml b/vcloud-director/src/test/resources/query/queryList.xml
deleted file mode 100644
index 7d3c2f0..0000000
--- a/vcloud-director/src/test/resources/query/queryList.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<QueryList xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.query.queryList+xml" href="https://vcloudbeta.bluelock.com/api/query" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="organization" href="https://vcloudbeta.bluelock.com/api/query?type=organization&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="organization" href="https://vcloudbeta.bluelock.com/api/query?type=organization&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="organization" href="https://vcloudbeta.bluelock.com/api/query?type=organization&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="orgVdc" href="https://vcloudbeta.bluelock.com/api/query?type=orgVdc&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="orgVdc" href="https://vcloudbeta.bluelock.com/api/query?type=orgVdc&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="orgVdc" href="https://vcloudbeta.bluelock.com/api/query?type=orgVdc&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="media" href="https://vcloudbeta.bluelock.com/api/query?type=media&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="media" href="https://vcloudbeta.bluelock.com/api/query?type=media&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="media" href="https://vcloudbeta.bluelock.com/api/query?type=media&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="vAppTemplate" href="https://vcloudbeta.bluelock.com/api/query?type=vAppTemplate&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="vAppTemplate" href="https://vcloudbeta.bluelock.com/api/query?type=vAppTemplate&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="vAppTemplate" href="https://vcloudbeta.bluelock.com/api/query?type=vAppTemplate&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="vApp" href="https://vcloudbeta.bluelock.com/api/query?type=vApp&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="vApp" href="https://vcloudbeta.bluelock.com/api/query?type=vApp&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="vApp" href="https://vcloudbeta.bluelock.com/api/query?type=vApp&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="vm" href="https://vcloudbeta.bluelock.com/api/query?type=vm&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="vm" href="https://vcloudbeta.bluelock.com/api/query?type=vm&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="vm" href="https://vcloudbeta.bluelock.com/api/query?type=vm&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="orgNetwork" href="https://vcloudbeta.bluelock.com/api/query?type=orgNetwork&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="orgNetwork" href="https://vcloudbeta.bluelock.com/api/query?type=orgNetwork&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="orgNetwork" href="https://vcloudbeta.bluelock.com/api/query?type=orgNetwork&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="vAppNetwork" href="https://vcloudbeta.bluelock.com/api/query?type=vAppNetwork&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="vAppNetwork" href="https://vcloudbeta.bluelock.com/api/query?type=vAppNetwork&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="vAppNetwork" href="https://vcloudbeta.bluelock.com/api/query?type=vAppNetwork&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="catalog" href="https://vcloudbeta.bluelock.com/api/query?type=catalog&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="catalog" href="https://vcloudbeta.bluelock.com/api/query?type=catalog&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="catalog" href="https://vcloudbeta.bluelock.com/api/query?type=catalog&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="group" href="https://vcloudbeta.bluelock.com/api/query?type=group&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="group" href="https://vcloudbeta.bluelock.com/api/query?type=group&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="group" href="https://vcloudbeta.bluelock.com/api/query?type=group&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="user" href="https://vcloudbeta.bluelock.com/api/query?type=user&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="user" href="https://vcloudbeta.bluelock.com/api/query?type=user&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="user" href="https://vcloudbeta.bluelock.com/api/query?type=user&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="strandedUser" href="https://vcloudbeta.bluelock.com/api/query?type=strandedUser&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="strandedUser" href="https://vcloudbeta.bluelock.com/api/query?type=strandedUser&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="strandedUser" href="https://vcloudbeta.bluelock.com/api/query?type=strandedUser&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="role" href="https://vcloudbeta.bluelock.com/api/query?type=role&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="role" href="https://vcloudbeta.bluelock.com/api/query?type=role&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="role" href="https://vcloudbeta.bluelock.com/api/query?type=role&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="allocatedExternalAddress" href="https://vcloudbeta.bluelock.com/api/query?type=allocatedExternalAddress&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="allocatedExternalAddress" href="https://vcloudbeta.bluelock.com/api/query?type=allocatedExternalAddress&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="event" href="https://vcloudbeta.bluelock.com/api/query?type=event&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="event" href="https://vcloudbeta.bluelock.com/api/query?type=event&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="right" href="https://vcloudbeta.bluelock.com/api/query?type=right&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="right" href="https://vcloudbeta.bluelock.com/api/query?type=right&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="right" href="https://vcloudbeta.bluelock.com/api/query?type=right&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="vAppOrgNetworkRelation" href="https://vcloudbeta.bluelock.com/api/query?type=vAppOrgNetworkRelation&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="vAppOrgNetworkRelation" href="https://vcloudbeta.bluelock.com/api/query?type=vAppOrgNetworkRelation&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="vAppOrgNetworkRelation" href="https://vcloudbeta.bluelock.com/api/query?type=vAppOrgNetworkRelation&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="catalogItem" href="https://vcloudbeta.bluelock.com/api/query?type=catalogItem&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="catalogItem" href="https://vcloudbeta.bluelock.com/api/query?type=catalogItem&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="catalogItem" href="https://vcloudbeta.bluelock.com/api/query?type=catalogItem&format=idrecords"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.references+xml" name="task" href="https://vcloudbeta.bluelock.com/api/query?type=task&format=references"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.records+xml" name="task" href="https://vcloudbeta.bluelock.com/api/query?type=task&format=records"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.idrecords+xml" name="task" href="https://vcloudbeta.bluelock.com/api/query?type=task&format=idrecords"/>
-</QueryList>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/session.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/session.xml b/vcloud-director/src/test/resources/session.xml
deleted file mode 100644
index ec24f12..0000000
--- a/vcloud-director/src/test/resources/session.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Session xmlns="http://www.vmware.com/vcloud/v1.5" user="adrian@jclouds.org" org="JClouds" type="application/vnd.vmware.vcloud.session+xml" href="https://vcloudbeta.bluelock.com/api/session/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="down" type="application/vnd.vmware.vcloud.orgList+xml" href="https://vcloudbeta.bluelock.com/api/org/"/>
- <Link rel="down" type="application/vnd.vmware.admin.vcloud+xml" href="https://vcloudbeta.bluelock.com/api/admin/"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.query.queryList+xml" href="https://vcloudbeta.bluelock.com/api/query"/>
- <Link rel="entityResolver" type="application/vnd.vmware.vcloud.entity+xml" href="https://vcloudbeta.bluelock.com/api/entity/"/>
-</Session>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/task/error400.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/task/error400.xml b/vcloud-director/src/test/resources/task/error400.xml
deleted file mode 100644
index 9ad5bd1..0000000
--- a/vcloud-director/src/test/resources/task/error400.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="BAD_REQUEST" message="validation error on field 'id': String value has invalid format or length" majorErrorCode="400" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/task/error403.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/task/error403.xml b/vcloud-director/src/test/resources/task/error403.xml
deleted file mode 100644
index 417556d..0000000
--- a/vcloud-director/src/test/resources/task/error403.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity "com.vmware.vcloud.entity.org:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/task/task.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/task/task.xml b/vcloud-director/src/test/resources/task/task.xml
deleted file mode 100644
index b1641d5..0000000
--- a/vcloud-director/src/test/resources/task/task.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="success" startTime="2012-02-07T00:16:28.450-05:00" operationName="catalogCreateCatalog" operation="Created Catalog QunyingTestCatalog(7212e451-76e1-4631-b2de-ba1dfd8080e4)" expiryTime="2012-05-07T00:16:28.450-04:00" endTime="2012-02-07T00:16:28.867-05:00" name="task" id="urn:vcloud:task:5fcd2af3-d0ec-45ce-9451-8c585a2c766b" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/5fcd2af3-d0ec-45ce-9451-8c585a2c766b" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Owner type="application/vnd.vmware.vcloud.catalog+xml" name="QunyingTestCatalog" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <User type="application/vnd.vmware.admin.user+xml" name="qunying.huang@enstratus.com" href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/task/tasksList.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/task/tasksList.xml b/vcloud-director/src/test/resources/task/tasksList.xml
deleted file mode 100644
index 094e7f7..0000000
--- a/vcloud-director/src/test/resources/task/tasksList.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TasksList xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"
- name="Tasks Lists"
- type="application/vnd.vmware.vcloud.tasksList+xml"
- href="https://vcloudbeta.bluelock.com/api/tasksList/6f312e42-cd2b-488d-a2bb-97519cd57ed0">
- <Task
- status="success"
- startTime="2012-02-07T00:16:28.450-05:00"
- operationName="catalogCreateCatalog"
- operation="Created Catalog QunyingTestCatalog(7212e451-76e1-4631-b2de-ba1dfd8080e4)"
- expiryTime="2012-05-07T00:16:28.450-04:00"
- endTime="2012-02-07T00:16:28.867-05:00"
- name="task"
- id="urn:vcloud:task:5fcd2af3-d0ec-45ce-9451-8c585a2c766b"
- type="application/vnd.vmware.vcloud.task+xml"
- href="https://vcloudbeta.bluelock.com/api/task/5fcd2af3-d0ec-45ce-9451-8c585a2c766b">
- <Owner
- type="application/vnd.vmware.vcloud.catalog+xml"
- name="QunyingTestCatalog"
- href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4" />
- <User
- type="application/vnd.vmware.admin.user+xml"
- name="qunying.huang@enstratus.com"
- href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69" />
- <Organization
- type="application/vnd.vmware.vcloud.org+xml"
- name="JClouds"
- href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0" />
- </Task>
- <Task
- status="success"
- startTime="2012-02-06T17:30:38.507-05:00"
- operationName="jobEnable"
- operation="Enabled User (967d317c-4273-4a95-b8a4-bf63b78e9c69)"
- expiryTime="2012-05-06T17:30:38.507-04:00"
- endTime="2012-02-06T17:30:38.507-05:00"
- name="task"
- id="urn:vcloud:task:bd22e745-9c2a-4f82-a954-0e35b6f76ba5"
- type="application/vnd.vmware.vcloud.task+xml"
- href="https://vcloudbeta.bluelock.com/api/task/bd22e745-9c2a-4f82-a954-0e35b6f76ba5">
- <User
- type="application/vnd.vmware.admin.user+xml"
- name="adrian@jclouds.org"
- href="https://vcloudbeta.bluelock.com/api/admin/user/8c360b93-ed25-4c9a-8e24-d48cd9966d93" />
- <Organization
- type="application/vnd.vmware.vcloud.org+xml"
- name="JClouds"
- href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0" />
- </Task>
-</TasksList>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/user/addUser.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/user/addUser.xml b/vcloud-director/src/test/resources/user/addUser.xml
deleted file mode 100644
index 7736d54..0000000
--- a/vcloud-director/src/test/resources/user/addUser.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<User xmlns="http://www.vmware.com/vcloud/v1.5" name="test" id="urn:vcloud:user:b37223f3-8792-477a-820f-334998f61cd6" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="edit" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"/>
- <FullName>testFullName</FullName>
- <EmailAddress>test@test.com</EmailAddress>
- <Telephone>555-1234</Telephone>
- <IsEnabled>false</IsEnabled>
- <IsLocked>false</IsLocked>
- <IM>testIM</IM>
- <IsAlertEnabled>false</IsAlertEnabled>
- <AlertEmailPrefix>testPrefix</AlertEmailPrefix>
- <AlertEmail>testAlert@test.com</AlertEmail>
- <IsExternal>false</IsExternal>
- <IsDefaultCached>false</IsDefaultCached>
- <IsGroupRole>false</IsGroupRole>
- <StoredVmQuota>0</StoredVmQuota>
- <DeployedVmQuota>0</DeployedVmQuota>
- <Role type="application/vnd.vmware.admin.role+xml" name="vApp User" href="https://vcloudbeta.bluelock.com/api/admin/role/ff1e0c91-1288-3664-82b7-a6fa303af4d1"/>
- <GroupReferences/>
-</User>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/user/addUserSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/user/addUserSource.xml b/vcloud-director/src/test/resources/user/addUserSource.xml
deleted file mode 100644
index f3ff55d..0000000
--- a/vcloud-director/src/test/resources/user/addUserSource.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<User name="test" xmlns="http://www.vmware.com/vcloud/v1.5">
- <FullName>testFullName</FullName>
- <EmailAddress>test@test.com</EmailAddress>
- <Telephone>555-1234</Telephone>
- <IsEnabled>false</IsEnabled>
- <IM>testIM</IM>
- <IsAlertEnabled>false</IsAlertEnabled>
- <AlertEmailPrefix>testPrefix</AlertEmailPrefix>
- <AlertEmail>testAlert@test.com</AlertEmail>
- <IsExternal>false</IsExternal>
- <IsGroupRole>false</IsGroupRole>
- <Role type="application/vnd.vmware.admin.role+xml" name="vApp User" href="https://vcloudbeta.bluelock.com/api/admin/role/ff1e0c91-1288-3664-82b7-a6fa303af4d1"/>
- <Password>password</Password>
- <GroupReferences/>
-</User>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/user/editUser.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/user/editUser.xml b/vcloud-director/src/test/resources/user/editUser.xml
deleted file mode 100644
index 9fe120f..0000000
--- a/vcloud-director/src/test/resources/user/editUser.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<User xmlns="http://www.vmware.com/vcloud/v1.5" name="test" id="urn:vcloud:user:b37223f3-8792-477a-820f-334998f61cd6" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/5fc76423-0380-4a6d-9f52-dffb4ffaa46a" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="edit" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"/>
- <FullName>newtestFullName</FullName>
- <EmailAddress>newtest@test.com</EmailAddress>
- <Telephone>1-555-1234</Telephone>
- <IsEnabled>true</IsEnabled>
- <IsLocked>false</IsLocked>
- <IM>newtestIM</IM>
- <NameInSource>test</NameInSource>
- <IsAlertEnabled>true</IsAlertEnabled>
- <AlertEmailPrefix>newtestPrefix</AlertEmailPrefix>
- <AlertEmail>newtestAlert@test.com</AlertEmail>
- <IsExternal>false</IsExternal>
- <IsDefaultCached>false</IsDefaultCached>
- <IsGroupRole>false</IsGroupRole>
- <StoredVmQuota>1</StoredVmQuota>
- <DeployedVmQuota>1</DeployedVmQuota>
- <Role type="application/vnd.vmware.admin.role+xml" name="vApp User" href="https://vcloudbeta.bluelock.com/api/admin/role/ff1e0c91-1288-3664-82b7-a6fa303af4d1"/>
- <GroupReferences/>
-</User>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/user/editUserSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/user/editUserSource.xml b/vcloud-director/src/test/resources/user/editUserSource.xml
deleted file mode 100644
index 1fd1fc4..0000000
--- a/vcloud-director/src/test/resources/user/editUserSource.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<User name="test" id="urn:vcloud:user:b37223f3-8792-477a-820f-334998f61cd6" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="edit" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"/>
- <FullName>newtestFullName</FullName>
- <EmailAddress>newtest@test.com</EmailAddress>
- <Telephone>1-555-1234</Telephone>
- <IsEnabled>true</IsEnabled>
- <IsLocked>false</IsLocked>
- <IM>newtestIM</IM>
- <NameInSource>test</NameInSource>
- <IsAlertEnabled>true</IsAlertEnabled>
- <AlertEmailPrefix>newtestPrefix</AlertEmailPrefix>
- <AlertEmail>newtestAlert@test.com</AlertEmail>
- <IsExternal>false</IsExternal>
- <IsDefaultCached>false</IsDefaultCached>
- <IsGroupRole>false</IsGroupRole>
- <StoredVmQuota>1</StoredVmQuota>
- <DeployedVmQuota>1</DeployedVmQuota>
- <Role type="application/vnd.vmware.admin.role+xml" name="vApp User" href="https://vcloudbeta.bluelock.com/api/admin/role/ff1e0c91-1288-3664-82b7-a6fa303af4d1"/>
- <Password>newPassword</Password>
- <GroupReferences/>
-</User>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/user/user.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/user/user.xml b/vcloud-director/src/test/resources/user/user.xml
deleted file mode 100644
index 4ee7b3d..0000000
--- a/vcloud-director/src/test/resources/user/user.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<User xmlns="http://www.vmware.com/vcloud/v1.5" name="test" id="urn:vcloud:user:b37223f3-8792-477a-820f-334998f61cd6" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="edit" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/user/b37223f3-8792-477a-820f-334998f61cd6"/>
- <FullName>testFullName</FullName>
- <EmailAddress>test@test.com</EmailAddress>
- <Telephone>555-1234</Telephone>
- <IsEnabled>false</IsEnabled>
- <IsLocked>false</IsLocked>
- <IM>testIM</IM>
- <NameInSource>test</NameInSource>
- <IsAlertEnabled>false</IsAlertEnabled>
- <AlertEmailPrefix>testPrefix</AlertEmailPrefix>
- <AlertEmail>testAlert@test.com</AlertEmail>
- <IsExternal>false</IsExternal>
- <IsDefaultCached>false</IsDefaultCached>
- <IsGroupRole>false</IsGroupRole>
- <StoredVmQuota>0</StoredVmQuota>
- <DeployedVmQuota>0</DeployedVmQuota>
- <Role type="application/vnd.vmware.admin.role+xml" name="vApp User" href="https://vcloudbeta.bluelock.com/api/admin/role/ff1e0c91-1288-3664-82b7-a6fa303af4d1"/>
- <GroupReferences/>
-</User>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapp/vApp.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapp/vApp.xml b/vcloud-director/src/test/resources/vapp/vApp.xml
deleted file mode 100644
index de32d0b..0000000
--- a/vcloud-director/src/test/resources/vapp/vApp.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:ovfenv="http://schemas.dmtf.org/ovf/environment/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" deployed="true" status="4" name="vApp_switbeck_18" id="urn:vcloud:vapp:6ef7767a-9522-4f8a-aa61-772ea1dc3145" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145" 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://www.vmware.com/schema/ovf http://www.vmware.com/schema/ovf http://schemas.dmtf.org/ovf/envelope/1 http://schemas.d
mtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://schemas.dmtf.org/ovf/environment/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8027_1.1.0.xsd http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.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">
- <Link rel="power:powerOff" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/power/action/powerOff"/>
- <Link rel="power:reboot" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/power/action/reboot"/>
- <Link rel="power:reset" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/power/action/reset"/>
- <Link rel="power:shutdown" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/power/action/shutdown"/>
- <Link rel="power:suspend" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/power/action/suspend"/>
- <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/action/deploy"/>
- <Link rel="undeploy" type="application/vnd.vmware.vcloud.undeployVAppParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/action/undeploy"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.vAppNetwork+xml" name="internet01-Cloudsoft" href="https://vcloudbeta.bluelock.com/api/network/d26523dc-3247-4cca-91ba-c1dcd5ff435e"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.vAppNetwork+xml" name="Routed01-Cloudsoft" href="https://vcloudbeta.bluelock.com/api/network/1a44e442-cef9-4e68-94dd-ae9a2e7126d0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/controlAccess/"/>
- <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/action/controlAccess"/>
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://vcloudbeta.bluelock.com/api/vdc/48eccd77-02e8-4c3d-b92d-ed1cb64b9729"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/owner"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/metadata"/>
- <Link rel="ovf" type="text/xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/ovf"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.productSections+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/productSections/"/>
- <Link rel="snapshot:create" type="application/vnd.vmware.vcloud.createSnapshotParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/action/createSnapshot"/>
- <Description/>
- <LeaseSettingsSection type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/leaseSettingsSection/" ovf:required="false">
- <ovf:Info>Lease settings section</ovf:Info>
- <Link rel="edit" type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/leaseSettingsSection/"/>
- <DeploymentLeaseInSeconds>0</DeploymentLeaseInSeconds>
- <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
- </LeaseSettingsSection>
- <ovf:StartupSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/startupSection/" ns12:type="application/vnd.vmware.vcloud.startupSection+xml">
- <ovf:Info>VApp startup section</ovf:Info>
- <ovf:Item ovf:stopDelay="0" ovf:stopAction="powerOff" ovf:startDelay="0" ovf:startAction="powerOn" ovf:order="0" ovf:id="ubuntu"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.startupSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/startupSection/"/>
- </ovf:StartupSection>
- <ovf:NetworkSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/networkSection/" ns12:type="application/vnd.vmware.vcloud.networkSection+xml">
- <ovf:Info>The list of logical networks</ovf:Info>
- <ovf:Network ovf:name="internet01-Cloudsoft">
- <ovf:Description/>
- </ovf:Network>
- <ovf:Network ovf:name="Routed01-Cloudsoft">
- <ovf:Description/>
- </ovf:Network>
- </ovf:NetworkSection>
- <NetworkConfigSection type="application/vnd.vmware.vcloud.networkConfigSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/networkConfigSection/" ovf:required="false">
- <ovf:Info>The configuration parameters for logical networks</ovf:Info>
- <Link rel="edit" type="application/vnd.vmware.vcloud.networkConfigSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/networkConfigSection/"/>
- <NetworkConfig networkName="internet01-Cloudsoft">
- <Link rel="repair" href="https://vcloudbeta.bluelock.com/api/admin/network/d26523dc-3247-4cca-91ba-c1dcd5ff435e/action/reset"/>
- <Description/>
- <Configuration>
- <IpScopes>
- <IpScope>
- <IsInherited>true</IsInherited>
- <Gateway>173.240.104.1</Gateway>
- <Netmask>255.255.255.0</Netmask>
- <Dns1>173.240.111.52</Dns1>
- <Dns2>173.240.111.53</Dns2>
- <IsEnabled>true</IsEnabled>
- <IpRanges>
- <IpRange>
- <StartAddress>173.240.104.128</StartAddress>
- <EndAddress>173.240.104.254</EndAddress>
- </IpRange>
- </IpRanges>
- </IpScope>
- </IpScopes>
- <ParentNetwork name="internet01-Cloudsoft" id="aac5200f-9bd1-4b81-95f4-b8126eec3c96" href="https://vcloudbeta.bluelock.com/api/admin/network/aac5200f-9bd1-4b81-95f4-b8126eec3c96"/>
- <FenceMode>bridged</FenceMode>
- <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
- </Configuration>
- <IsDeployed>true</IsDeployed>
- </NetworkConfig>
- <NetworkConfig networkName="Routed01-Cloudsoft">
- <Link rel="repair" href="https://vcloudbeta.bluelock.com/api/admin/network/1a44e442-cef9-4e68-94dd-ae9a2e7126d0/action/reset"/>
- <Description/>
- <Configuration>
- <IpScopes>
- <IpScope>
- <IsInherited>true</IsInherited>
- <Gateway>192.168.10.1</Gateway>
- <Netmask>255.255.255.0</Netmask>
- <Dns1>173.240.111.52</Dns1>
- <Dns2>173.240.111.53</Dns2>
- <IsEnabled>true</IsEnabled>
- <IpRanges>
- <IpRange>
- <StartAddress>192.168.10.2</StartAddress>
- <EndAddress>192.168.10.254</EndAddress>
- </IpRange>
- </IpRanges>
- </IpScope>
- </IpScopes>
- <ParentNetwork name="Routed01-Cloudsoft" id="47ef6de9-8396-4402-a7a2-61aff52af881" href="https://vcloudbeta.bluelock.com/api/admin/network/47ef6de9-8396-4402-a7a2-61aff52af881"/>
- <FenceMode>bridged</FenceMode>
- <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
- </Configuration>
- <IsDeployed>true</IsDeployed>
- </NetworkConfig>
- </NetworkConfigSection>
- <SnapshotSection type="application/vnd.vmware.vcloud.snapshotSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145/snapshotSection" ovf:required="false">
- <ovf:Info>Snapshot information section</ovf:Info>
- </SnapshotSection>
- <DateCreated>2012-11-15T12:06:24.710-05:00</DateCreated>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="switbeck" href="https://vcloudbeta.bluelock.com/api/admin/user/9d9a4da6-4b54-4797-98d8-068819001c0f"/>
- </Owner>
- <InMaintenanceMode>false</InMaintenanceMode>
- <Children>
- <Vm nestedHypervisorEnabled="false" needsCustomization="false" deployed="true" status="4" name="ubuntu" id="urn:vcloud:vm:dea05479-d7c1-4710-ba1a-a1a18cd0d455" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455">
- <Link rel="power:powerOff" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/powerOff"/>
- <Link rel="power:reboot" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/reboot"/>
- <Link rel="power:reset" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/reset"/>
- <Link rel="power:shutdown" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/shutdown"/>
- <Link rel="power:suspend" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/power/action/suspend"/>
- <Link rel="undeploy" type="application/vnd.vmware.vcloud.undeployVAppParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/undeploy"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.vm+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/metadata"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.productSections+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/productSections/"/>
- <Link rel="screen:thumbnail" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/screen"/>
- <Link rel="screen:acquireTicket" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/screen/action/acquireTicket"/>
- <Link rel="media:insertMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/media/action/insertMedia"/>
- <Link rel="media:ejectMedia" type="application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/media/action/ejectMedia"/>
- <Link rel="disk:attach" type="application/vnd.vmware.vcloud.diskAttachOrDetachParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/disk/action/attach"/>
- <Link rel="disk:detach" type="application/vnd.vmware.vcloud.diskAttachOrDetachParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/disk/action/detach"/>
- <Link rel="installVmwareTools" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/installVMwareTools"/>
- <Link rel="snapshot:create" type="application/vnd.vmware.vcloud.createSnapshotParams+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/createSnapshot"/>
- <Link rel="reconfigureVm" type="application/vnd.vmware.vcloud.vm+xml" name="ubuntu" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/action/reconfigureVm"/>
- <Link rel="up" type="application/vnd.vmware.vcloud.vApp+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vapp-6ef7767a-9522-4f8a-aa61-772ea1dc3145"/>
- <Description/>
- <ovf:VirtualHardwareSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ovf:transport="" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/" ns12: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>ubuntu</vssd:VirtualSystemIdentifier>
- <vssd:VirtualSystemType>vmx-09</vssd:VirtualSystemType>
- </ovf:System>
- <ovf:Item>
- <rasd:Address>00:50:56:0a:02:13</rasd:Address>
- <rasd:AddressOnParent>0</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection ns12:ipAddress="192.168.10.2" ns12:primaryNetworkConnection="false" ns12:ipAddressingMode="POOL">Routed01-Cloudsoft</rasd:Connection>
- <rasd:Description>E1000 ethernet adapter on "Routed01-Cloudsoft"</rasd:Description>
- <rasd:ElementName>Network adapter 0</rasd:ElementName>
- <rasd:InstanceID>1</rasd:InstanceID>
- <rasd:ResourceSubType>E1000</rasd:ResourceSubType>
- <rasd:ResourceType>10</rasd:ResourceType>
- </ovf:Item>
- <ovf:Item>
- <rasd:Address>00:50:56:0a:02:14</rasd:Address>
- <rasd:AddressOnParent>1</rasd:AddressOnParent>
- <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
- <rasd:Connection ns12:ipAddress="173.240.104.172" ns12:primaryNetworkConnection="true" ns12:ipAddressingMode="POOL">internet01-Cloudsoft</rasd:Connection>
- <rasd:Description>E1000 ethernet adapter on "internet01-Cloudsoft"</rasd:Description>
- <rasd:ElementName>Network adapter 1</rasd:ElementName>
- <rasd:InstanceID>2</rasd:InstanceID>
- <rasd:ResourceSubType>E1000</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>3</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 ns12:capacity="8192" ns12:busSubType="lsilogic" ns12:busType="6"/>
- <rasd:InstanceID>2000</rasd:InstanceID>
- <rasd:Parent>3</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>4</rasd:InstanceID>
- <rasd:ResourceType>5</rasd:ResourceType>
- </ovf:Item>
- <ovf:Item>
- <rasd:AddressOnParent>1</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>3000</rasd:InstanceID>
- <rasd:Parent>4</rasd:Parent>
- <rasd:ResourceType>15</rasd:ResourceType>
- </ovf:Item>
- <ovf:Item>
- <rasd:Address>1</rasd:Address>
- <rasd:Description>IDE Controller</rasd:Description>
- <rasd:ElementName>IDE Controller 1</rasd:ElementName>
- <rasd:InstanceID>5</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 2</rasd:ElementName>
- <rasd:HostResource/>
- <rasd:InstanceID>3002</rasd:InstanceID>
- <rasd:Parent>5</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 ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu" ns12: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>6</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://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu"/>
- </ovf:Item>
- <ovf:Item ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml">
- <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
- <rasd:Description>Memory Size</rasd:Description>
- <rasd:ElementName>1024 MB of memory</rasd:ElementName>
- <rasd:InstanceID>7</rasd:InstanceID>
- <rasd:Reservation>0</rasd:Reservation>
- <rasd:ResourceType>4</rasd:ResourceType>
- <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
- <rasd:Weight>0</rasd:Weight>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory"/>
- </ovf:Item>
- <Link rel="edit" type="application/vnd.vmware.vcloud.virtualHardwareSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/cpu"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/memory"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/disks"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/disks"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/media"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/networkCards"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/networkCards"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/serialPorts"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItemsList+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/virtualHardwareSection/serialPorts"/>
- </ovf:VirtualHardwareSection>
- <ovf:OperatingSystemSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ovf:id="94" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/operatingSystemSection/" ns12:type="application/vnd.vmware.vcloud.operatingSystemSection+xml" vmw:osType="ubuntu64Guest">
- <ovf:Info>Specifies the operating system installed</ovf:Info>
- <ovf:Description>Ubuntu Linux (64-bit)</ovf:Description>
- <Link rel="edit" type="application/vnd.vmware.vcloud.operatingSystemSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/operatingSystemSection/"/>
- </ovf:OperatingSystemSection>
- <NetworkConnectionSection type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/networkConnectionSection/" ovf:required="false">
- <ovf:Info>Specifies the available VM network connections</ovf:Info>
- <PrimaryNetworkConnectionIndex>1</PrimaryNetworkConnectionIndex>
- <NetworkConnection network="Routed01-Cloudsoft" needsCustomization="false">
- <NetworkConnectionIndex>0</NetworkConnectionIndex>
- <IpAddress>192.168.10.2</IpAddress>
- <IsConnected>true</IsConnected>
- <MACAddress>00:50:56:0a:02:13</MACAddress>
- <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
- </NetworkConnection>
- <NetworkConnection network="internet01-Cloudsoft" needsCustomization="false">
- <NetworkConnectionIndex>1</NetworkConnectionIndex>
- <IpAddress>173.240.104.172</IpAddress>
- <IsConnected>true</IsConnected>
- <MACAddress>00:50:56:0a:02:14</MACAddress>
- <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
- </NetworkConnection>
- <Link rel="edit" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/networkConnectionSection/"/>
- </NetworkConnectionSection>
- <GuestCustomizationSection type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/guestCustomizationSection/" ovf:required="false">
- <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
- <Enabled>true</Enabled>
- <ChangeSid>false</ChangeSid>
- <VirtualMachineId>dea05479-d7c1-4710-ba1a-a1a18cd0d455</VirtualMachineId>
- <JoinDomainEnabled>false</JoinDomainEnabled>
- <UseOrgSettings>false</UseOrgSettings>
- <AdminPasswordEnabled>true</AdminPasswordEnabled>
- <AdminPasswordAuto>true</AdminPasswordAuto>
- <AdminPassword>A%6kC9pq</AdminPassword>
- <ResetPasswordRequired>false</ResetPasswordRequired>
- <ComputerName>Ubuntu-1110-001</ComputerName>
- <Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/guestCustomizationSection/"/>
- </GuestCustomizationSection>
- <RuntimeInfoSection xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/runtimeInfoSection" ns12:type="application/vnd.vmware.vcloud.virtualHardwareSection+xml">
- <ovf:Info>Specifies Runtime info</ovf:Info>
- <VMWareTools version="9281"/>
- </RuntimeInfoSection>
- <SnapshotSection type="application/vnd.vmware.vcloud.snapshotSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/snapshotSection" ovf:required="false">
- <ovf:Info>Snapshot information section</ovf:Info>
- </SnapshotSection>
- <DateCreated>2012-11-15T12:06:35.120-05:00</DateCreated>
- <VAppScopedLocalId>vm</VAppScopedLocalId>
- <ovfenv:Environment xmlns:ns12="http://www.vmware.com/schema/ovfenv" ovfenv:id="" ns12:vCenterId="vm-1072">
- <ovfenv:PlatformSection>
- <ovfenv:Kind>VMware ESXi</ovfenv:Kind>
- <ovfenv:Version>5.1.0</ovfenv:Version>
- <ovfenv:Vendor>VMware, Inc.</ovfenv:Vendor>
- <ovfenv:Locale>en</ovfenv:Locale>
- </ovfenv:PlatformSection>
- <ovfenv:PropertySection>
- <ovfenv:Property ovfenv:value="None" ovfenv:key="vCloud_UseSysPrep"/>
- <ovfenv:Property ovfenv:value="" ovfenv:key="vCloud_adminPassword"/>
- <ovfenv:Property ovfenv:value="11" ovfenv:key="vCloud_bitMask"/>
- <ovfenv:Property ovfenv:value="static" ovfenv:key="vCloud_bootproto_0"/>
- <ovfenv:Property ovfenv:value="static" ovfenv:key="vCloud_bootproto_1"/>
- <ovfenv:Property ovfenv:value="Ubuntu-1110-001" ovfenv:key="vCloud_computerName"/>
- <ovfenv:Property ovfenv:value="173.240.111.52" ovfenv:key="vCloud_dns1_0"/>
- <ovfenv:Property ovfenv:value="173.240.111.52" ovfenv:key="vCloud_dns1_1"/>
- <ovfenv:Property ovfenv:value="173.240.111.53" ovfenv:key="vCloud_dns2_0"/>
- <ovfenv:Property ovfenv:value="173.240.111.53" ovfenv:key="vCloud_dns2_1"/>
- <ovfenv:Property ovfenv:value="192.168.10.1" ovfenv:key="vCloud_gateway_0"/>
- <ovfenv:Property ovfenv:value="173.240.104.1" ovfenv:key="vCloud_gateway_1"/>
- <ovfenv:Property ovfenv:value="192.168.10.2" ovfenv:key="vCloud_ip_0"/>
- <ovfenv:Property ovfenv:value="173.240.104.172" ovfenv:key="vCloud_ip_1"/>
- <ovfenv:Property ovfenv:value="00:50:56:0a:02:13" ovfenv:key="vCloud_macaddr_0"/>
- <ovfenv:Property ovfenv:value="00:50:56:0a:02:14" ovfenv:key="vCloud_macaddr_1"/>
- <ovfenv:Property ovfenv:value="da0ad29e-1345-47d7-9f4d-d6b9391e7703" ovfenv:key="vCloud_markerid"/>
- <ovfenv:Property ovfenv:value="255.255.255.0" ovfenv:key="vCloud_netmask_0"/>
- <ovfenv:Property ovfenv:value="255.255.255.0" ovfenv:key="vCloud_netmask_1"/>
- <ovfenv:Property ovfenv:value="2" ovfenv:key="vCloud_numnics"/>
- <ovfenv:Property ovfenv:value="1" ovfenv:key="vCloud_primaryNic"/>
- <ovfenv:Property ovfenv:value="308709094" ovfenv:key="vCloud_reconfigToken"/>
- <ovfenv:Property ovfenv:value="0" ovfenv:key="vCloud_resetPassword"/>
- <ovfenv:Property ovfenv:value="" ovfenv:key="vCloud_suffix_0"/>
- <ovfenv:Property ovfenv:value="" ovfenv:key="vCloud_suffix_1"/>
- </ovfenv:PropertySection>
- <ve:EthernetAdapterSection xmlns:ve="http://www.vmware.com/schema/ovfenv" xmlns="http://schemas.dmtf.org/ovf/environment/1" xmlns:oe="http://schemas.dmtf.org/ovf/environment/1">
- <ve:Adapter ve:mac="00:50:56:0a:02:13" ve:network="dvs.VCDVSRouted01-Cloudsoft-cfc25721-2dde-4f8e-9b2e-cdc45f280624" ve:unitNumber="7"/>
- <ve:Adapter ve:mac="00:50:56:0a:02:14" ve:network="pcep_internet_336" ve:unitNumber="8"/>
-
- </ve:EthernetAdapterSection>
- </ovfenv:Environment>
- <VmCapabilities type="application/vnd.vmware.vcloud.vmCapabilitiesSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/vmCapabilities/">
- <Link rel="edit" type="application/vnd.vmware.vcloud.vmCapabilitiesSection+xml" href="https://vcloudbeta.bluelock.com/api/vApp/vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455/vmCapabilities/"/>
- <MemoryHotAddEnabled>true</MemoryHotAddEnabled>
- <CpuHotAddEnabled>true</CpuHotAddEnabled>
- </VmCapabilities>
- <StorageProfile type="application/vnd.vmware.vcloud.vdcStorageProfile+xml" name="*" href="https://vcloudbeta.bluelock.com/api/vdcStorageProfile/ba343e95-c9e2-4da8-b185-6c7410bd920a"/>
- </Vm>
- </Children>
-</VApp>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapp/vAppRebootTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapp/vAppRebootTask.xml b/vcloud-director/src/test/resources/vapp/vAppRebootTask.xml
deleted file mode 100644
index bd60f26..0000000
--- a/vcloud-director/src/test/resources/vapp/vAppRebootTask.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-10-25T13:39:25.380-04:00"
- serviceNamespace="com.vmware.vcloud" operationName="vappReboot"
- operation="Rebooting Virtual Machine damn small(b7e995a7-1468-4873-af39-bc703feefd63)"
- expiryTime="2013-01-23T13:39:25.380-05:00" cancelRequested="false" name="task"
- id="urn:vcloud:task:5bc25a1b-79cb-4904-b53f-4ca09088e434" type="application/vnd.vmware.vcloud.task+xml"
- href="https://vcloudbeta.bluelock.com/api/task/5bc25a1b-79cb-4904-b53f-4ca09088e434"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/5bc25a1b-79cb-4904-b53f-4ca09088e434/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.vm+xml" name="foo" href="https://vcloudbeta.bluelock.com/api/vApp/vm-b7e995a7-1468-4873-af39-bc703feefd63"/>
- <User type="application/vnd.vmware.admin.user+xml" name="switbeck" href="https://vcloudbeta.bluelock.com/api/admin/user/9d9a4da6-4b54-4797-98d8-068819001c0f"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="jclouds" href="https://vcloudbeta.bluelock.com/api/org/4559b367-8af2-4ee1-8429-a0d39e7df3de"/>
- <Progress>0</Progress>
- <Details/>
-</Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/customizationSection.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/customizationSection.xml b/vcloud-director/src/test/resources/vapptemplate/customizationSection.xml
deleted file mode 100644
index 0856939..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/customizationSection.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CustomizationSection xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
- type="application/vnd.vmware.vcloud.customizationSection+xml"
- href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/customizationSection/"
- ovf:required="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <ovf:Info>VApp template customization section</ovf:Info>
- <CustomizeOnInstantiate>true</CustomizeOnInstantiate>
- <Link rel="edit" type="application/vnd.vmware.vcloud.customizationSection+xml"
- href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/customizationSection/"/>
-</CustomizationSection>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/error400.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/error400.xml b/vcloud-director/src/test/resources/vapptemplate/error400.xml
deleted file mode 100644
index 79e7de7..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/error400.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="BAD_REQUEST"
- message="validation error : EntityRef has incorrect type, expected type is com.vmware.vcloud.entity.vm,com.vmware.vcloud.entity.vapp,com.vmware.vcloud.entity.vapptemplate,com.vmware.vcloud.entity.media."
- majorErrorCode="400" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/error403.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/error403.xml b/vcloud-director/src/test/resources/vapptemplate/error403.xml
deleted file mode 100644
index 7b76031..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/error403.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN"
- message="Access is forbidden" majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/guestCustomizationSection.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/guestCustomizationSection.xml b/vcloud-director/src/test/resources/vapptemplate/guestCustomizationSection.xml
deleted file mode 100644
index 8b92156..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/guestCustomizationSection.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<GuestCustomizationSection type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
- href="http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-12/guestCustomizationSection/"
- xmlns="http://www.vmware.com/vcloud/v1.5"
- xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
- ovf:required="false">
- <ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
- <Enabled>false</Enabled>
- <ChangeSid>false</ChangeSid>
- <VirtualMachineId>4</VirtualMachineId>
- <JoinDomainEnabled>false</JoinDomainEnabled>
- <UseOrgSettings>false</UseOrgSettings>
- <AdminPasswordEnabled>false</AdminPasswordEnabled>
- <AdminPasswordAuto>true</AdminPasswordAuto>
- <ResetPasswordRequired>false</ResetPasswordRequired>
- <CustomizationScript>ls</CustomizationScript>
- <ComputerName>ubuntu10-x86</ComputerName>
- <Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml"
- href="http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-12/guestCustomizationSection/"/>
-</GuestCustomizationSection>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/leaseSettingsSection.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/leaseSettingsSection.xml b/vcloud-director/src/test/resources/vapptemplate/leaseSettingsSection.xml
deleted file mode 100644
index 75d8021..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/leaseSettingsSection.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<LeaseSettingsSection type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" href="http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-7/leaseSettingsSection/" ovf:required="false" xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
- <ovf:Info>VApp lease settings</ovf:Info>
- <Link rel="edit" type="application/vnd.vmware.vcloud.leaseSettingsSection+xml" href="http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-7/leaseSettingsSection/"/>
- <DeploymentLeaseInSeconds>3600</DeploymentLeaseInSeconds>
- <StorageLeaseInSeconds>3600</StorageLeaseInSeconds>
- <DeploymentLeaseExpiration>2010-01-21T21:50:59.764-08:00</DeploymentLeaseExpiration>
-</LeaseSettingsSection>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/metadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/metadata.xml b/vcloud-director/src/test/resources/vapptemplate/metadata.xml
deleted file mode 100644
index e977424..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.vAppTemplate+xml" href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"/>
- <MetadataEntry>
- <Key>key</Key>
- <Value>value</Value>
- </MetadataEntry>
-</Metadata>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/metadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/metadataValue.xml b/vcloud-director/src/test/resources/vapptemplate/metadataValue.xml
deleted file mode 100644
index df6649a..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/metadataValue.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5">
- <Value>some value</Value>
-</MetadataValue>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/networkConfigSection.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/networkConfigSection.xml b/vcloud-director/src/test/resources/vapptemplate/networkConfigSection.xml
deleted file mode 100644
index 541a99b..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/networkConfigSection.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<NetworkConfigSection
- xmlns="http://www.vmware.com/vcloud/v1.5"
- xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1">
- <ovf:Info>Configuration parameters for logical networks</ovf:Info>
- <NetworkConfig networkName="vAppNetwork">
- <Configuration>
- <IpScope>
- <IsInherited>false</IsInherited>
- <Gateway>10.147.56.253</Gateway>
- <Netmask>255.255.255.0</Netmask>
- <Dns1>10.147.115.1</Dns1>
- <Dns2>10.147.115.2</Dns2>
- <DnsSuffix>example.com</DnsSuffix>
- <IpRanges>
- <IpRange>
- <StartAddress>10.147.56.1</StartAddress>
- <EndAddress>10.147.56.1</EndAddress>
- </IpRange>
- </IpRanges>
- </IpScope>
- <ParentNetwork type="application/vnd.vmware.vcloud.network+xml" name="Internet"
- href="http://vcloud.example.com/api/v1.0/network/54"/>
- <FenceMode>natRouted</FenceMode>
- <Features>
- <FirewallService>
- <IsEnabled>true</IsEnabled>
- <FirewallRule>
- <IsEnabled>true</IsEnabled>
- <Description>FTP Rule</Description>
- <Policy>allow</Policy>
- <Protocols>
- <Tcp>true</Tcp>
- </Protocols>
- <Port>21</Port>
- <DestinationIp>10.147.115.1</DestinationIp>
- </FirewallRule>
- <FirewallRule>
- <IsEnabled>true</IsEnabled>
- <Description>SSH Rule</Description>
- <Policy>allow</Policy>
- <Protocols>
- <Tcp>true</Tcp>
- </Protocols>
- <Port>22</Port>
- <DestinationIp>10.147.115.1</DestinationIp>
- </FirewallRule>
- </FirewallService>
- <NatService>
- <IsEnabled>true</IsEnabled>
- <NatType>ipTranslation</NatType>
- <Policy>allowTraffic</Policy>
- <NatRule>
- <OneToOneVmRule>
- <MappingMode>manual</MappingMode>
- <ExternalIpAddress>64.100.10.1</ExternalIpAddress>
- <VAppScopedVmId>20ea086f-1a6a-4fb2-8e2e-23372facf7de</VAppScopedVmId>
- <VmNicId>0</VmNicId>
- </OneToOneVmRule>
- </NatRule>
- </NatService>
- </Features>
- </Configuration>
- </NetworkConfig>
-</NetworkConfigSection>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/relocateParams.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/relocateParams.xml b/vcloud-director/src/test/resources/vapptemplate/relocateParams.xml
deleted file mode 100644
index 175bb37..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/relocateParams.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelocateParams
- xmlns="http://www.vmware.com/vcloud/v1.5">
- <Datastore
- href="https://vcloud.example.com/api/admin/extension/datastore/607"/>
-</RelocateParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vapptemplate/vAppTemplate.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vapptemplate/vAppTemplate.xml b/vcloud-director/src/test/resources/vapptemplate/vAppTemplate.xml
deleted file mode 100644
index 98bbd23..0000000
--- a/vcloud-director/src/test/resources/vapptemplate/vAppTemplate.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VAppTemplate xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
- ovfDescriptorUploaded="true" goldMaster="false" status="-1" name="ubuntu10"
- id="urn:vcloud:vapptemplate:ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"
- type="application/vnd.vmware.vcloud.vAppTemplate+xml"
- href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml"
- href="https://vcloudbeta.bluelock.com/api/vdc/d16d333b-e3c0-4176-845d-a5ee6392df07"/>
- <Link rel="remove"
- href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"/>
- <Description>For testing</Description>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="x@jclouds.org"
- href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"/>
- </Owner>
- <Children/>
- <LeaseSettingsSection type="application/vnd.vmware.vcloud.leaseSettingsSection+xml"
- href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/leaseSettingsSection/"
- ovf:required="false">
- <ovf:Info>Lease settings section</ovf:Info>
- <Link rel="edit" type="application/vnd.vmware.vcloud.leaseSettingsSection+xml"
- href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/leaseSettingsSection/"/>
- <StorageLeaseInSeconds>0</StorageLeaseInSeconds>
- </LeaseSettingsSection>
- <CustomizationSection type="application/vnd.vmware.vcloud.customizationSection+xml"
- href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/customizationSection/"
- ovf:required="false">
- <ovf:Info>VApp template customization section</ovf:Info>
- <CustomizeOnInstantiate>true</CustomizeOnInstantiate>
- </CustomizationSection>
-</VAppTemplate>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vdc/admin/vdc.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vdc/admin/vdc.xml b/vcloud-director/src/test/resources/vdc/admin/vdc.xml
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vdc/error400.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vdc/error400.xml b/vcloud-director/src/test/resources/vdc/error400.xml
deleted file mode 100644
index 7d7c18b..0000000
--- a/vcloud-director/src/test/resources/vdc/error400.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="BAD_REQUEST" message="validation error : EntityRef has incorrect type, expected type is com.vmware.vcloud.entity.vdc." majorErrorCode="400" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vdc/error403-fake.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vdc/error403-fake.xml b/vcloud-director/src/test/resources/vdc/error403-fake.xml
deleted file mode 100644
index a3f2be1..0000000
--- a/vcloud-director/src/test/resources/vdc/error403-fake.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity "com.vmware.vcloud.entity.vdc:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/vdc/instantiateVApp.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/vdc/instantiateVApp.xml b/vcloud-director/src/test/resources/vdc/instantiateVApp.xml
deleted file mode 100644
index 052334f..0000000
--- a/vcloud-director/src/test/resources/vdc/instantiateVApp.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VApp xmlns="http://www.vmware.com/vcloud/v1.5" deployed="false" status="0" name="test-vapp" id="urn:vcloud:vapp:d0e2b6b9-4381-4ddc-9572-cdfae54059be" type="application/vnd.vmware.vcloud.vApp+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="down" type="application/vnd.vmware.vcloud.vAppNetwork+xml" name="orgNet-cloudsoft-External" href="https://mycloud.greenhousedata.com/api/network/2a2e2da4-446a-4ebc-a086-06df7c9570f0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/controlAccess/"/>
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/owner"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/metadata"/>
- <Description>Test VApp</Description>
- <Tasks>
- <Task status="running" startTime="2012-03-12T10:41:22.060-06:00" operationName="vdcInstantiateVapp" operation="Creating Virtual Application test-vapp(d0e2b6b9-4381-4ddc-9572-cdfae54059be)" expiryTime="2012-06-10T10:41:22.060-06:00" name="task" id="urn:vcloud:task:2e458266-e70a-4860-bcb7-302fac12b6a3" type="application/vnd.vmware.vcloud.task+xml" href="https://mycloud.greenhousedata.com/api/task/2e458266-e70a-4860-bcb7-302fac12b6a3">
- <Link rel="task:cancel" href="https://mycloud.greenhousedata.com/api/task/2e458266-e70a-4860-bcb7-302fac12b6a3/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.vApp+xml" name="test-vapp" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
- <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="cloudsoft" href="https://mycloud.greenhousedata.com/api/org/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
- <Progress>1</Progress>
- </Task>
- </Tasks>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
- </Owner>
- <InMaintenanceMode>false</InMaintenanceMode>
-</VApp>
[03/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/mergeMetadataTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/mergeMetadataTask.xml b/vcloud-director/src/test/resources/catalog/mergeMetadataTask.xml
deleted file mode 100644
index bc7beb6..0000000
--- a/vcloud-director/src/test/resources/catalog/mergeMetadataTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="metadataUpdate" operation="Updating metadata for Catalog Item (a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.catalogItem+xml" name="" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/newCatalogItem.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/newCatalogItem.xml b/vcloud-director/src/test/resources/catalog/newCatalogItem.xml
deleted file mode 100644
index d434d4f..0000000
--- a/vcloud-director/src/test/resources/catalog/newCatalogItem.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<CatalogItem name="newCatalogItem" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Description>New Catalog Item</Description>
- <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"/>
-</CatalogItem>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/removeMetadataEntryTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/removeMetadataEntryTask.xml b/vcloud-director/src/test/resources/catalog/removeMetadataEntryTask.xml
deleted file mode 100644
index 1968b62..0000000
--- a/vcloud-director/src/test/resources/catalog/removeMetadataEntryTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="metadataDelete" operation="Deleting metadata for Catalog Item (a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.catalogItem+xml" name="" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/setCatalogItemMetadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/setCatalogItemMetadataValue.xml b/vcloud-director/src/test/resources/catalog/setCatalogItemMetadataValue.xml
deleted file mode 100644
index 2032bf5..0000000
--- a/vcloud-director/src/test/resources/catalog/setCatalogItemMetadataValue.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5">
- <Value>KITTENS</Value>
-</MetadataValue>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/setMetadataValueTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/setMetadataValueTask.xml b/vcloud-director/src/test/resources/catalog/setMetadataValueTask.xml
deleted file mode 100644
index 6596608..0000000
--- a/vcloud-director/src/test/resources/catalog/setMetadataValueTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="metadataSet" operation="Setting metadata for Catalog Item (a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.catalogItem+xml" name="" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/group/editGroup.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/group/editGroup.xml b/vcloud-director/src/test/resources/group/editGroup.xml
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/group/editGroupSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/group/editGroupSource.xml b/vcloud-director/src/test/resources/group/editGroupSource.xml
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/group/group.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/group/group.xml b/vcloud-director/src/test/resources/group/group.xml
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/logback.xml b/vcloud-director/src/test/resources/logback.xml
deleted file mode 100644
index 4c97319..0000000
--- a/vcloud-director/src/test/resources/logback.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<configuration scan="false">
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-wire.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="COMPUTEFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-compute.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="SSHFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-ssh.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="API" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/api.log</file>
-
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%m%n</Pattern>
- </layout>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d %-5p [%c] %m%n</Pattern>
- </layout>
- </appender>
-
- <root>
- <level value="warn" />
- </root>
-
- <logger name="org.jclouds">
- <level value="DEBUG" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="jclouds.wire">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.headers">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.compute">
- <level value="DEBUG" />
- <appender-ref ref="COMPUTEFILE" />
- </logger>
-
- <logger name="jclouds.ssh">
- <level value="DEBUG" />
- <appender-ref ref="SSHFILE" />
- </logger>
-
- <logger name="jclouds.vcloud.api">
- <level value="INFO" />
- <appender-ref ref="API" />
- <appender-ref ref="STDOUT" />
- </logger>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/addMedia.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/addMedia.xml b/vcloud-director/src/test/resources/media/addMedia.xml
deleted file mode 100644
index 0fb95ac..0000000
--- a/vcloud-director/src/test/resources/media/addMedia.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Media xmlns="http://www.vmware.com/vcloud/v1.5" size="0" imageType="iso" status="0" name="Test media 1" id="urn:vcloud:media:d51b0b9d-099c-499f-97f8-4fbe40ba06d7" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/d51b0b9d-099c-499f-97f8-4fbe40ba06d7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
- <Link rel="remove" href="https://mycloud.greenhousedata.com/api/media/d51b0b9d-099c-499f-97f8-4fbe40ba06d7"/>
- <Description>Test media generated by testCreateMedia()</Description>
- <Files>
- <File size="0" bytesTransferred="0" name="file">
- <Link rel="upload:default" href="https://mycloud.greenhousedata.com:443/transfer/b1fdf2d0-feff-4414-a8d1-3a8d86c4ccc5/file"/>
- </File>
- </Files>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
- </Owner>
-</Media>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/addMediaSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/addMediaSource.xml b/vcloud-director/src/test/resources/media/addMediaSource.xml
deleted file mode 100644
index 6fe96c7..0000000
--- a/vcloud-director/src/test/resources/media/addMediaSource.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Media size="0" imageType="iso" name="Test media 1" type="application/vnd.vmware.vcloud.media+xml" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Description>Test media generated by testCreateMedia()</Description>
-</Media>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/cloneMedia.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/cloneMedia.xml b/vcloud-director/src/test/resources/media/cloneMedia.xml
deleted file mode 100644
index e7e64cb..0000000
--- a/vcloud-director/src/test/resources/media/cloneMedia.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Media xmlns="http://www.vmware.com/vcloud/v1.5" size="175163392" imageType="iso" status="0" name="copied test media-copy-671136ae-b8f0-4389-bca6-50e9c42268f2" id="urn:vcloud:media:a6b023f2-7f90-4e89-a24d-56e0eba83a5a" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/a6b023f2-7f90-4e89-a24d-56e0eba83a5a" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
- <Link rel="remove" href="https://mycloud.greenhousedata.com/api/media/a6b023f2-7f90-4e89-a24d-56e0eba83a5a"/>
- <Description>copied by testCloneMedia()</Description>
- <Tasks>
- <Task status="running" startTime="2012-03-02T04:58:48.754-07:00" operationName="vdcCopyMedia" operation="Copying Media File copied test media-copy-671136ae-b8f0-4389-bca6-50e9c42268f2(a6b023f2-7f90-4e89-a24d-56e0eba83a5a)" expiryTime="2012-05-31T04:58:48.754-06:00" name="task" id="urn:vcloud:task:7e4f6baf-7ef0-43ea-93cc-62cc329afb5d" type="application/vnd.vmware.vcloud.task+xml" href="https://mycloud.greenhousedata.com/api/task/7e4f6baf-7ef0-43ea-93cc-62cc329afb5d">
- <Link rel="task:cancel" href="https://mycloud.greenhousedata.com/api/task/7e4f6baf-7ef0-43ea-93cc-62cc329afb5d/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.media+xml" name="copied test media-copy-671136ae-b8f0-4389-bca6-50e9c42268f2" href="https://mycloud.greenhousedata.com/api/media/a6b023f2-7f90-4e89-a24d-56e0eba83a5a"/>
- <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="cloudsoft" href="https://mycloud.greenhousedata.com/api/org/c076f90a-397a-49fa-89b8-b294c1599cd0"/>
- </Task>
- </Tasks>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
- </Owner>
-</Media>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/cloneMediaParams.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/cloneMediaParams.xml b/vcloud-director/src/test/resources/media/cloneMediaParams.xml
deleted file mode 100644
index fa767b0..0000000
--- a/vcloud-director/src/test/resources/media/cloneMediaParams.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<CloneMediaParams name="moved test media" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Description>moved by testCloneMedia()</Description>
- <Source type="application/vnd.vmware.vcloud.media+xml" name="copied test media" href="https://mycloud.greenhousedata.com/api/media/da8361af-cccd-4103-a71c-493513c49094"/>
- <IsSourceDelete>false</IsSourceDelete>
-</CloneMediaParams>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/editMedia.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/editMedia.xml b/vcloud-director/src/test/resources/media/editMedia.xml
deleted file mode 100644
index 62b5ef6..0000000
--- a/vcloud-director/src/test/resources/media/editMedia.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Media size="175163392" imageType="iso" status="1" name="new testMedia1" id="urn:vcloud:media:c93e5cdc-f29a-4749-8ed2-093df04cc75e" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
- <Link rel="catalogItem" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://mycloud.greenhousedata.com/api/catalogItem/1b317eb9-0e25-429a-ada2-3c7a74a0367b"/>
- <Link rel="remove" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/owner"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"/>
- <Description>new test description</Description>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="dan" href="https://mycloud.greenhousedata.com/api/admin/user/7818d31c-df33-4d77-9bbc-0a0741cf3d44"/>
- </Owner>
-</Media>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/editMediaTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/editMediaTask.xml b/vcloud-director/src/test/resources/media/editMediaTask.xml
deleted file mode 100644
index 9f8c0af..0000000
--- a/vcloud-director/src/test/resources/media/editMediaTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="mediaUpdate" operation="Updating Media (794eb334-754e-4917-b5a0-5df85cbd61d1)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.media+xml" name="" href="https://vcloudbeta.bluelock.com/api/media794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/error400.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/error400.xml b/vcloud-director/src/test/resources/media/error400.xml
deleted file mode 100644
index 981f249..0000000
--- a/vcloud-director/src/test/resources/media/error400.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="BAD_REQUEST" message="validation error on field 'id': String value has invalid format or length" majorErrorCode="400" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/error403-catalog.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/error403-catalog.xml b/vcloud-director/src/test/resources/media/error403-catalog.xml
deleted file mode 100644
index f1f0b7f..0000000
--- a/vcloud-director/src/test/resources/media/error403-catalog.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity "(com.vmware.vcloud.entity.media:e9cd3387-ac57-4d27-a481-9bee75e0690f)"." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/error403-fake.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/error403-fake.xml b/vcloud-director/src/test/resources/media/error403-fake.xml
deleted file mode 100644
index 3b582f3..0000000
--- a/vcloud-director/src/test/resources/media/error403-fake.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity "(com.vmware.vcloud.entity.media:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee)"." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/media.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/media.xml b/vcloud-director/src/test/resources/media/media.xml
deleted file mode 100644
index cf0caa5..0000000
--- a/vcloud-director/src/test/resources/media/media.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Media xmlns="http://www.vmware.com/vcloud/v1.5" size="175163392" imageType="iso" status="1" name="DansTestMedia" id="urn:vcloud:media:794eb334-754e-4917-b5a0-5df85cbd61d1" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
- <Link rel="catalogItem" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://mycloud.greenhousedata.com/api/catalogItem/1979d680-304e-4118-9283-9210c3b3ed8d"/>
- <Link rel="remove" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1/owner"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata"/>
- <Description>Windows 2003 R2 Disk2 Standard 32bit & 64bit</Description>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
- </Owner>
-</Media>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/mergeMetadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/mergeMetadata.xml b/vcloud-director/src/test/resources/media/mergeMetadata.xml
deleted file mode 100644
index c61ddcd..0000000
--- a/vcloud-director/src/test/resources/media/mergeMetadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Metadata type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="up" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"/>
- <MetadataEntry type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"/>
- <Link rel="remove" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"/>
- <Key>key</Key>
- <Value>value</Value>
- </MetadataEntry>
-</Metadata>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/mergeMetadataTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/mergeMetadataTask.xml b/vcloud-director/src/test/resources/media/mergeMetadataTask.xml
deleted file mode 100644
index fb74747..0000000
--- a/vcloud-director/src/test/resources/media/mergeMetadataTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="metadataUpdate" operation="Updating metadata for Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.media+xml" name="" href="https://vcloudbeta.bluelock.com/api/media794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/metadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/metadata.xml b/vcloud-director/src/test/resources/media/metadata.xml
deleted file mode 100644
index 838f7b7..0000000
--- a/vcloud-director/src/test/resources/media/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"/>
- <MetadataEntry type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"/>
- <Link rel="remove" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"/>
- <Key>key</Key>
- <Value>value</Value>
- </MetadataEntry>
-</Metadata>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/metadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/metadataValue.xml b/vcloud-director/src/test/resources/media/metadataValue.xml
deleted file mode 100644
index ccc04ea..0000000
--- a/vcloud-director/src/test/resources/media/metadataValue.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"/>
- <Link rel="remove" href="https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"/>
- <Value>value</Value>
-</MetadataValue>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/owner.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/owner.xml b/vcloud-director/src/test/resources/media/owner.xml
deleted file mode 100644
index fe6c422..0000000
--- a/vcloud-director/src/test/resources/media/owner.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Owner xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.owner+xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
-</Owner>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/removeMediaTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/removeMediaTask.xml b/vcloud-director/src/test/resources/media/removeMediaTask.xml
deleted file mode 100644
index 7fde5f0..0000000
--- a/vcloud-director/src/test/resources/media/removeMediaTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="vdcDeleteMedia" operation="Deleting Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.media+xml" name="" href="https://vcloudbeta.bluelock.com/api/media794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/removeMetadataEntryTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/removeMetadataEntryTask.xml b/vcloud-director/src/test/resources/media/removeMetadataEntryTask.xml
deleted file mode 100644
index 2d258bf..0000000
--- a/vcloud-director/src/test/resources/media/removeMetadataEntryTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="metadataDelete" operation="Deleting metadata for Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.media+xml" name="" href="https://vcloudbeta.bluelock.com/api/media794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/setMetadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/setMetadataValue.xml b/vcloud-director/src/test/resources/media/setMetadataValue.xml
deleted file mode 100644
index 275e5b4..0000000
--- a/vcloud-director/src/test/resources/media/setMetadataValue.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5">
- <Value>value</Value>
-</MetadataValue>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/setMetadataValueTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/setMetadataValueTask.xml b/vcloud-director/src/test/resources/media/setMetadataValueTask.xml
deleted file mode 100644
index 459e78a..0000000
--- a/vcloud-director/src/test/resources/media/setMetadataValueTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-02-13T06:35:08.011-05:00" operationName="metadataUpdate" operation="Updating metadata for Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)" expiryTime="2012-05-13T06:35:08.011-04:00" name="task" id="urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.media+xml" name="" href="https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"/>
- <User type="application/vnd.vmware.admin.user+xml" name="dan@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/media/test.iso
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/media/test.iso b/vcloud-director/src/test/resources/media/test.iso
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/admin/editNetworkSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/admin/editNetworkSource.xml b/vcloud-director/src/test/resources/network/admin/editNetworkSource.xml
deleted file mode 100644
index 41363dc..0000000
--- a/vcloud-director/src/test/resources/network/admin/editNetworkSource.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<OrgNetwork name="ilsolation01-Jclouds" id="urn:vcloud:network:f3ba8256-6f48-4512-aad6-600e85b4dc38" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38/metadata"/>
- <Description></Description>
- <Configuration>
- <IpScope>
- <IsInherited>false</IsInherited>
- <Gateway>192.168.1.1</Gateway>
- <Netmask>255.255.255.0</Netmask>
- <Dns1>173.240.111.52</Dns1>
- <Dns2>173.240.111.53</Dns2>
- <IpRanges>
- <IpRange>
- <StartAddress>192.168.1.100</StartAddress>
- <EndAddress>192.168.1.199</EndAddress>
- </IpRange>
- </IpRanges>
- </IpScope>
- <FenceMode>isolated</FenceMode>
- <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
- <Features>
- <DhcpService>
- <IsEnabled>false</IsEnabled>
- <DefaultLeaseTime>3600</DefaultLeaseTime>
- <MaxLeaseTime>7200</MaxLeaseTime>
- <IpRange>
- <StartAddress>192.168.1.2</StartAddress>
- <EndAddress>192.168.1.99</EndAddress>
- </IpRange>
- </DhcpService>
- </Features>
- <SyslogServerSettings/>
- </Configuration>
- <AllowedExternalIpAddresses/>
-</OrgNetwork>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/admin/editNetworkTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/admin/editNetworkTask.xml b/vcloud-director/src/test/resources/network/admin/editNetworkTask.xml
deleted file mode 100644
index 8b34d1e..0000000
--- a/vcloud-director/src/test/resources/network/admin/editNetworkTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-03-14T12:39:23.720-04:00" operationName="networkUpdateNetwork" operation="Updating Network ilsolation01-Jclouds(f3ba8256-6f48-4512-aad6-600e85b4dc38)" expiryTime="2012-06-12T12:39:23.720-04:00" name="task" id="urn:vcloud:task:49d2e180-7921-4902-ac39-b4ff5406bb94" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.network+xml" name="ilsolation01-Jclouds" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"/>
- <User type="application/vnd.vmware.admin.user+xml" name="dan@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/admin/orgNetwork.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/admin/orgNetwork.xml b/vcloud-director/src/test/resources/network/admin/orgNetwork.xml
deleted file mode 100644
index acf99d1..0000000
--- a/vcloud-director/src/test/resources/network/admin/orgNetwork.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1.5" name="ilsolation01-Jclouds" id="urn:vcloud:network:f3ba8256-6f48-4512-aad6-600e85b4dc38" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://vcloudbeta.bluelock.com/api/admin/network/f3ba8256-6f48-4512-aad6-600e85b4dc38" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="alternate" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"/>
- <Link rel="edit" type="application/vnd.vmware.admin.orgNetwork+xml" href="https://vcloudbeta.bluelock.com/api/admin/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"/>
- <Link rel="up" type="application/vnd.vmware.admin.organization+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="repair" type="application/vnd.vmware.admin.orgNetwork+xml" href="https://vcloudbeta.bluelock.com/api/admin/network/f3ba8256-6f48-4512-aad6-600e85b4dc38/action/reset"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/admin/network/f3ba8256-6f48-4512-aad6-600e85b4dc38/metadata"/>
- <Description/>
- <Configuration>
- <IpScope>
- <IsInherited>false</IsInherited>
- <Gateway>192.168.1.1</Gateway>
- <Netmask>255.255.255.0</Netmask>
- <Dns1>173.240.111.52</Dns1>
- <Dns2>173.240.111.53</Dns2>
- <IpRanges>
- <IpRange>
- <StartAddress>192.168.1.100</StartAddress>
- <EndAddress>192.168.1.199</EndAddress>
- </IpRange>
- </IpRanges>
- </IpScope>
- <FenceMode>isolated</FenceMode>
- <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
- <Features>
- <DhcpService>
- <IsEnabled>false</IsEnabled>
- <DefaultLeaseTime>3600</DefaultLeaseTime>
- <MaxLeaseTime>7200</MaxLeaseTime>
- <IpRange>
- <StartAddress>192.168.1.2</StartAddress>
- <EndAddress>192.168.1.99</EndAddress>
- </IpRange>
- </DhcpService>
- </Features>
- <SyslogServerSettings/>
- </Configuration>
- <NetworkPool type="application/vnd.vmware.admin.networkPool+xml" name="vcdni01" href="https://vcloudbeta.bluelock.com/api/admin/extension/networkPool/e86bfdb5-b3e0-4ece-9125-e764ac64c95c"/>
- <AllowedExternalIpAddresses/>
-</OrgNetwork>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/admin/resetNetworkTask.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/admin/resetNetworkTask.xml b/vcloud-director/src/test/resources/network/admin/resetNetworkTask.xml
deleted file mode 100644
index 16dbd18..0000000
--- a/vcloud-director/src/test/resources/network/admin/resetNetworkTask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Task xmlns="http://www.vmware.com/vcloud/v1.5" status="running" startTime="2012-03-14T12:39:23.720-04:00" operationName="networkResetNetwork" operation="Resetting Network ilsolation01-Jclouds(f3ba8256-6f48-4512-aad6-600e85b4dc38)" expiryTime="2012-06-12T12:39:23.720-04:00" name="task" id="urn:vcloud:task:49d2e180-7921-4902-ac39-b4ff5406bb94" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.network+xml" name="ilsolation01-Jclouds" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"/>
- <User type="application/vnd.vmware.admin.user+xml" name="dan@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</Task>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/error400.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/error400.xml b/vcloud-director/src/test/resources/network/error400.xml
deleted file mode 100644
index 4013d6f..0000000
--- a/vcloud-director/src/test/resources/network/error400.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="BAD_REQUEST" message="validation error : EntityRef has incorrect type, expected type is com.vmware.vcloud.entity.network." majorErrorCode="400" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/error403-catalog.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/error403-catalog.xml b/vcloud-director/src/test/resources/network/error403-catalog.xml
deleted file mode 100644
index 38c9085..0000000
--- a/vcloud-director/src/test/resources/network/error403-catalog.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="This operation is denied." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/error403-fake.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/error403-fake.xml b/vcloud-director/src/test/resources/network/error403-fake.xml
deleted file mode 100644
index 38c9085..0000000
--- a/vcloud-director/src/test/resources/network/error403-fake.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="This operation is denied." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/metadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/metadata.xml b/vcloud-director/src/test/resources/network/metadata.xml
deleted file mode 100644
index 9476027..0000000
--- a/vcloud-director/src/test/resources/network/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.network+xml" href="https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c"/>
- <MetadataEntry>
- <Key>key</Key>
- <Value>value</Value>
- </MetadataEntry>
-</Metadata>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/metadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/metadataValue.xml b/vcloud-director/src/test/resources/network/metadataValue.xml
deleted file mode 100644
index a9b0461..0000000
--- a/vcloud-director/src/test/resources/network/metadataValue.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5" href="https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c/metadata/key" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c/metadata"/>
- <Value>value</Value>
-</MetadataValue>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/network/network.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/network/network.xml b/vcloud-director/src/test/resources/network/network.xml
deleted file mode 100644
index d1ef57e..0000000
--- a/vcloud-director/src/test/resources/network/network.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1.5" name="ilsolation01-Jclouds" id="urn:vcloud:network:f3ba8256-6f48-4512-aad6-600e85b4dc38" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38/metadata"/>
- <Description/>
- <Configuration>
- <IpScope>
- <IsInherited>false</IsInherited>
- <Gateway>192.168.1.1</Gateway>
- <Netmask>255.255.255.0</Netmask>
- <Dns1>173.240.111.52</Dns1>
- <Dns2>173.240.111.53</Dns2>
- <IpRanges>
- <IpRange>
- <StartAddress>192.168.1.100</StartAddress>
- <EndAddress>192.168.1.199</EndAddress>
- </IpRange>
- </IpRanges>
- </IpScope>
- <FenceMode>isolated</FenceMode>
- <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
- <Features>
- <DhcpService>
- <IsEnabled>false</IsEnabled>
- <DefaultLeaseTime>3600</DefaultLeaseTime>
- <MaxLeaseTime>7200</MaxLeaseTime>
- <IpRange>
- <StartAddress>192.168.1.2</StartAddress>
- <EndAddress>192.168.1.99</EndAddress>
- </IpRange>
- </DhcpService>
- </Features>
- <SyslogServerSettings/>
- </Configuration>
- <AllowedExternalIpAddresses/>
-</OrgNetwork>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/editEmailSettings.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/editEmailSettings.xml b/vcloud-director/src/test/resources/org/admin/editEmailSettings.xml
deleted file mode 100644
index c48af09..0000000
--- a/vcloud-director/src/test/resources/org/admin/editEmailSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgEmailSettings xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"/>
- <IsDefaultSmtpServer>false</IsDefaultSmtpServer>
- <IsDefaultOrgEmail>false</IsDefaultOrgEmail>
- <FromEmailAddress>test@test.com</FromEmailAddress>
- <DefaultSubjectPrefix>new</DefaultSubjectPrefix>
- <IsAlertEmailToAllAdmins>false</IsAlertEmailToAllAdmins>
- <SmtpServerSettings>
- <IsUseAuthentication>true</IsUseAuthentication>
- <Host>new</Host>
- <Username>new</Username>
- </SmtpServerSettings>
-</OrgEmailSettings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/editEmailSettingsSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/editEmailSettingsSource.xml b/vcloud-director/src/test/resources/org/admin/editEmailSettingsSource.xml
deleted file mode 100644
index 70b3607..0000000
--- a/vcloud-director/src/test/resources/org/admin/editEmailSettingsSource.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<OrgEmailSettings type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"/>
- <IsDefaultSmtpServer>false</IsDefaultSmtpServer>
- <IsDefaultOrgEmail>false</IsDefaultOrgEmail>
- <FromEmailAddress>test@test.com</FromEmailAddress>
- <DefaultSubjectPrefix>new</DefaultSubjectPrefix>
- <IsAlertEmailToAllAdmins>false</IsAlertEmailToAllAdmins>
- <SmtpServerSettings>
- <IsUseAuthentication>true</IsUseAuthentication>
- <Host>new</Host>
- <Username>new</Username>
- </SmtpServerSettings>
-</OrgEmailSettings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/editPasswordPolicy.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/editPasswordPolicy.xml b/vcloud-director/src/test/resources/org/admin/editPasswordPolicy.xml
deleted file mode 100644
index da245c8..0000000
--- a/vcloud-director/src/test/resources/org/admin/editPasswordPolicy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgPasswordPolicySettings xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"/>
- <AccountLockoutEnabled>true</AccountLockoutEnabled>
- <InvalidLoginsBeforeLockout>6</InvalidLoginsBeforeLockout>
- <AccountLockoutIntervalMinutes>11</AccountLockoutIntervalMinutes>
-</OrgPasswordPolicySettings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/editPasswordPolicySource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/editPasswordPolicySource.xml b/vcloud-director/src/test/resources/org/admin/editPasswordPolicySource.xml
deleted file mode 100644
index 706ac57..0000000
--- a/vcloud-director/src/test/resources/org/admin/editPasswordPolicySource.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<OrgPasswordPolicySettings type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"/>
- <AccountLockoutEnabled>true</AccountLockoutEnabled>
- <InvalidLoginsBeforeLockout>6</InvalidLoginsBeforeLockout>
- <AccountLockoutIntervalMinutes>11</AccountLockoutIntervalMinutes>
-</OrgPasswordPolicySettings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/editVAppLeaseSettings.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/editVAppLeaseSettings.xml b/vcloud-director/src/test/resources/org/admin/editVAppLeaseSettings.xml
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/editVAppLeaseSettingsSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/editVAppLeaseSettingsSource.xml b/vcloud-director/src/test/resources/org/admin/editVAppLeaseSettingsSource.xml
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/emailSettings.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/emailSettings.xml b/vcloud-director/src/test/resources/org/admin/emailSettings.xml
deleted file mode 100644
index 26c61f6..0000000
--- a/vcloud-director/src/test/resources/org/admin/emailSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgEmailSettings xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"/>
- <IsDefaultSmtpServer>true</IsDefaultSmtpServer>
- <IsDefaultOrgEmail>true</IsDefaultOrgEmail>
- <FromEmailAddress/>
- <DefaultSubjectPrefix/>
- <IsAlertEmailToAllAdmins>true</IsAlertEmailToAllAdmins>
- <SmtpServerSettings>
- <IsUseAuthentication>false</IsUseAuthentication>
- <Host/>
- <Username/>
- </SmtpServerSettings>
-</OrgEmailSettings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/ldapSettings.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/ldapSettings.xml b/vcloud-director/src/test/resources/org/admin/ldapSettings.xml
deleted file mode 100644
index 4e13f0d..0000000
--- a/vcloud-director/src/test/resources/org/admin/ldapSettings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgLdapSettings xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.admin.organizationLdapSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <OrgLdapMode>NONE</OrgLdapMode>
-</OrgLdapSettings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/org.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/org.xml b/vcloud-director/src/test/resources/org/admin/org.xml
deleted file mode 100644
index 5e0ee14..0000000
--- a/vcloud-director/src/test/resources/org/admin/org.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AdminOrg xmlns="http://www.vmware.com/vcloud/v1.5" name="JClouds" id="urn:vcloud:org:6f312e42-cd2b-488d-a2bb-97519cd57ed0" type="application/vnd.vmware.admin.organization+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="down" type="application/vnd.vmware.vcloud.tasksList+xml" href="https://vcloudbeta.bluelock.com/api/tasksList/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata"/>
- <Link rel="add" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/catalogs"/>
- <Link rel="add" type="application/vnd.vmware.admin.user+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/users"/>
- <Link rel="add" type="application/vnd.vmware.admin.group+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/groups"/>
- <Link rel="add" type="application/vnd.vmware.admin.orgNetwork+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/networks"/>
- <Link rel="edit" type="application/vnd.vmware.admin.organization+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.org+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Description/>
- <FullName>JClouds</FullName>
- <IsEnabled>true</IsEnabled>
- <Settings type="application/vnd.vmware.admin.orgSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings">
- <Link rel="down" type="application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings"/>
- <Link rel="down" type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"/>
- <Link rel="down" type="application/vnd.vmware.admin.vAppLeaseSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings"/>
- <Link rel="down" type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"/>
- <Link rel="down" type="application/vnd.vmware.admin.organizationGeneralSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general"/>
- <Link rel="down" type="application/vnd.vmware.admin.organizationLdapSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap"/>
- <Link rel="edit" type="application/vnd.vmware.admin.orgSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings"/>
- <OrgGeneralSettings type="application/vnd.vmware.admin.organizationGeneralSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationGeneralSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general"/>
- <CanPublishCatalogs>false</CanPublishCatalogs>
- <DeployedVMQuota>0</DeployedVMQuota>
- <StoredVmQuota>0</StoredVmQuota>
- <UseServerBootSequence>false</UseServerBootSequence>
- <DelayAfterPowerOnSeconds>0</DelayAfterPowerOnSeconds>
- </OrgGeneralSettings>
- <VAppLeaseSettings type="application/vnd.vmware.admin.vAppLeaseSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings">
- <Link rel="edit" type="application/vnd.vmware.admin.vAppLeaseSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings"/>
- <DeleteOnStorageLeaseExpiration>false</DeleteOnStorageLeaseExpiration>
- <DeploymentLeaseSeconds>0</DeploymentLeaseSeconds>
- <StorageLeaseSeconds>0</StorageLeaseSeconds>
- </VAppLeaseSettings>
- <VAppTemplateLeaseSettings type="application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings">
- <Link rel="edit" type="application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings"/>
- <DeleteOnStorageLeaseExpiration>false</DeleteOnStorageLeaseExpiration>
- <StorageLeaseSeconds>0</StorageLeaseSeconds>
- </VAppTemplateLeaseSettings>
- <OrgLdapSettings type="application/vnd.vmware.admin.organizationLdapSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap">
- <OrgLdapMode>NONE</OrgLdapMode>
- </OrgLdapSettings>
- <OrgEmailSettings type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationEmailSettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"/>
- <IsDefaultSmtpServer>true</IsDefaultSmtpServer>
- <IsDefaultOrgEmail>true</IsDefaultOrgEmail>
- <FromEmailAddress/>
- <DefaultSubjectPrefix/>
- <IsAlertEmailToAllAdmins>true</IsAlertEmailToAllAdmins>
- <SmtpServerSettings>
- <IsUseAuthentication>false</IsUseAuthentication>
- <Host/>
- <Username/>
- </SmtpServerSettings>
- </OrgEmailSettings>
- <OrgPasswordPolicySettings type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"/>
- <AccountLockoutEnabled>false</AccountLockoutEnabled>
- <InvalidLoginsBeforeLockout>5</InvalidLoginsBeforeLockout>
- <AccountLockoutIntervalMinutes>10</AccountLockoutIntervalMinutes>
- </OrgPasswordPolicySettings>
- </Settings>
- <Users>
- <UserReference type="application/vnd.vmware.admin.user+xml" name="adam.lowe@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/672ebb67-d8ff-4201-9c1b-c1be869e526c"/>
- <UserReference type="application/vnd.vmware.admin.user+xml" name="adrian@jclouds.org" href="https://vcloudbeta.bluelock.com/api/admin/user/8c360b93-ed25-4c9a-8e24-d48cd9966d93"/>
- <UserReference type="application/vnd.vmware.admin.user+xml" name="qunying.huang@enstratus.com" href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"/>
- <UserReference type="application/vnd.vmware.admin.user+xml" name="dan@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"/>
- <UserReference type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
- </Users>
- <Groups/>
- <Catalogs>
- <CatalogReference type="application/vnd.vmware.admin.catalog+xml" name="QunyingTestCatalog" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <CatalogReference type="application/vnd.vmware.admin.catalog+xml" name="Public" href="https://vcloudbeta.bluelock.com/api/admin/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"/>
- <CatalogReference type="application/vnd.vmware.admin.catalog+xml" name="dantest" href="https://vcloudbeta.bluelock.com/api/admin/catalog/b542aff4-9f97-4f51-a126-4330fbf62f02"/>
- <CatalogReference type="application/vnd.vmware.admin.catalog+xml" name="test" href="https://vcloudbeta.bluelock.com/api/admin/catalog/b7289d54-4ca4-497f-9a93-2d4afc97e3da"/>
- </Catalogs>
- <Vdcs>
- <Vdc type="application/vnd.vmware.vcloud.vdc+xml" name="Cluster01-JClouds" href="https://vcloudbeta.bluelock.com/api/vdc/d16d333b-e3c0-4176-845d-a5ee6392df07"/>
- </Vdcs>
- <Networks>
- <Network type="application/vnd.vmware.admin.network+xml" name="ilsolation01-Jclouds" href="https://vcloudbeta.bluelock.com/api/admin/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"/>
- <Network type="application/vnd.vmware.admin.network+xml" name="internet01-Jclouds" href="https://vcloudbeta.bluelock.com/api/admin/network/55a677cf-ab3f-48ae-b880-fab90421980c"/>
- </Networks>
-</AdminOrg>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/passwordPolicy.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/passwordPolicy.xml b/vcloud-director/src/test/resources/org/admin/passwordPolicy.xml
deleted file mode 100644
index e48f20f..0000000
--- a/vcloud-director/src/test/resources/org/admin/passwordPolicy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgPasswordPolicySettings xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="edit" type="application/vnd.vmware.admin.organizationPasswordPolicySettings+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"/>
- <AccountLockoutEnabled>false</AccountLockoutEnabled>
- <InvalidLoginsBeforeLockout>5</InvalidLoginsBeforeLockout>
- <AccountLockoutIntervalMinutes>10</AccountLockoutIntervalMinutes>
-</OrgPasswordPolicySettings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/admin/vAppLeaseSettings.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/admin/vAppLeaseSettings.xml b/vcloud-director/src/test/resources/org/admin/vAppLeaseSettings.xml
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/error400.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/error400.xml b/vcloud-director/src/test/resources/org/error400.xml
deleted file mode 100644
index 9ad5bd1..0000000
--- a/vcloud-director/src/test/resources/org/error400.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="BAD_REQUEST" message="validation error on field 'id': String value has invalid format or length" majorErrorCode="400" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/error403-catalog.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/error403-catalog.xml b/vcloud-director/src/test/resources/org/error403-catalog.xml
deleted file mode 100644
index b37a321..0000000
--- a/vcloud-director/src/test/resources/org/error403-catalog.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity "com.vmware.vcloud.entity.org:9e08c2f6-077a-42ce-bece-d5332e2ebb5c"." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/error403-fake.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/error403-fake.xml b/vcloud-director/src/test/resources/org/error403-fake.xml
deleted file mode 100644
index 417556d..0000000
--- a/vcloud-director/src/test/resources/org/error403-fake.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity "com.vmware.vcloud.entity.org:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd"></Error>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/org.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/org.xml b/vcloud-director/src/test/resources/org/org.xml
deleted file mode 100644
index f87c5a9..0000000
--- a/vcloud-director/src/test/resources/org/org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Org xmlns="http://www.vmware.com/vcloud/v1.5" name="JClouds" id="urn:vcloud:org:6f312e42-cd2b-488d-a2bb-97519cd57ed0" type="application/vnd.vmware.vcloud.org+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="down" type="application/vnd.vmware.vcloud.vdc+xml" name="Cluster01-JClouds" href="https://vcloudbeta.bluelock.com/api/vdc/d16d333b-e3c0-4176-845d-a5ee6392df07"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.tasksList+xml" href="https://vcloudbeta.bluelock.com/api/tasksList/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.catalog+xml" name="Public" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c/controlAccess/"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.orgNetwork+xml" name="ilsolation01-Jclouds" href="https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.orgNetwork+xml" name="internet01-Jclouds" href="https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata"/>
- <Description/>
- <FullName>JClouds</FullName>
-</Org>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/orgMetadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/orgMetadata.xml b/vcloud-director/src/test/resources/org/orgMetadata.xml
deleted file mode 100644
index f8595dc..0000000
--- a/vcloud-director/src/test/resources/org/orgMetadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <MetadataEntry xmlns="http://www.vmware.com/vcloud/v1.5" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata/KEY" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata"/>
- <Key>KEY</Key>
- <Value>VALUE</Value>
- </MetadataEntry>
-</Metadata>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/orgMetadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/orgMetadataValue.xml b/vcloud-director/src/test/resources/org/orgMetadataValue.xml
deleted file mode 100644
index 5ee3e5f..0000000
--- a/vcloud-director/src/test/resources/org/orgMetadataValue.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata/KEY" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata"/>
- <Value>VALUE</Value>
-</MetadataValue>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/org/orglist.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/org/orglist.xml b/vcloud-director/src/test/resources/org/orglist.xml
deleted file mode 100644
index 6d410e8..0000000
--- a/vcloud-director/src/test/resources/org/orglist.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OrgList xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.orgList+xml" href="https://vcloudbeta.bluelock.com/api/org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Org type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
-</OrgList>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/query/admin/allGroups.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/query/admin/allGroups.xml b/vcloud-director/src/test/resources/query/admin/allGroups.xml
deleted file mode 100644
index dc1ead3..0000000
--- a/vcloud-director/src/test/resources/query/admin/allGroups.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<QueryResultRecords xmlns="http://www.vmware.com/vcloud/v1.5" total="0" pageSize="25" page="1" name="group" type="application/vnd.vmware.vcloud.query.records+xml" href="https://vcloudbeta.bluelock.com/api/admin/groups/query?page=1&pageSize=25&format=records" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.references+xml" href="https://vcloudbeta.bluelock.com/api/admin/groups/query?page=1&pageSize=25&format=references"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.query.idrecords+xml" href="https://vcloudbeta.bluelock.com/api/admin/groups/query?page=1&pageSize=25&format=idrecords"/>
-</QueryResultRecords>
[29/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
deleted file mode 100644
index 0345933..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
+++ /dev/null
@@ -1,90 +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.dmtf.ovf.environment;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Maps;
-
-/**
- * Abstract type for all sections in
- * environment
- *
- * <p>Java class for Section_Type complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Section_Type">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "Section_Type")
-@XmlSeeAlso({
- PlatformSectionType.class,
- PropertySectionType.class
-})
-public abstract class SectionType<T extends SectionType<T>> {
-
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(otherAttributes);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- SectionType<?> that = (SectionType<?>) obj;
- return Objects.equal(this.otherAttributes, that.otherAttributes);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("otherAttributes", otherAttributes);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java
deleted file mode 100644
index 303b2f0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java
+++ /dev/null
@@ -1,37 +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.
- */
-@XmlSchema(namespace = OVF_ENV_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "cim", namespaceURI = CIM_NS),
- @XmlNs(prefix = "ovf", namespaceURI = OVF_NS),
- @XmlNs(prefix = "env", namespaceURI = OVF_ENV_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
deleted file mode 100644
index d0bbea7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
+++ /dev/null
@@ -1,176 +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.dmtf.ovf.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.SectionType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-public abstract class BaseEnvelope<V extends BaseVirtualSystem, E extends BaseEnvelope<V, E>> {
-
- public abstract Builder<?, V, E> toBuilder();
-
- public abstract static class Builder<B extends Builder<B, V, E>, V extends BaseVirtualSystem, E extends BaseEnvelope<V, E>> {
-
- protected Set<DiskSection> diskSections = Sets.newLinkedHashSet();
- protected Set<NetworkSection> networkSections = Sets.newLinkedHashSet();
- protected Set<SectionType> additionalSections = Sets.newLinkedHashSet();
- protected V virtualSystem;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see BaseEnvelope#getDiskSections
- */
- public B diskSection(DiskSection diskSection) {
- this.diskSections.add(checkNotNull(diskSection, "diskSection"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getDiskSections
- */
- public B diskSections(Iterable<? extends DiskSection> diskSections) {
- this.diskSections = ImmutableSet.<DiskSection> copyOf(checkNotNull(diskSections, "diskSections"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getNetworkSections
- */
- public B networkSection(NetworkSection networkSection) {
- this.networkSections.add(checkNotNull(networkSection, "networkSection"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getNetworkSections
- */
- public B networkSections(Iterable<? extends NetworkSection> networkSections) {
- this.networkSections = ImmutableSet.<NetworkSection> copyOf(checkNotNull(networkSections, "networkSections"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getAdditionalSections
- */
- public B additionalSection(SectionType additionalSection) {
- this.additionalSections.add(checkNotNull(additionalSection, "additionalSection"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getAdditionalSections
- */
- public B additionalSections(Iterable<? extends SectionType> additionalSections) {
- this.additionalSections = ImmutableSet.<SectionType> copyOf(checkNotNull(additionalSections, "additionalSections"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getVirtualSystem
- */
- public B virtualSystem(V virtualSystem) {
- this.virtualSystem = virtualSystem;
- return self();
- }
-
- public abstract E build();
-
- public B fromEnvelope(BaseEnvelope<V, E> in) {
- return virtualSystem(in.getVirtualSystem())
- .diskSections(in.getDiskSections())
- .networkSections(networkSections)
- .additionalSections(in.getAdditionalSections());
- }
-
- }
-
- private Set<DiskSection> diskSections;
- private Set<NetworkSection> networkSections;
- private Set<SectionType> additionalSections;
- private V virtualSystem;
-
- protected BaseEnvelope(Builder<?, V, E> builder) {
- this.diskSections = ImmutableSet.copyOf(checkNotNull(builder.diskSections, "diskSections"));
- this.networkSections = ImmutableSet.copyOf(checkNotNull(builder.networkSections, "networkSections"));
- this.additionalSections = ImmutableSet.copyOf(checkNotNull(builder.additionalSections, "additionalSections"));
- this.virtualSystem = checkNotNull(builder.virtualSystem, "virtualSystem");
- }
-
- protected BaseEnvelope() {
- // for JAXB
- }
-
- public V getVirtualSystem() {
- return virtualSystem;
- }
-
- public Set<DiskSection> getDiskSections() {
- return diskSections;
- }
-
- public Set<NetworkSection> getNetworkSections() {
- return networkSections;
- }
-
- public Set<SectionType> getAdditionalSections() {
- return additionalSections;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(additionalSections, diskSections, networkSections, virtualSystem);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- BaseEnvelope<?, ?> other = (BaseEnvelope<?, ?>) obj;
- return Objects.equal(additionalSections, other.additionalSections)
- && Objects.equal(diskSections, other.diskSections)
- && Objects.equal(networkSections, other.networkSections)
- && Objects.equal(virtualSystem, other.virtualSystem);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("diskSections", diskSections)
- .add("networkSections", networkSections)
- .add("additionalSections", additionalSections)
- .add("virtualSystem", virtualSystem);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
deleted file mode 100644
index 951ff98..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
+++ /dev/null
@@ -1,170 +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.dmtf.ovf.internal;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-public abstract class BaseVirtualSystem extends SectionType {
-
- public abstract static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private String id;
- private String name;
- private Set<ProductSection> productSections = Sets.newLinkedHashSet();
- private Set<SectionType> additionalSections = Sets.newLinkedHashSet();
-
- /**
- * @see BaseVirtualSystem#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getId()
- */
- public B id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getProductSections()
- */
- public B productSection(ProductSection productSection) {
- this.productSections.add(checkNotNull(productSection, "productSection"));
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getProductSections()
- */
- public B productSections(Iterable<ProductSection> productSections) {
- this.productSections = Sets.newLinkedHashSet(checkNotNull(productSections, "productSections"));
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getAdditionalSections()
- */
- public B additionalSection(SectionType additionalSection) {
- this.additionalSections.add(checkNotNull(additionalSection, "additionalSection"));
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getAdditionalSections()
- */
- public B additionalSections(Iterable<? extends SectionType> additionalSections) {
- this.additionalSections = Sets.newLinkedHashSet(checkNotNull(additionalSections, "additionalSections"));
- return self();
- }
-
- public B fromBaseVirtualSystem(BaseVirtualSystem in) {
- return fromSectionType(in)
- .id(in.getId())
- .name(in.getName())
- .productSections(in.getProductSections())
- .additionalSections(in.getAdditionalSections());
- }
- }
-
- @XmlAttribute(namespace = OVF_NS)
- private String id;
- @XmlElement(name = "Name")
- private String name;
- @XmlElement(name = "ProductSection")
- private Set<ProductSection> productSections;
- @XmlElementRef
- private Set<SectionType> additionalSections;
-
- protected BaseVirtualSystem(Builder<?> builder) {
- super(builder);
- this.id = builder.id;
- this.name = builder.name;
- this.productSections = ImmutableSet.copyOf(checkNotNull(builder.productSections, "productSections"));
- this.additionalSections = ImmutableSet.copyOf(checkNotNull(builder.additionalSections, "additionalSections"));
- }
-
- protected BaseVirtualSystem() {
- // For JAXB
- }
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- /**
- * Specifies product-information for a package, such as product name and version, along with a
- * set of properties that can be configured
- */
- public Set<ProductSection> getProductSections() {
- return productSections;
- }
-
- public Set<SectionType> getAdditionalSections() {
- return additionalSections;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), id, name, productSections, additionalSections);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- BaseVirtualSystem other = (BaseVirtualSystem) obj;
- return super.equals(other)
- && equal(id, other.id)
- && equal(name, other.name)
- && equal(productSections, other.productSections)
- && equal(additionalSections, other.additionalSections);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("id", id)
- .add("name", name)
- .add("productSections", productSections)
- .add("additionalSections", additionalSections);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java
deleted file mode 100644
index 1d2fb9e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java
+++ /dev/null
@@ -1,35 +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.
- */
-@XmlSchema(namespace = OVF_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "cim", namespaceURI = CIM_NS),
- @XmlNs(prefix = "ovf", namespaceURI = OVF_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.dmtf.ovf.internal;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/package-info.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/package-info.java
deleted file mode 100644
index 94516cf..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/package-info.java
+++ /dev/null
@@ -1,35 +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.
- */
-@XmlSchema(namespace = OVF_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "cim", namespaceURI = CIM_NS),
- @XmlNs(prefix = "ovf", namespaceURI = OVF_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.dmtf.ovf;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java
deleted file mode 100644
index d1759a5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java
+++ /dev/null
@@ -1,90 +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.vcloud.director.v1_5;
-
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.reflect.Reflection2.typeToken;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.PROPERTY_VCLOUD_DIRECTOR_TIMEOUT_TASK_COMPLETED;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.PROPERTY_VCLOUD_DIRECTOR_VERSION_SCHEMA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.PROPERTY_VCLOUD_DIRECTOR_XML_NAMESPACE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.PROPERTY_VCLOUD_DIRECTOR_XML_SCHEMA;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.rest.internal.BaseHttpApiMetadata;
-import org.jclouds.vcloud.director.v1_5.config.VCloudDirectorHttpApiModule;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-
-public class VCloudDirectorApiMetadata extends BaseHttpApiMetadata {
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromApiMetadata(this);
- }
-
- public VCloudDirectorApiMetadata() {
- this(new Builder());
- }
-
- public VCloudDirectorApiMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = BaseHttpApiMetadata.defaultProperties();
- /** FIXME this should not be the default */
- properties.setProperty(PROPERTY_SESSION_INTERVAL, Integer.toString(30 * 60));
-
- properties.setProperty(PROPERTY_VCLOUD_DIRECTOR_XML_NAMESPACE,
- String.format("http://www.vmware.com/vcloud/v${%s}", PROPERTY_VCLOUD_DIRECTOR_VERSION_SCHEMA));
- properties.setProperty(PROPERTY_SESSION_INTERVAL, Integer.toString(8 * 60));
- properties.setProperty(PROPERTY_VCLOUD_DIRECTOR_XML_SCHEMA, "${jclouds.endpoint}/v1.5/schema/master.xsd");
-
- // TODO integrate these with the {@link ComputeTimeouts} instead of having a single timeout for everything.
- properties.setProperty(PROPERTY_SESSION_INTERVAL, Integer.toString(300));
- properties.setProperty(PROPERTY_VCLOUD_DIRECTOR_TIMEOUT_TASK_COMPLETED, Long.toString(1200l * 1000l));
-
- return properties;
- }
-
- public static class Builder extends BaseHttpApiMetadata.Builder<VCloudDirectorApi, Builder> {
-
- protected Builder() {
- super(VCloudDirectorApi.class);
- id("vcloud-director")
- .name("vCloud Director 1.5 API")
- .identityName("User at Organization (user@org)")
- .credentialName("Password")
- .documentation(URI.create("http://www.vmware.com/support/pubs/vcd_pubs.html"))
- .version("1.5")
- .defaultProperties(VCloudDirectorApiMetadata.defaultProperties())
- .context(typeToken(VCloudDirectorContext.class))
- .defaultModule(VCloudDirectorHttpApiModule.class);
- }
-
- @Override
- public VCloudDirectorApiMetadata build() {
- return new VCloudDirectorApiMetadata(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
deleted file mode 100644
index a8bb741..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
+++ /dev/null
@@ -1,43 +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.vcloud.director.v1_5;
-
-/**
- * Constants used by VCloudDirector apis
- */
-public final class VCloudDirectorConstants {
-
- /** The XML namespace used by the apis. */
- public static final String VCLOUD_1_5_NS = "http://www.vmware.com/vcloud/v1.5";
-
- public static final String VCLOUD_VMW_NS = "http://www.vmware.com/schema/ovf";
-
- /** The property used to configure the timeout for task completion. */
- public static final String PROPERTY_VCLOUD_DIRECTOR_TIMEOUT_TASK_COMPLETED = "jclouds.vcloud-director.timeout.task-complete";
-
- public static final String PROPERTY_VCLOUD_DIRECTOR_VERSION_SCHEMA = "jclouds.vcloud-director.version.schema";
-
- /** TODO javadoc */
- public static final String PROPERTY_VCLOUD_DIRECTOR_XML_NAMESPACE = "jclouds.vcloud-director.xml.ns";
-
- /** TODO javadoc */
- public static final String PROPERTY_VCLOUD_DIRECTOR_XML_SCHEMA = "jclouds.vcloud-director.xml.schema";
-
- private VCloudDirectorConstants() {
- throw new AssertionError("intentionally unimplemented");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
deleted file mode 100644
index d77794e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
+++ /dev/null
@@ -1,46 +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.vcloud.director.v1_5;
-
-import java.net.URI;
-
-import org.jclouds.rest.ApiContext;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorContextImpl;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-
-import com.google.inject.ImplementedBy;
-
-@ImplementedBy(VCloudDirectorContextImpl.class)
-public interface VCloudDirectorContext extends ApiContext<VCloudDirectorApi> {
-
- ApiContext<VCloudDirectorAdminApi> getAdminContext();
-
- /**
- * Resolves the {@link org.jclouds.vcloud.director.v1_5.domain.Entity#getId id} to an href used for
- * {@linkplain VCloudDirectorApi} calls. This caches values to avoid duplicate network
- * requests.
- */
- URI resolveIdToHref(String id);
-
- /**
- * Resolves the {@link org.jclouds.vcloud.director.v1_5.domain.Entity#getId id} to an href used for
- * {@linkplain VCloudDirectorAdminApi} calls. This caches values to avoid duplicate network
- * requests.
- */
- URI resolveIdToAdminHref(String id);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java
deleted file mode 100644
index 438159e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java
+++ /dev/null
@@ -1,79 +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.vcloud.director.v1_5;
-
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-
-public class VCloudDirectorException extends RuntimeException {
-
- private static final String MSG_FMT = "%s (%d) %s: %s";
-
- private final Error error;
- private final Task task;
-
- // TODO: this type wipes out the http response, which often has the data needed to troubleshoot
- // the issue
-
- public VCloudDirectorException(Error error) {
- super(message(error, "Error"));
- this.error = error;
- this.task = null;
- }
-
- public VCloudDirectorException(Task task) {
- super(message(task.getError(), "Task error"));
- this.error = task.getError();
- this.task = task;
- }
-
- public Integer getMajorErrorCode() {
- return error.getMajorErrorCode();
- }
-
- public Error.Code getCode() {
- return Error.Code.fromCode(error.getMajorErrorCode());
- }
-
- public Error getError() {
- return error;
- }
-
- public boolean hasTask() {
- return task != null;
- }
-
- public Task getTask() {
- return task;
- }
-
- private static String message(Error error, String from) {
- Iterable<String> words = Iterables.transform(Splitter.on('_').split(error.getMinorErrorCode()), new Function<String, String>() {
- @Override
- public String apply(String input) {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, input);
- }
- });
- return String.format(MSG_FMT, Joiner.on(' ').join(words), error.getMajorErrorCode(), from, error.getMessage());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java
deleted file mode 100644
index 843dc99..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java
+++ /dev/null
@@ -1,228 +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.vcloud.director.v1_5;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Resource Types used in VCloud.
- *
- * The object type, specified as a MIME content type, of the object that the link references. This
- * attribute is present only for links to objects. It is not present for links to actions.
- *
- * @see javax.ws.rs.core.MediaType;
- */
-public class VCloudDirectorMediaType {
-
- // Wildcarded media types
-
- public static final String ANY = "*/*";
-
- public static final String ANY_IMAGE = "image/*";
-
- public static final String TEXT_XML = "text/xml";
-
- /** The default {@literal Accept} header for the vCloud API. */
- public static final String APPLICATION_XML_1_5 = "application/*+xml;version=1.5";
-
- // Specific media types
-
- public static final String SESSION = "application/vnd.vmware.vcloud.session+xml";
-
- public static final String ERROR = "application/vnd.vmware.vcloud.error+xml";
-
- public static final String ORG_LIST = "application/vnd.vmware.vcloud.orgList+xml";
-
- public static final String METADATA = "application/vnd.vmware.vcloud.metadata+xml";
-
- public static final String METADATA_ENTRY = "*/*"; // No media type (?)
-
- public static final String METADATA_VALUE = "application/vnd.vmware.vcloud.metadata.value+xml";
-
- public static final String ORG = "application/vnd.vmware.vcloud.org+xml";
-
- public static final String TASKS_LIST = "application/vnd.vmware.vcloud.tasksList+xml";
-
- public static final String TASK = "application/vnd.vmware.vcloud.task+xml";
-
- public static final String NETWORK = "application/vnd.vmware.vcloud.network+xml";
-
- public static final String ORG_NETWORK = "application/vnd.vmware.vcloud.orgNetwork+xml";
-
- public static final String CATALOG = "application/vnd.vmware.vcloud.catalog+xml";
-
- public static final String CATALOG_ITEM = "application/vnd.vmware.vcloud.catalogItem+xml";
-
- public static final String CATALOG_ITEMS = "application/vnd.vmware.vcloud.catalogItems+xml";
-
- public static final String CATALOGS_LIST = "application/vnd.vmware.vcloud.catalogsList+xml";
-
- public static final String PROPERTY = "application/vnd.vmware.vcloud.property+xml";
-
- public static final String MEDIA = "application/vnd.vmware.vcloud.media+xml";
-
- public static final String OWNER = "application/vnd.vmware.vcloud.owner+xml";
-
- public static final String VDC = "application/vnd.vmware.vcloud.vdc+xml";
-
- public static final String ADMIN_USER = "application/vnd.vmware.admin.user+xml";
-
- public static final String VAPP = "application/vnd.vmware.vcloud.vApp+xml";
-
- public static final String VAPP_TEMPLATE = "application/vnd.vmware.vcloud.vAppTemplate+xml";
-
- public static final String VM = "application/vnd.vmware.vcloud.vm+xml";
-
- public static final String CAPTURE_VAPP_PARAMS = "application/vnd.vmware.vcloud.captureVAppParams+xml";
-
- public static final String CLONE_MEDIA_PARAMS = "application/vnd.vmware.vcloud.cloneMediaParams+xml";
-
- public static final String CLONE_VAPP_PARAMS = "application/vnd.vmware.vcloud.cloneVAppParams+xml";
-
- public static final String CLONE_VAPP_TEMPLATE_PARAMS = "application/vnd.vmware.vcloud.cloneVAppTemplateParams+xml";
-
- public static final String COMPOSE_VAPP_PARAMS = "application/vnd.vmware.vcloud.composeVAppParams+xml";
-
- public static final String INSTANTIATE_VAPP_TEMPLATE_PARAMS = "application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml";
-
- public static final String UPLOAD_VAPP_TEMPLATE_PARAMS = "application/vnd.vmware.vcloud.uploadVAppTemplateParams+xml";
-
- public static final String QUERY_RESULT_RECORDS = "application/vnd.vmware.vcloud.query.records+xml";
-
- public static final String QUERY_RESULT_REFERENCES = "application/vnd.vmware.vcloud.query.references+xml";
-
- public static final String QUERY_RESULT_ID_RECORDS = "application/vnd.vmware.vcloud.query.idrecords+xml";
-
- public static final String CONTROL_ACCESS = "application/vnd.vmware.vcloud.controlAccess+xml";
-
- public static final String CUSTOMIZATION_SECTION = "application/vnd.vmware.vcloud.customizationSection+xml";
-
- public static final String GUEST_CUSTOMIZATION_SECTION = "application/vnd.vmware.vcloud.guestCustomizationSection+xml";
-
- public static final String LEASE_SETTINGS_SECTION = "application/vnd.vmware.vcloud.leaseSettingsSection+xml";
-
- public static final String NETWORK_SECTION = "application/vnd.vmware.vcloud.networkSection+xml";
-
- public static final String NETWORK_CONFIG_SECTION = "application/vnd.vmware.vcloud.networkConfigSection+xml";
-
- public static final String NETWORK_CONNECTION_SECTION = "application/vnd.vmware.vcloud.networkConnectionSection+xml";
-
- public static final String OPERATING_SYSTEM_SECTION = "application/vnd.vmware.vcloud.operatingSystemSection+xml";
-
- public static final String PRODUCT_SECTION_LIST = "application/vnd.vmware.vcloud.productSections+xml";
-
- public static final String STARTUP_SECTION = "application/vnd.vmware.vcloud.startupSection+xml";
-
- public static final String VIRTUAL_HARDWARE_SECTION = "application/vnd.vmware.vcloud.virtualHardwareSection+xml";
-
- public static final String RELOCATE_TEMPLATE = "application/vnd.vmware.vcloud.relocateTemplate+xml";
-
- public static final String ENVELOPE = "application/vnd.???";
-
- public static final String VM_PENDING_ANSWER = "application/vnd.vmware.vcloud.vmPendingAnswer+xml";
-
- public static final String VM_PENDING_QUESTION = "application/vnd.vmware.vcloud.vmPendingQuestion+xml";
-
- public static final String OVF_RASD_ITEM = "application/vnd.vmware.vcloud.rasdItem+xml";
-
- public static final String OVF_RASD_ITEMS_LIST = "application/vnd.vmware.vcloud.rasdItemsList+xml";
-
- public static final String ADMIN_CATALOG = "application/vnd.vmware.admin.catalog+xml";
-
- public static final String ADMIN_ORG = "application/vnd.vmware.admin.organization+xml";
-
- public static final String PUBLISH_CATALOG_PARAMS = "application/vnd.vmware.admin.publishCatalogParams+xml";
-
- public static final String GROUP = "application/vnd.vmware.admin.group+xml";
-
- public static final String ORG_VAPP_TEMPLATE_LEASE_SETTINGS = "application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml";
-
- public static final String ORG_LEASE_SETTINGS = "application/vnd.vmware.admin.vAppLeaseSettings+xml";
-
- public static final String ORG_PASSWORD_POLICY_SETTINGS = "application/vnd.vmware.admin.organizationPasswordPolicySettings+xml";
-
- public static final String ORG_LDAP_SETTINGS = "application/vnd.vmware.admin.organizationLdapSettings+xml";
-
- public static final String ORG_GENERAL_SETTINGS = "application/vnd.vmware.admin.organizationGeneralSettings+xml";
-
- public static final String ORG_EMAIL_SETTINGS = "application/vnd.vmware.admin.organizationEmailSettings+xml";
-
- public static final String ORG_SETTINGS = "application/vnd.vmware.admin.orgSettings+xml";
-
- public static final String ADMIN_NETWORK = "application/vnd.vmware.admin.network+xml";
-
- public static final String ADMIN_ORG_NETWORK = "application/vnd.vmware.admin.orgNetwork+xml";
-
- public static final String USER = "application/vnd.vmware.admin.user+xml";
-
- public static final String ROLE = "application/vnd.vmware.admin.role+xml";
-
- public static final String DEPLOY_VAPP_PARAMS = "application/vnd.vmware.vcloud.deployVAppParams+xml";
-
- public static final String RECOMPOSE_VAPP_PARAMS = "application/vnd.vmware.vcloud.recomposeVAppParams+xml";
-
- public static final String RELOCATE_VM_PARAMS = "application/vnd.vmware.vcloud.relocateVmParams+xml";
-
- public static final String UNDEPLOY_VAPP_PARAMS = "application/vnd.vmware.vcloud.undeployVAppParams+xml";
-
- public static final String MEDIA_PARAMS = "application/vnd.vmware.vcloud.mediaInsertOrEjectParams+xml";
-
- public static final String RUNTIME_INFO_SECTION = "application/vnd.vmware.vcloud.runtimeInfoSection+xml";
-
- public static final String SCREEN_TICKET = "application/vnd.vmware.vcloud.screenTicket+xml";
-
- public static final String VAPP_NETWORK = "application/vnd.vmware.vcloud.vAppNetwork+xml";
-
- public static final String ADMIN_VDC = "application/vnd.vmware.admin.vdc+xml";
-
- public static final String NETWORK_POOL = "application/vnd.vmware.admin.networkPool+xml";
-
- public static final String ENTITY = "application/vnd.vmware.vcloud.entity+xml";
-
- public static final String ADMIN = "application/vnd.vmware.admin.vcloud+xml";
-
- /**
- * All acceptable media types.
- */
- public static final List<String> ALL = ImmutableList.of(
- SESSION, ERROR, ORG_LIST, METADATA, METADATA_ENTRY, METADATA_VALUE,
- ORG, TASKS_LIST, TASK, NETWORK, ORG_NETWORK, CATALOG, CATALOG_ITEM,
- CATALOG_ITEMS, CATALOGS_LIST, PROPERTY, MEDIA, OWNER, VDC, ADMIN_USER,
- VAPP, VAPP_TEMPLATE, VM, CAPTURE_VAPP_PARAMS, CLONE_MEDIA_PARAMS,
- CLONE_VAPP_PARAMS, CLONE_VAPP_TEMPLATE_PARAMS, COMPOSE_VAPP_PARAMS,
- INSTANTIATE_VAPP_TEMPLATE_PARAMS, UPLOAD_VAPP_TEMPLATE_PARAMS,
- QUERY_RESULT_RECORDS, QUERY_RESULT_REFERENCES, QUERY_RESULT_ID_RECORDS,
- CONTROL_ACCESS, CUSTOMIZATION_SECTION, GUEST_CUSTOMIZATION_SECTION,
- LEASE_SETTINGS_SECTION, NETWORK_SECTION, NETWORK_CONFIG_SECTION,
- NETWORK_CONNECTION_SECTION, OPERATING_SYSTEM_SECTION,
- PRODUCT_SECTION_LIST, STARTUP_SECTION, VIRTUAL_HARDWARE_SECTION,
- RELOCATE_TEMPLATE, ENVELOPE, VM_PENDING_ANSWER, VM_PENDING_QUESTION,
- OVF_RASD_ITEM, OVF_RASD_ITEMS_LIST, ADMIN_CATALOG, ADMIN_ORG,
- PUBLISH_CATALOG_PARAMS, GROUP, ORG_VAPP_TEMPLATE_LEASE_SETTINGS,
- ORG_LEASE_SETTINGS, ORG_PASSWORD_POLICY_SETTINGS, ORG_LDAP_SETTINGS,
- ORG_GENERAL_SETTINGS, ORG_EMAIL_SETTINGS, ORG_SETTINGS, ADMIN_NETWORK,
- ADMIN_ORG_NETWORK, USER, ROLE, DEPLOY_VAPP_PARAMS, RECOMPOSE_VAPP_PARAMS,
- RELOCATE_VM_PARAMS, UNDEPLOY_VAPP_PARAMS, ADMIN_VDC, MEDIA_PARAMS,
- RUNTIME_INFO_SECTION, SCREEN_TICKET, VAPP_NETWORK,
- TEXT_XML, ADMIN_VDC, NETWORK_POOL, ADMIN_ORG, ENTITY, ADMIN
- );
-
- // NOTE These lists must be edited whenever a new media type constant is added.
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
deleted file mode 100644
index fad0474..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
+++ /dev/null
@@ -1,87 +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.vcloud.director.v1_5.admin;
-
-import java.net.URI;
-
-import org.jclouds.rest.annotations.Delegate;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogApi;
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkApi;
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgApi;
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryApi;
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcApi;
-import org.jclouds.vcloud.director.v1_5.features.admin.GroupApi;
-import org.jclouds.vcloud.director.v1_5.features.admin.UserApi;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VCloudDirectorAdminApi extends VCloudDirectorApi {
- /**
- * @return asynchronous access to admin query features
- */
- @Override
- @Delegate
- AdminQueryApi getQueryApi();
-
- /**
- * @return synchronous access to {@link Catalog} admin features
- */
- @Override
- @Delegate
- AdminCatalogApi getCatalogApi();
-
- /**
- * @return synchronous access to admin {@link Group} features
- */
- @Delegate
- GroupApi getGroupApi();
-
- /**
- * @return synchronous access to {@link AdminOrg} features
- */
- @Override
- @Delegate
- AdminOrgApi getOrgApi();
-
- /**
- * @return synchronous access to {@link User} features
- */
- @Delegate
- UserApi getUserApi();
-
- /**
- * @return synchronous access to {@link AdminVdc} features
- */
- @Override
- @Delegate
- AdminVdcApi getVdcApi();
-
- /**
- * @return synchronous access to admin {@link Network} features
- */
- @Override
- @Delegate
- AdminNetworkApi getNetworkApi();
-
- @Override
- @Delegate
- MetadataApi getMetadataApi(@EndpointParam URI href);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Login.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Login.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Login.java
deleted file mode 100644
index 0639839..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Login.java
+++ /dev/null
@@ -1,34 +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.vcloud.director.v1_5.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * The login url for the vCloud, typically {@code https://vdc_host/api/sessions}
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.METHOD, ElementType.PARAMETER })
-@Qualifier
-public @interface Login {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Session.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Session.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Session.java
deleted file mode 100644
index a9f28ab..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/annotations/Session.java
+++ /dev/null
@@ -1,34 +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.vcloud.director.v1_5.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * relating to the current session on the vCloud
- */
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.METHOD, ElementType.PARAMETER })
-@Qualifier
-public @interface Session {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadata.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadata.java
deleted file mode 100644
index b96354f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadata.java
+++ /dev/null
@@ -1,47 +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.vcloud.director.v1_5.binders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.xml.XMLParser;
-
-/**
- * Changes a Map to the crufty {@link Metadata type}
- */
-@Singleton
-public class BindMapAsMetadata extends BindToXMLPayload {
-
- @Inject
- public BindMapAsMetadata(final XMLParser xmlParser) {
- super(xmlParser);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(final R request, final Object input) {
- return super.bindToRequest(request, Metadata.toMetadata(Map.class.cast(checkNotNull(input, "input"))));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValue.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValue.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValue.java
deleted file mode 100644
index 26675d3..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValue.java
+++ /dev/null
@@ -1,64 +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.vcloud.director.v1_5.binders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-import org.jclouds.xml.XMLParser;
-
-/**
- * Changes a String to the crufty {@link MetadataValue type}
- */
-@Singleton
-public class BindStringAsMetadataValue extends BindToXMLPayload {
- @XmlRootElement(name = "MetadataValue")
- public static class MetadataValue extends Resource {
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA_VALUE;
-
- public MetadataValue() {
-
- }
-
- public MetadataValue(String value) {
- super(Resource.builder());
- this.value = value;
- }
-
- @XmlElement(name = "Value", required = true)
- private String value;
-
- }
-
- @Inject
- public BindStringAsMetadataValue(final XMLParser xmlParser) {
- super(xmlParser);
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(final R request, final Object input) {
- return super.bindToRequest(request, new MetadataValue(checkNotNull(input, "input").toString()));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java
deleted file mode 100644
index afc6d92..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.binders;
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.io.BaseEncoding.base64;
-import static java.lang.String.format;
-
-import java.util.Map;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-
-import com.google.common.net.HttpHeaders;
-
-/**
- * Uses Basic Authentication to sign the request.
- *
- * @see <a href= "http://en.wikipedia.org/wiki/Basic_access_authentication" />
- */
-@Singleton
-public class BindUserOrgAndPasswordAsBasicAuthorizationHeader implements MapBinder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
- String header = "Basic "
- + base64().encode(
- format("%s@%s:%s", checkNotNull(postParams.get("user"), "user"),
- checkNotNull(postParams.get("org"), "org"),
- checkNotNull(postParams.get("password"), "password")).getBytes(UTF_8));
- return (R) request.toBuilder().replaceHeader(HttpHeaders.AUTHORIZATION, header).build();
- }
-
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- throw new UnsupportedOperationException();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/package-info.java
deleted file mode 100644
index ce1897d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.binders;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/FindLocationForResource.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/FindLocationForResource.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/FindLocationForResource.java
deleted file mode 100644
index 9da84d4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/FindLocationForResource.java
+++ /dev/null
@@ -1,66 +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.vcloud.director.v1_5.compute.functions;
-
-import java.net.URI;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.collect.Memoized;
-import org.jclouds.domain.Location;
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-
-@Singleton
-public class FindLocationForResource implements Function<Reference, Location> {
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- final Supplier<Set<? extends Location>> locations;
-
- @Inject
- public FindLocationForResource(@Memoized Supplier<Set<? extends Location>> locations) {
- this.locations = locations;
- }
-
- /**
- * searches for a location associated with this resource.
- *
- * @throws NoSuchElementException
- * if not found
- */
- public Location apply(Reference resource) {
- for (Location input : locations.get()) {
- do {
- // The "name" isn't always present, ex inside a vApp we have a rel
- // link that only includes href and type.
- if (URI.create(input.getId()).equals(resource.getHref()))
- return input;
- } while ((input = input.getParent()) != null);
- }
- throw new NoSuchElementException(String.format("resource: %s not found in locations: %s", resource,
- locations.get()));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVAppTemplate.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVAppTemplate.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVAppTemplate.java
deleted file mode 100644
index 4d49986..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVAppTemplate.java
+++ /dev/null
@@ -1,85 +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.vcloud.director.v1_5.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.predicates.ImagePredicates;
-import org.jclouds.dmtf.ovf.VirtualHardwareSection;
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-@Singleton
-public class HardwareForVAppTemplate implements Function<VAppTemplate, Hardware> {
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- private final Function<VAppTemplate, Envelope> templateToEnvelope;
- private final FindLocationForResource findLocationForResource;
- private final VCloudHardwareBuilderFromResourceAllocations rasdToHardwareBuilder;
-
- @Inject
- protected HardwareForVAppTemplate(Function<VAppTemplate, Envelope> templateToEnvelope,
- FindLocationForResource findLocationForResource,
- VCloudHardwareBuilderFromResourceAllocations rasdToHardwareBuilder) {
- this.templateToEnvelope = checkNotNull(templateToEnvelope, "templateToEnvelope");
- this.findLocationForResource = checkNotNull(findLocationForResource, "findLocationForResource");
- this.rasdToHardwareBuilder = checkNotNull(rasdToHardwareBuilder, "rasdToHardwareBuilder");
- }
-
- @Override
- public Hardware apply(VAppTemplate from) {
- checkNotNull(from, "VAppTemplate");
-
- Envelope ovf = templateToEnvelope.apply(from);
-
- if (ovf.getVirtualSystem().getVirtualHardwareSections().size() > 1) {
- logger.warn("multiple hardware choices found. using first", ovf);
- }
- VirtualHardwareSection hardware = Iterables.get(ovf.getVirtualSystem().getVirtualHardwareSections(), 0);
- HardwareBuilder builder = rasdToHardwareBuilder.apply(hardware.getItems());
- Link vdc = Iterables.find(checkNotNull(from, "from").getLinks(), LinkPredicates.typeEquals(VCloudDirectorMediaType.VDC));
- if (vdc != null) {
- builder.location(findLocationForResource.apply(vdc));
- } else {
- // otherwise, it could be in a public catalog, which is not assigned to a VDC
- }
- builder.ids(from.getHref().toASCIIString()).name(from.getName()).supportsImage(
- ImagePredicates.idEquals(from.getHref().toASCIIString()));
- builder.hypervisor("VMware");
- return builder.build();
-
- }
-
- protected String getName(String name) {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVm.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVm.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVm.java
deleted file mode 100644
index a4e11ca..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVm.java
+++ /dev/null
@@ -1,73 +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.vcloud.director.v1_5.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.predicates.ImagePredicates;
-import org.jclouds.domain.Location;
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.jclouds.vcloud.director.v1_5.functions.SectionForVApp;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-public class HardwareForVm implements Function<Vm, Hardware> {
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- private final Function<Reference, Location> findLocationForResource;
- private final VCloudHardwareBuilderFromResourceAllocations rasdToHardwareBuilder;
- private final SectionForVApp<VirtualHardwareSection> findVirtualHardwareSectionForVm;
-
- @Inject
- protected HardwareForVm(Function<Reference, Location> findLocationForResource,
- VCloudHardwareBuilderFromResourceAllocations rasdToHardwareBuilder,
- SectionForVApp<VirtualHardwareSection> findVirtualHardwareSectionForVm) {
- this.findLocationForResource = checkNotNull(findLocationForResource, "findLocationForResource");
- this.rasdToHardwareBuilder = checkNotNull(rasdToHardwareBuilder, "rasdToHardwareBuilder");
- this.findVirtualHardwareSectionForVm = checkNotNull(findVirtualHardwareSectionForVm, "findVirtualHardwareSectionForVm");
- }
-
- @Override
- public Hardware apply(Vm from) {
- checkNotNull(from, "VApp");
- // TODO make this work with composite vApps
- if (from == null)
- return null;
-
- VirtualHardwareSection hardware = findVirtualHardwareSectionForVm.apply(from);
- HardwareBuilder builder = rasdToHardwareBuilder.apply(hardware.getItems());
- builder.location(findLocationForResource.apply(Iterables.find(checkNotNull(from, "from").getLinks(),
- LinkPredicates.typeEquals(VCloudDirectorMediaType.VDC))));
- builder.ids(from.getHref().toASCIIString()).name(from.getName()).supportsImage(
- ImagePredicates.idEquals(from.getHref().toASCIIString()));
- builder.hypervisor("VMware");
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ImageForVAppTemplate.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ImageForVAppTemplate.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ImageForVAppTemplate.java
deleted file mode 100644
index e7aa7fc..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ImageForVAppTemplate.java
+++ /dev/null
@@ -1,84 +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.vcloud.director.v1_5.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.CIMOperatingSystem;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-import org.jclouds.ovf.Envelope;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-@Singleton
-public class ImageForVAppTemplate implements Function<VAppTemplate, Image> {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- public Logger logger = Logger.NULL;
-
- private final Map<Status, Image.Status> toPortableImageStatus;
- private final Function<VAppTemplate, Envelope> templateToEnvelope;
- private final FindLocationForResource findLocationForResource;
-
-
- @Inject
- protected ImageForVAppTemplate(Map<Status, Image.Status> toPortableImageStatus, Function<VAppTemplate, Envelope> templateToEnvelope,
- FindLocationForResource findLocationForResource) {
- this.toPortableImageStatus = checkNotNull(toPortableImageStatus, "toPortableImageStatus");
- this.templateToEnvelope = checkNotNull(templateToEnvelope, "templateToEnvelope");
- this.findLocationForResource = checkNotNull(findLocationForResource, "findLocationForResource");
- }
-
- @Override
- public Image apply(VAppTemplate from) {
- checkNotNull(from, "VAppTemplate");
- Envelope ovf = templateToEnvelope.apply(from);
-
- ImageBuilder builder = new ImageBuilder();
- builder.ids(from.getHref().toASCIIString());
- builder.uri(from.getHref());
- builder.name(from.getName());
- Link vdc = Iterables.find(checkNotNull(from, "from").getLinks(), LinkPredicates.typeEquals(VCloudDirectorMediaType.VDC));
- if (vdc != null) {
- builder.location(findLocationForResource.apply(vdc));
- } else {
- // otherwise, it could be in a public catalog, which is not assigned to a VDC
- }
- builder.description(from.getDescription() != null ? from.getDescription() : from.getName());
- builder.operatingSystem(CIMOperatingSystem.toComputeOs(ovf));
- builder.status(toPortableImageStatus.get(from.getStatus()));
- return builder.build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VCloudHardwareBuilderFromResourceAllocations.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VCloudHardwareBuilderFromResourceAllocations.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VCloudHardwareBuilderFromResourceAllocations.java
deleted file mode 100644
index 5268917..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VCloudHardwareBuilderFromResourceAllocations.java
+++ /dev/null
@@ -1,38 +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.vcloud.director.v1_5.compute.functions;
-
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.Volume;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.functions.HardwareBuilderFromResourceAllocations;
-
-@Singleton
-public class VCloudHardwareBuilderFromResourceAllocations extends HardwareBuilderFromResourceAllocations {
- @Override
- public Volume apply(ResourceAllocationSettingData from) {
- // FIXME: not yet implemented
-// if (from instanceof VCloudHardDisk) {
-// VCloudHardDisk vDisk = VCloudHardDisk.class.cast(from);
-// return new VolumeImpl(from.getAddressOnParent() + "", Volume.Type.LOCAL, vDisk.getCapacity() / 1024f, null,
-// "0".equals(from.getAddressOnParent()), true);
-// } else {
- return super.apply(from);
-// }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java
deleted file mode 100644
index 6988373..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException.java
+++ /dev/null
@@ -1,79 +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.vcloud.director.v1_5.compute.functions;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.concurrent.ExecutionException;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.logging.Logger;
-import org.jclouds.ovf.Envelope;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.functions.SectionForVAppTemplate;
-
-import com.google.common.base.Function;
-import com.google.common.cache.LoadingCache;
-
-@Singleton
-public class ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException implements
- Function<VAppTemplate, Envelope> {
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- private final LoadingCache<URI, Envelope> envelopes;
- private final SectionForVAppTemplate<NetworkSection> findNetworkSectionForVAppTemplate;
-
- @Inject
- protected ValidateVAppTemplateAndReturnEnvelopeOrThrowIllegalArgumentException(LoadingCache<URI, Envelope> envelopes,
- SectionForVAppTemplate<NetworkSection> findNetworkSectionForVAppTemplate) {
- this.envelopes = checkNotNull(envelopes, "envelopes");
- this.findNetworkSectionForVAppTemplate = checkNotNull(findNetworkSectionForVAppTemplate, "findNetworkSectionForVAppTemplate");
- }
-
- @Override
- public Envelope apply(VAppTemplate from) {
- checkArgument(from.getChildren().size() == 1, "multiple vms are not supported: %s", from);
-
- checkArgument(findNetworkSectionForVAppTemplate.apply(from).getNetworks().size() == 1,
- "multiple network connections are not supported: %s", from);
-
- checkArgument(from.isOvfDescriptorUploaded(), "ovf descriptor is not uploaded: %s", from);
- Envelope ovf = getOVFForVAppTemplateAndValidate(from);
- return ovf;
- }
-
- private Envelope getOVFForVAppTemplateAndValidate(VAppTemplate from) throws IllegalArgumentException {
- Envelope ovf;
- try {
- ovf = envelopes.get(from.getHref());
- checkArgument(ovf.getVirtualSystem().getVirtualHardwareSections().size() > 0,
- "no hardware sections exist in ovf %s", ovf);
- } catch (ExecutionException e) {
- throw new IllegalArgumentException("no ovf envelope found for: " + from, e);
- }
- return ovf;
- }
-}
-
[23/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java
deleted file mode 100644
index 4deb42d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java
+++ /dev/null
@@ -1,152 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "NatService")
-@XmlType(propOrder = {
- "natType",
- "policy",
- "natRules"
-})
-public class NatService extends NetworkService<NatService> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromNatService(this);
- }
-
- public static class Builder extends NetworkService.Builder<NatService> {
- private String natType;
- private String policy;
- private Set<NatRule> natRules = Sets.newLinkedHashSet();
-
- /**
- * @see NatService#getNatType()
- */
- public Builder natType(String natType) {
- this.natType = natType;
- return this;
- }
-
- /**
- * @see NatService#getPolicy()
- */
- public Builder policy(String policy) {
- this.policy = policy;
- return this;
- }
-
- /**
- * @see NatService#getNatRules()
- */
- public Builder natRules(Set<NatRule> natRules) {
- this.natRules = checkNotNull(natRules, "natRules");
- return this;
- }
-
- @Override
- public NatService build() {
- return new NatService(isEnabled, natType, policy, natRules);
- }
-
- public Builder fromNatService(NatService in) {
- return fromNetworkService(in).natType(in.getNatType()).policy(in.getPolicy())
- .natRules(in.getNatRules());
- }
-
- public Builder fromNetworkService(NetworkService<NatService> in) {
- return Builder.class.cast(super.fromNetworkServiceType(in));
- }
-
- @Override
- public Builder enabled(boolean enabled) {
- this.isEnabled = enabled;
- return this;
- }
- }
-
- @XmlElement(name = "NatType")
- private String natType;
- @XmlElement(name = "Policy")
- private String policy;
- @XmlElement(name = "NatRule")
- private Set<NatRule> natRules = Sets.newLinkedHashSet();
-
- private NatService(boolean enabled, String natType, String policy, Set<NatRule> natRules) {
- super(enabled);
- this.natType = natType;
- this.policy = policy;
- this.natRules = ImmutableSet.copyOf(natRules);
- }
-
- private NatService() {
- // for JAXB
- }
-
- public String getNatType() {
- return natType;
- }
-
- public String getPolicy() {
- return policy;
- }
-
- public Set<NatRule> getNatRules() {
- return Collections.unmodifiableSet(natRules);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatService that = NatService.class.cast(o);
- return super.equals(that)
- && equal(natType, that.natType)
- && equal(natRules, that.natRules)
- && equal(policy, that.policy);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), natType, natRules, policy);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string().add("natType", natType).add("natRules", natRules).add("policy", policy);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java
deleted file mode 100644
index 823da3f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java
+++ /dev/null
@@ -1,236 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents the NAT rule for port forwarding between VM NIC/port
- * and external IP/port.
- */
-@XmlType(name = "NatVmRule", propOrder = {
- "externalIpAddress",
- "externalPort",
- "vAppScopedVmId",
- "vmNicId",
- "internalPort",
- "protocol"
-})
-public class NatVmRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatVmRule(this);
- }
-
- public static class Builder {
-
- private String externalIpAddress;
- private int externalPort;
- private String vAppScopedVmId;
- private int vmNicId;
- private int internalPort;
- private String protocol;
-
- /**
- * @see NatVmRule#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NatVmRule#getExternalPort()
- */
- public Builder externalPort(int externalPort) {
- this.externalPort = externalPort;
- return this;
- }
-
- /**
- * @see NatVmRule#getVAppScopedVmId()
- */
- public Builder vAppScopedVmId(String vAppScopedVmId) {
- this.vAppScopedVmId = vAppScopedVmId;
- return this;
- }
-
- /**
- * @see NatVmRule#getVmNicId()
- */
- public Builder vmNicId(int vmNicId) {
- this.vmNicId = vmNicId;
- return this;
- }
-
- /**
- * @see NatVmRule#getInternalPort()
- */
- public Builder internalPort(int internalPort) {
- this.internalPort = internalPort;
- return this;
- }
-
- /**
- * @see NatVmRule#getProtocol()
- */
- public Builder protocol(String protocol) {
- this.protocol = protocol;
- return this;
- }
-
- public NatVmRule build() {
- return new NatVmRule(externalIpAddress, externalPort, vAppScopedVmId, vmNicId, internalPort, protocol);
- }
-
- public Builder fromNatVmRule(NatVmRule in) {
- return externalIpAddress(in.getExternalIpAddress())
- .externalPort(in.getExternalPort())
- .vAppScopedVmId(in.getVAppScopedVmId())
- .vmNicId(in.getVmNicId())
- .internalPort(in.getInternalPort())
- .protocol(in.getProtocol());
- }
- }
-
- private NatVmRule(String externalIpAddress, int externalPort, String vAppScopedVmId, int vmNicId,
- int internalPort, String protocol) {
- this.externalIpAddress = externalIpAddress;
- this.externalPort = externalPort;
- this.vAppScopedVmId = vAppScopedVmId;
- this.vmNicId = vmNicId;
- this.internalPort = internalPort;
- this.protocol = protocol;
- }
-
- private NatVmRule() {
- // for JAXB
- }
-
-
- @XmlElement(name = "ExternalIpAddress")
- protected String externalIpAddress;
- @XmlElement(name = "ExternalPort")
- protected int externalPort;
- @XmlElement(name = "VAppScopedVmId", required = true)
- protected String vAppScopedVmId;
- @XmlElement(name = "VmNicId")
- protected int vmNicId;
- @XmlElement(name = "InternalPort")
- protected int internalPort;
- @XmlElement(name = "Protocol", required = true)
- protected String protocol;
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the externalPort property.
- */
- public int getExternalPort() {
- return externalPort;
- }
-
- /**
- * Gets the value of the vAppScopedVmId property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVAppScopedVmId() {
- return vAppScopedVmId;
- }
-
- /**
- * Gets the value of the vmNicId property.
- */
- public int getVmNicId() {
- return vmNicId;
- }
-
- /**
- * Gets the value of the internalPort property.
- */
- public int getInternalPort() {
- return internalPort;
- }
-
-
- /**
- * Gets the value of the protocol property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getProtocol() {
- return protocol;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatVmRule that = NatVmRule.class.cast(o);
- return equal(externalIpAddress, that.externalIpAddress) &&
- equal(externalPort, that.externalPort) &&
- equal(vAppScopedVmId, that.vAppScopedVmId) &&
- equal(vmNicId, that.vmNicId) &&
- equal(internalPort, that.internalPort) &&
- equal(protocol, that.protocol);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(externalIpAddress,
- externalPort,
- vAppScopedVmId,
- vmNicId,
- internalPort,
- protocol);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("externalIpAddress", externalIpAddress)
- .add("externalPort", externalPort)
- .add("vAppScopedVmId", vAppScopedVmId)
- .add("vmNicId", vmNicId)
- .add("internalPort", internalPort)
- .add("protocol", protocol).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java
deleted file mode 100644
index c703618..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java
+++ /dev/null
@@ -1,136 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-@XmlSeeAlso({ OrgNetwork.class, ExternalNetwork.class })
-public abstract class Network extends Entity {
-
- @XmlType
- @XmlEnum(String.class)
- public static enum FenceMode {
- @XmlEnumValue("bridged") BRIDGED("bridged"),
- @XmlEnumValue("isolated") ISOLATED("isolated"),
- @XmlEnumValue("natRouted") NAT_ROUTED("natRouted"),
- UNRECOGNIZED("unrecognized");
-
- public static final List<FenceMode> ALL = ImmutableList.of(
- BRIDGED, ISOLATED, NAT_ROUTED);
-
- protected final String stringValue;
-
- FenceMode(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, FenceMode> FENCE_MODE_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(FenceMode.values()), new Function<FenceMode, String>() {
- @Override
- public String apply(FenceMode input) {
- return input.stringValue;
- }
- });
-
- public static FenceMode fromValue(String value) {
- FenceMode mode = FENCE_MODE_BY_ID.get(checkNotNull(value, "stringValue"));
- return mode == null ? UNRECOGNIZED : mode;
- }
- }
-
- public abstract static class Builder<T extends Builder<T>> extends Entity.Builder<T> {
- protected NetworkConfiguration networkConfiguration;
-
- /**
- * @see Network#getConfiguration()
- */
- public T configuration(NetworkConfiguration networkConfiguration) {
- this.networkConfiguration = networkConfiguration;
- return self();
- }
-
- public T fromNetwork(Network in) {
- return fromEntityType(in).configuration(in.getConfiguration());
- }
- }
-
- public Network(Builder<?> b) {
- super(b);
- networkConfiguration = b.networkConfiguration;
- }
-
- protected Network() {
- // for JAXB
- }
-
- @SuppressWarnings("unchecked")
- public static <T extends Network> T toSubType(Network clazz) {
- return (T)clazz;
- }
-
- @XmlElement(name = "Configuration")
- private NetworkConfiguration networkConfiguration;
-
- /**
- * @return optional configuration
- */
- public NetworkConfiguration getConfiguration() {
- return networkConfiguration;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o))
- return false;
- Network that = Network.class.cast(o);
- return super.equals(that) && equal(networkConfiguration, that.networkConfiguration);
- }
-
- @Override
- public int hashCode() {
- return super.hashCode() + Objects.hashCode(networkConfiguration);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("configuration", networkConfiguration);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java
deleted file mode 100644
index 340e4f1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java
+++ /dev/null
@@ -1,133 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents mapping between a VM and vApp network.
- */
-@XmlType(name = "NetworkAssignment")
-public class NetworkAssignment
-
-
-{
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNetworkAssignment(this);
- }
-
- public static class Builder {
-
- private String innerNetwork;
- private String containerNetwork;
-
- /**
- * @see NetworkAssignment#getInnerNetwork()
- */
- public Builder innerNetwork(String innerNetwork) {
- this.innerNetwork = innerNetwork;
- return this;
- }
-
- /**
- * @see NetworkAssignment#getContainerNetwork()
- */
- public Builder containerNetwork(String containerNetwork) {
- this.containerNetwork = containerNetwork;
- return this;
- }
-
- public NetworkAssignment build() {
- return new NetworkAssignment(innerNetwork, containerNetwork);
- }
-
- public Builder fromNetworkAssignment(NetworkAssignment in) {
- return innerNetwork(in.getInnerNetwork())
- .containerNetwork(in.getContainerNetwork());
- }
- }
-
- private NetworkAssignment(String innerNetwork, String containerNetwork) {
- this.innerNetwork = innerNetwork;
- this.containerNetwork = containerNetwork;
- }
-
- private NetworkAssignment() {
- // for JAXB
- }
-
-
- @XmlAttribute(required = true)
- protected String innerNetwork;
- @XmlAttribute(required = true)
- protected String containerNetwork;
-
- /**
- * Gets the value of the innerNetwork property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getInnerNetwork() {
- return innerNetwork;
- }
-
- /**
- * Gets the value of the containerNetwork property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getContainerNetwork() {
- return containerNetwork;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NetworkAssignment that = NetworkAssignment.class.cast(o);
- return equal(innerNetwork, that.innerNetwork) &&
- equal(containerNetwork, that.containerNetwork);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(innerNetwork,
- containerNetwork);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("innerNetwork", innerNetwork)
- .add("containerNetwork", containerNetwork).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java
deleted file mode 100644
index 9fe80df..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java
+++ /dev/null
@@ -1,237 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "NetworkConfiguration")
-@XmlRootElement(name = "NetworkConfiguration")
-public class NetworkConfiguration {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromConfiguration(this);
- }
-
- public static class Builder {
- private IpScope ipScope;
- private Reference parentNetwork;
- private FenceMode fenceMode;
- private Boolean retainNetInfoAcrossDeployments;
- private NetworkFeatures features;
- private SyslogServerSettings syslogServerSettings;
- private RouterInfo routerInfo;
-
- /**
- * @see NetworkConfiguration#getIpScope()
- */
- public Builder ipScope(IpScope ipScope) {
- this.ipScope = ipScope;
- return this;
- }
-
- /**
- * @see NetworkConfiguration#getParentNetwork()
- */
- public Builder parentNetwork(Reference parentNetwork) {
- this.parentNetwork = parentNetwork;
- return this;
- }
-
- /**
- * @see NetworkConfiguration#getFenceMode()
- */
- public Builder fenceMode(FenceMode fenceMode) {
- this.fenceMode = fenceMode;
- return this;
- }
-
- /**
- * @see NetworkConfiguration#retainNetInfoAcrossDeployments()
- */
- public Builder retainNetInfoAcrossDeployments(boolean retainNetInfoAcrossDeployments) {
- this.retainNetInfoAcrossDeployments = retainNetInfoAcrossDeployments;
- return this;
- }
-
- /**
- * @see NetworkConfiguration#getNetworkFeatures()
- */
- public Builder features(NetworkFeatures features) {
- this.features = features;
- return this;
- }
-
- /**
- * @see NetworkConfiguration#getSyslogServerSettings()
- */
- public Builder syslogServerSettings(SyslogServerSettings syslogServerSettings) {
- this.syslogServerSettings = syslogServerSettings;
- return this;
- }
-
- /**
- * @see NetworkConfiguration#getRouterInfo()
- */
- public Builder routerInfo(RouterInfo routerInfo) {
- this.routerInfo = routerInfo;
- return this;
- }
-
- public NetworkConfiguration build() {
- return new NetworkConfiguration(ipScope, parentNetwork, fenceMode, retainNetInfoAcrossDeployments, features, syslogServerSettings, routerInfo);
- }
-
- public Builder fromConfiguration(NetworkConfiguration in) {
- return ipScope(in.getIpScope()).parentNetwork(in.getParentNetwork()).fenceMode(in.getFenceMode())
- .retainNetInfoAcrossDeployments(in.retainNetInfoAcrossDeployments())
- .features(in.getNetworkFeatures())
- .syslogServerSettings(in.getSyslogServerSettings())
- .routerInfo(in.getRouterInfo());
- }
- }
-
- public NetworkConfiguration(IpScope ipScope, Reference parentNetwork, FenceMode fenceMode, Boolean retainNetInfoAcrossDeployments,
- NetworkFeatures features, SyslogServerSettings syslogServerSettings, RouterInfo routerInfo) {
- this.ipScope = ipScope;
- this.parentNetwork = parentNetwork;
- this.fenceMode = checkNotNull(fenceMode, "fenceMode");
- this.retainNetInfoAcrossDeployments = retainNetInfoAcrossDeployments;
- this.features = features;
- this.syslogServerSettings = syslogServerSettings;
- this.routerInfo = routerInfo;
- }
-
- protected NetworkConfiguration() {
- // for JAXB
- }
-
- @XmlElement(name = "IpScope")
- private IpScope ipScope;
- @XmlElement(name = "ParentNetwork")
- private Reference parentNetwork;
- @XmlElement(name = "FenceMode")
- private FenceMode fenceMode;
- @XmlElement(name = "RetainNetInfoAcrossDeployments")
- private Boolean retainNetInfoAcrossDeployments;
- @XmlElement(name = "Features")
- private NetworkFeatures features;
- @XmlElement(name = "SyslogServerSettings")
- private SyslogServerSettings syslogServerSettings;
- @XmlElement(name = "RouterInfo")
- private RouterInfo routerInfo;
-
- /**
- * @return IP level configuration items such as gateway, dns, subnet,
- * IP address pool to be used for allocation. Note that the pool of IP addresses
- * needs to fall within the subnet/mask of the IpScope.
- */
- public IpScope getIpScope() {
- return ipScope;
- }
-
- /**
- * @return reference to parent network.
- */
- public Reference getParentNetwork() {
- return parentNetwork;
- }
-
- /**
- * @return Isolation type of the network. If ParentNetwork is specified, this property
- * controls connectivity to the parent. One of: bridged (connected directly to the ParentNetwork),
- * isolated (not connected to any other network), natRouted (connected to the ParentNetwork via a
- * NAT service)
- */
- public FenceMode getFenceMode() {
- return fenceMode;
- }
-
- /**
- * @return whether the network resources such as IP/MAC of router will be retained
- * across deployments. Default is false.
- */
- public Boolean retainNetInfoAcrossDeployments() {
- return retainNetInfoAcrossDeployments;
- }
-
- /**
- * @return Network features like DHCP, firewall and NAT rules.
- */
- public NetworkFeatures getNetworkFeatures() {
- return features;
- }
-
- /**
- * @return Syslog server settings for the network.
- */
- public SyslogServerSettings getSyslogServerSettings() {
- return syslogServerSettings;
- }
-
- /**
- * @return router information
- */
- public RouterInfo getRouterInfo() {
- return routerInfo;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NetworkConfiguration that = NetworkConfiguration.class.cast(o);
- return equal(ipScope, that.ipScope) &&
- equal(parentNetwork, that.parentNetwork) &&
- equal(fenceMode, that.fenceMode) &&
- equal(retainNetInfoAcrossDeployments, that.retainNetInfoAcrossDeployments) &&
- equal(features, that.features) &&
- equal(syslogServerSettings, that.syslogServerSettings) &&
- equal(routerInfo, that.routerInfo);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(ipScope, parentNetwork, fenceMode, retainNetInfoAcrossDeployments,
- features, syslogServerSettings, routerInfo);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("ipScope", ipScope).add("parentNetwork", parentNetwork)
- .add("fenceMode", fenceMode)
- .add("retainNetInfoAcrossDeployments", retainNetInfoAcrossDeployments)
- .add("features", features)
- .add("syslogServerSettings", syslogServerSettings)
- .add("routerInfo", routerInfo).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java
deleted file mode 100644
index caa22aa..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java
+++ /dev/null
@@ -1,342 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-@XmlType(name = "NetworkConnection", propOrder = {
- "networkConnectionIndex",
- "ipAddress",
- "externalIpAddress",
- "isConnected",
- "macAddress",
- "ipAddressAllocationMode"
-})
-public class NetworkConnection {
-
- @XmlType
- @XmlEnum(String.class)
- public static enum IpAddressAllocationMode {
- @XmlEnumValue("POOL") POOL("pool"),
- @XmlEnumValue("DHCP") DHCP("dhcp"),
- @XmlEnumValue("MANUAL") MANUAL("manual"),
- @XmlEnumValue("NONE") NONE("none"),
- @XmlEnumValue("") UNRECOGNIZED("unrecognized");
-
- public static final List<IpAddressAllocationMode> ALL = ImmutableList.of(POOL, DHCP, MANUAL, NONE);
-
- protected final String label;
-
- IpAddressAllocationMode(String stringValue) {
- this.label = stringValue;
- }
-
- public String label() {
- return label;
- }
-
- protected static final Map<String, IpAddressAllocationMode> IP_ADDRESS_ALLOCATION_MODE_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(IpAddressAllocationMode.values()), new Function<IpAddressAllocationMode, String>() {
- @Override
- public String apply(IpAddressAllocationMode input) {
- return input.label;
- }
- });
-
- public static IpAddressAllocationMode fromValue(String value) {
- IpAddressAllocationMode mode = IP_ADDRESS_ALLOCATION_MODE_BY_ID.get(checkNotNull(value, "stringValue"));
- return mode == null ? UNRECOGNIZED : mode;
- }
- }
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNetworkConnection(this);
- }
-
- public static class Builder {
-
- private int networkConnectionIndex;
- private String ipAddress;
- private String externalIpAddress;
- private boolean isConnected;
- private String macAddress;
- private IpAddressAllocationMode ipAddressAllocationMode;
- private String network;
- private Boolean needsCustomization;
-
- /**
- * @see NetworkConnection#getNetworkConnectionIndex()
- */
- public Builder networkConnectionIndex(int networkConnectionIndex) {
- this.networkConnectionIndex = networkConnectionIndex;
- return this;
- }
-
- /**
- * @see NetworkConnection#getIpAddress()
- */
- public Builder ipAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- return this;
- }
-
- /**
- * @see NetworkConnection#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NetworkConnection#isConnected()
- */
- public Builder isConnected(boolean isConnected) {
- this.isConnected = isConnected;
- return this;
- }
-
- /**
- * @see NetworkConnection#getMACAddress()
- */
- public Builder macAddress(String macAddress) {
- this.macAddress = macAddress;
- return this;
- }
-
- /**
- * @see NetworkConnection#getIpAddressAllocationMode()
- */
- public Builder ipAddressAllocationMode(IpAddressAllocationMode ipAddressAllocationMode) {
- this.ipAddressAllocationMode = ipAddressAllocationMode;
- return this;
- }
-
- /**
- * @see NetworkConnection#getIpAddressAllocationMode()
- */
- public Builder ipAddressAllocationMode(String ipAddressAllocationMode) {
- this.ipAddressAllocationMode = IpAddressAllocationMode.valueOf(ipAddressAllocationMode);
- return this;
- }
-
- /**
- * @see NetworkConnection#getNetwork()
- */
- public Builder network(String network) {
- this.network = network;
- return this;
- }
-
- /**
- * @see NetworkConnection#needsCustomization()
- */
- public Builder needsCustomization(Boolean needsCustomization) {
- this.needsCustomization = needsCustomization;
- return this;
- }
-
-
- public NetworkConnection build() {
- return new NetworkConnection(networkConnectionIndex, ipAddress, externalIpAddress, isConnected,
- macAddress, ipAddressAllocationMode, network, needsCustomization);
- }
-
-
- public Builder fromNetworkConnection(NetworkConnection in) {
- return networkConnectionIndex(in.getNetworkConnectionIndex())
- .ipAddress(in.getIpAddress())
- .externalIpAddress(in.getExternalIpAddress())
- .isConnected(in.isConnected())
- .macAddress(in.getMACAddress())
- .ipAddressAllocationMode(in.getIpAddressAllocationMode())
- .network(in.getNetwork())
- .needsCustomization(in.needsCustomization());
- }
- }
-
- public NetworkConnection(int networkConnectionIndex, String ipAddress, String externalIpAddress, boolean connected,
- String macAddress, IpAddressAllocationMode ipAddressAllocationMode, String network, Boolean needsCustomization) {
- this.networkConnectionIndex = networkConnectionIndex;
- this.ipAddress = ipAddress;
- this.externalIpAddress = externalIpAddress;
- this.isConnected = connected;
- this.macAddress = macAddress;
- this.ipAddressAllocationMode = ipAddressAllocationMode;
- this.network = network;
- this.needsCustomization = needsCustomization;
- }
-
- NetworkConnection() {
- // for JAXB
- }
-
-
- @XmlElement(name = "NetworkConnectionIndex")
- protected int networkConnectionIndex;
- @XmlElement(name = "IpAddress")
- protected String ipAddress;
- @XmlElement(name = "ExternalIpAddress")
- protected String externalIpAddress;
- @XmlElement(name = "IsConnected")
- protected boolean isConnected;
- @XmlElement(name = "MACAddress")
- protected String macAddress;
- @XmlElement(name = "IpAddressAllocationMode", required = true)
- protected IpAddressAllocationMode ipAddressAllocationMode;
- @XmlAttribute(required = true)
- protected String network;
- @XmlAttribute
- protected Boolean needsCustomization;
-
- /**
- * Gets the value of the networkConnectionIndex property.
- */
- public int getNetworkConnectionIndex() {
- return networkConnectionIndex;
- }
-
- /**
- * Gets the value of the ipAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getIpAddress() {
- return ipAddress;
- }
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the isConnected property.
- */
- public boolean isConnected() {
- return isConnected;
- }
-
- /**
- * Gets the value of the macAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getMACAddress() {
- return macAddress;
- }
-
- /**
- * Gets the value of the ipAddressAllocationMode property.
- *
- * @return possible object is
- * {@link String }
- */
- public IpAddressAllocationMode getIpAddressAllocationMode() {
- return ipAddressAllocationMode;
- }
-
- /**
- * Gets the value of the network property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getNetwork() {
- return network;
- }
-
- /**
- * Gets the value of the needsCustomization property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean needsCustomization() {
- return needsCustomization;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NetworkConnection that = NetworkConnection.class.cast(o);
- return equal(networkConnectionIndex, that.networkConnectionIndex) &&
- equal(ipAddress, that.ipAddress) &&
- equal(externalIpAddress, that.externalIpAddress) &&
- equal(isConnected, that.isConnected) &&
- equal(macAddress, that.macAddress) &&
- equal(ipAddressAllocationMode, that.ipAddressAllocationMode) &&
- equal(network, that.network) &&
- equal(needsCustomization, that.needsCustomization);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(networkConnectionIndex,
- ipAddress,
- externalIpAddress,
- isConnected,
- macAddress,
- ipAddressAllocationMode,
- network,
- needsCustomization);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("networkConnectionIndex", networkConnectionIndex)
- .add("ipAddress", ipAddress)
- .add("externalIpAddress", externalIpAddress)
- .add("isConnected", isConnected)
- .add("macAddress", macAddress)
- .add("ipAddressAllocationMode", ipAddressAllocationMode)
- .add("network", network)
- .add("needsCustomization", needsCustomization).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java
deleted file mode 100644
index a909576..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java
+++ /dev/null
@@ -1,109 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-@XmlRootElement(name = "Features")
-public class NetworkFeatures {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNetworkFeatures(this);
- }
-
- public static class Builder {
-
- private Set<NetworkService<?>> services = Sets.newLinkedHashSet();
-
- /**
- * @see NetworkFeatures#getNetworkServices()
- */
- public Builder services(Set<? extends NetworkService<?>> services) {
- this.services = Sets.newLinkedHashSet(checkNotNull(services, "services"));
- return this;
- }
-
- /**
- * @see NetworkFeatures#getNetworkServices()
- */
- public Builder service(NetworkService<?> service) {
- services.add(checkNotNull(service, "service"));
- return this;
- }
-
- public NetworkFeatures build() {
- return new NetworkFeatures(services);
- }
-
- public Builder fromNetworkFeatures(NetworkFeatures in) {
- return services(in.getNetworkServices());
- }
- }
-
- NetworkFeatures() {
- // for JAXB
- }
-
- public NetworkFeatures(Set<? extends NetworkService<?>> services) {
- this.services = ImmutableSet.copyOf(services);
- }
-
- @XmlElementRef
- private Set<? extends NetworkService<?>> services = Sets.newLinkedHashSet();
-
- /**
- * @return a Network service. May be any of DhcpService, NatService, IpsecVpnService,
- * DhcpService, or StaticRoutingService.
- */
- public Set<? extends NetworkService<?>> getNetworkServices() {
- return Collections.unmodifiableSet(services);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NetworkFeatures that = NetworkFeatures.class.cast(o);
- return equal(services, that.services);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(services);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("services", services).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java
deleted file mode 100644
index e704d9c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java
+++ /dev/null
@@ -1,96 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import com.google.common.base.Objects;
-
-@XmlSeeAlso({
- DhcpService.class,
- IpsecVpnService.class,
- FirewallService.class,
- DhcpService.class,
- StaticRoutingService.class,
- NatService.class
-})
-public abstract class NetworkService<T extends NetworkService<T>> {
- public abstract Builder<T> toBuilder();
-
- public abstract static class Builder<T extends NetworkService<T>> {
- protected boolean isEnabled;
-
- /**
- * @see NetworkService#isEnabled()
- */
- public Builder<T> enabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
-
- public abstract NetworkService<T> build();
-
- public Builder<T> fromNetworkServiceType(NetworkService<T> in) {
- return enabled(in.isEnabled());
- }
- }
-
- protected NetworkService(boolean enabled) {
- isEnabled = enabled;
- }
-
- protected NetworkService() {
- // for JAXB
- }
-
- @XmlElement(name = "IsEnabled")
- private boolean isEnabled;
-
- /**
- * @return Enable or disable the service using this flag
- */
- public boolean isEnabled() {
- return isEnabled;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NetworkService<?> that = NetworkService.class.cast(o);
- return equal(isEnabled, that.isEnabled);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(isEnabled);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("isEnabled", isEnabled);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java
deleted file mode 100644
index 4a45535..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java
+++ /dev/null
@@ -1,96 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "RouterInfo")
-public class RouterInfo {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromRouterInfo(this);
- }
-
- public static class Builder {
-
- private String externalIp;
-
- /**
- * @see RouterInfo#getExternalIp()
- */
- public Builder externalIp(String externalIp) {
- this.externalIp = externalIp;
- return this;
- }
-
- public RouterInfo build() {
- return new RouterInfo(externalIp);
- }
-
- public Builder fromRouterInfo(RouterInfo in) {
- return externalIp(in.getExternalIp());
- }
- }
-
- private RouterInfo() {
- // for JAXB
- }
-
- private RouterInfo(String externalIp) {
- this.externalIp = externalIp;
- }
-
-
- @XmlElement(name = "ExternalIp")
- private String externalIp;
-
- /**
- * @return the external IP of the router. Applicable for NAT Routed / Fenced networks only.
- */
- public String getExternalIp() {
- return externalIp;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RouterInfo that = RouterInfo.class.cast(o);
- return equal(externalIp, that.externalIp);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(externalIp, externalIp);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("externalIp", externalIp).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java
deleted file mode 100644
index c21262e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java
+++ /dev/null
@@ -1,199 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Specifies connection details for the organization s SMTP server.
- * If IsDefaultSmtpServer (in OrgEmailSettings) is false, the SmtpServerSettings
- * element is taken into account.
- */
-@XmlType(name = "SmtpServerSettings", propOrder = {
- "useAuthentication",
- "host",
- "username",
- "password"
-})
-public class SmtpServerSettings {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromSmtpServerSettings(this);
- }
-
- public static class Builder {
-
- private boolean useAuthentication;
- private String host;
- private String username;
- private String password;
-
- /**
- * @see SmtpServerSettings#getIsUseAuthentication()
- */
- public Builder useAuthentication(boolean useAuthentication) {
- this.useAuthentication = useAuthentication;
- return this;
- }
-
- /**
- * @see SmtpServerSettings#getHost()
- */
- public Builder host(String host) {
- this.host = host;
- return this;
- }
-
- /**
- * @see SmtpServerSettings#getUsername()
- */
- public Builder username(String username) {
- this.username = username;
- return this;
- }
-
- /**
- * @see SmtpServerSettings#getPassword()
- */
- public Builder password(String password) {
- this.password = password;
- return this;
- }
-
-
- public SmtpServerSettings build() {
- return new SmtpServerSettings(useAuthentication, host, username, password);
- }
-
-
- public Builder fromSmtpServerSettings(SmtpServerSettings in) {
- return useAuthentication(in.useAuthentication())
- .host(in.getHost())
- .username(in.getUsername())
- .password(in.getPassword());
- }
- }
-
- @SuppressWarnings("unused")
- private SmtpServerSettings() {
- // For JAXB
- }
-
- public SmtpServerSettings(boolean useAuthentication, String host,
- String username, String password) {
- this.useAuthentication = useAuthentication;
- this.host = host;
- this.username = username;
- }
-
- @XmlElement(name = "IsUseAuthentication")
- protected boolean useAuthentication;
- @XmlElement(name = "Host", required = true)
- protected String host;
- @XmlElement(name = "Username", required = true)
- protected String username;
- @XmlElement(name = "Password")
- protected String password;
-
- /**
- * Gets the value of the isUseAuthentication property.
- *
- */
- public boolean useAuthentication() {
- return useAuthentication;
- }
-
- /**
- * Gets the value of the host property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHost() {
- return host;
- }
-
- /**
- * Gets the value of the username property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUsername() {
- return username;
- }
-
- /**
- * Gets the value of the password property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPassword() {
- return password;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- SmtpServerSettings that = SmtpServerSettings.class.cast(o);
- return equal(useAuthentication, that.useAuthentication) &&
- equal(host, that.host) &&
- equal(username, that.username) &&
- equal(password, that.password);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(useAuthentication,
- host,
- username,
- password);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("isUseAuthentication", useAuthentication)
- .add("host", host)
- .add("username", username)
- .add("password", password);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java
deleted file mode 100644
index ee14aab..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java
+++ /dev/null
@@ -1,183 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "StaticRoute", propOrder = {
- "name",
- "network",
- "nextHopIp",
- "theInterface"
-})
-public class StaticRoute {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromStaticRoute(this);
- }
-
- public static class Builder {
- private String name;
- private String network;
- private String nextHopIp;
- private String theInterface;
-
- /**
- * @see StaticRoute#getName()
- */
- public Builder name(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * @see StaticRoute#getNetwork()
- */
- public Builder network(String network) {
- this.network = network;
- return this;
- }
-
- /**
- * @see StaticRoute#getNextHopIp()
- */
- public Builder nextHopIp(String nextHopIp) {
- this.nextHopIp = nextHopIp;
- return this;
- }
-
- /**
- * @see StaticRoute#getInterface()
- */
- public Builder setInterface(String theInterface) {
- this.theInterface = theInterface;
- return this;
- }
-
- public StaticRoute build() {
- return new StaticRoute(name, network, nextHopIp, theInterface);
- }
-
- public Builder fromStaticRoute(StaticRoute in) {
- return name(in.getName())
- .network(in.getNetwork())
- .nextHopIp(in.getNextHopIp())
- .setInterface(in.getInterface());
- }
- }
-
- private StaticRoute(String name, String network, String nextHopIp, String theInterface) {
- this.name = checkNotNull(name, "name");
- this.network = checkNotNull(network, "network");
- this.nextHopIp = checkNotNull(nextHopIp, "nextHopIp");
- this.theInterface = checkNotNull(theInterface, "interface");
- }
-
- private StaticRoute() {
- // for JAXB
- }
-
-
- @XmlElement(name = "Name", required = true)
- protected String name;
- @XmlElement(name = "Network", required = true)
- protected String network;
- @XmlElement(name = "NextHopIp", required = true)
- protected String nextHopIp;
- @XmlElement(name = "Interface", required = true)
- protected String theInterface;
-
- /**
- * Gets the value of the name property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the value of the network property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getNetwork() {
- return network;
- }
-
- /**
- * Gets the value of the nextHopIp property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getNextHopIp() {
- return nextHopIp;
- }
-
- /**
- * Gets the value of the interface property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getInterface() {
- return theInterface;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- StaticRoute that = StaticRoute.class.cast(o);
- return equal(name, that.name) &&
- equal(network, that.network) &&
- equal(nextHopIp, that.nextHopIp) &&
- equal(theInterface, that.theInterface);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name,
- network,
- nextHopIp,
- theInterface);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("name", name)
- .add("network", network)
- .add("nextHopIp", nextHopIp)
- .add("interface", theInterface).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
deleted file mode 100644
index b8ff5f9..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
+++ /dev/null
@@ -1,124 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "StaticRoutingService")
-@XmlType(propOrder = {
- "staticRoutes"
-})
-public class StaticRoutingService extends NetworkService<StaticRoutingService> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromStaticRoutingService(this);
- }
-
- public static class Builder extends NetworkService.Builder<StaticRoutingService> {
-
- private List<StaticRoute> staticRoutes = ImmutableList.of();
-
- /**
- * @see StaticRoutingService#getStaticRoutes()
- */
- public Builder staticRoutes(List<StaticRoute> staticRoutes) {
- this.staticRoutes = ImmutableList.copyOf(checkNotNull(staticRoutes, "staticRoutes"));
- return this;
- }
-
-
- @Override
- public StaticRoutingService build() {
- return new StaticRoutingService(isEnabled, staticRoutes);
- }
-
-
- @Override
- public Builder fromNetworkServiceType(NetworkService<StaticRoutingService> in) {
- return Builder.class.cast(super.fromNetworkServiceType(in));
- }
-
- public Builder fromStaticRoutingService(StaticRoutingService in) {
- return fromNetworkServiceType(in)
- .staticRoutes(in.getStaticRoutes());
- }
-
- @Override
- public Builder enabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
- }
-
- private StaticRoutingService(boolean enabled, List<StaticRoute> staticRoutes) {
- super(enabled);
- this.staticRoutes = ImmutableList.copyOf(staticRoutes);
- }
-
- private StaticRoutingService() {
- // for JAXB
- }
-
- @XmlElement(name = "StaticRoute")
- protected List<StaticRoute> staticRoutes = Lists.newArrayList();
-
- /**
- * Gets the value of the staticRoutes property.
- */
- public List<StaticRoute> getStaticRoutes() {
- return Collections.unmodifiableList(this.staticRoutes);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- StaticRoutingService that = StaticRoutingService.class.cast(o);
- return equal(staticRoutes, that.staticRoutes);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(staticRoutes);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("staticRoutes", staticRoutes).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java
deleted file mode 100644
index c437938..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java
+++ /dev/null
@@ -1,117 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-
-/**
- * Syslog server settings. If logging is configured for firewall rules, the logs
- * will be directed to these syslog servers.
- */
-@XmlRootElement(name = "SyslogServerSettings")
-public class SyslogServerSettings {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromSyslogServerSettings(this);
- }
-
- public static class Builder {
-
- private String syslogServerIp1;
- private String syslogServerIp2;
-
- /**
- * @see SyslogServerSettings#getSyslogServerIp1()
- */
- public Builder syslogServerIp1(String syslogServerIp1) {
- this.syslogServerIp1 = syslogServerIp1;
- return this;
- }
-
- /**
- * @see SyslogServerSettings#getSyslogServerIp2()
- */
- public Builder syslogServerIp2(String syslogServerIp2) {
- this.syslogServerIp2 = syslogServerIp2;
- return this;
- }
-
- public SyslogServerSettings build() {
- SyslogServerSettings syslogServerSettings = new SyslogServerSettings();
- syslogServerSettings.syslogServerIp1 = syslogServerIp1;
- syslogServerSettings.syslogServerIp2 = syslogServerIp2;
- return syslogServerSettings;
- }
-
- public Builder fromSyslogServerSettings(SyslogServerSettings in) {
- return syslogServerIp1(in.getSyslogServerIp1()).syslogServerIp2(in.getSyslogServerIp2());
- }
- }
-
- private SyslogServerSettings() {
- // for JAXB
- }
-
- @XmlElement(name = "SyslogServerIp1")
- private String syslogServerIp1;
- @XmlElement(name = "SyslogServerIp2")
- private String syslogServerIp2;
-
- /**
- * @return Primary syslog server.
- */
- public String getSyslogServerIp1() {
- return syslogServerIp1;
- }
-
- /**
- * @return Secondary syslog server.
- */
- public String getSyslogServerIp2() {
- return syslogServerIp2;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- SyslogServerSettings that = SyslogServerSettings.class.cast(o);
- return equal(syslogServerIp1, that.syslogServerIp1) && equal(syslogServerIp2, that.syslogServerIp1);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(syslogServerIp1, syslogServerIp2);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("syslogServerIp1", syslogServerIp1)
- .add("syslogServerIp1", syslogServerIp2).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
deleted file mode 100644
index 377fc6f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
+++ /dev/null
@@ -1,119 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlType(name = "VAppNetwork")
-public class VAppNetwork extends Network {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVAppNetwork(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Network.Builder<B> {
-
- private Boolean deployed;
-
- /**
- * @see VAppNetwork#isDeployed()
- */
- public B isDeployed(Boolean deployed) {
- this.deployed = deployed;
- return self();
- }
-
- /**
- * @see VAppNetwork#isDeployed()
- */
- public B deployed() {
- this.deployed = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see VAppNetwork#isDeployed()
- */
- public B notDeployed() {
- this.deployed = Boolean.FALSE;
- return self();
- }
-
- @Override
- public VAppNetwork build() {
- return new VAppNetwork(this);
- }
-
- public B fromVAppNetwork(VAppNetwork in) {
- return fromNetwork(in).isDeployed(in.isDeployed());
- }
- }
-
- protected VAppNetwork() {
- // For JAXB and builder use
- }
-
- public VAppNetwork(Builder<?> builder) {
- super(builder);
- deployed = builder.deployed;
-
- }
-
- @XmlAttribute
- private Boolean deployed;
-
- /**
- * Gets the value of the deployed property.
- */
- public Boolean isDeployed() {
- return deployed;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VAppNetwork that = VAppNetwork.class.cast(o);
- return super.equals(that) && equal(this.deployed, that.deployed);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), deployed);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("deployed", deployed);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
deleted file mode 100644
index 30744ef..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
+++ /dev/null
@@ -1,176 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "NetworkConfiguration")
-@XmlType(name = "VAppNetworkConfiguration")
-public class VAppNetworkConfiguration extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVAppNetworkConfiguration(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private String description;
- private NetworkConfiguration configuration;
- private Boolean deployed;
- private String networkName;
-
- /**
- * @see VAppNetworkConfiguration#getDescription()
- */
- public B description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see VAppNetworkConfiguration#getConfiguration()
- */
- public B configuration(NetworkConfiguration configuration) {
- this.configuration = configuration;
- return self();
- }
-
- /**
- * @see VAppNetworkConfiguration#isDeployed()
- */
- public B isDeployed(Boolean deployed) {
- this.deployed = deployed;
- return self();
- }
-
- /**
- * @see VAppNetworkConfiguration#getNetworkName()
- */
- public B networkName(String networkName) {
- this.networkName = networkName;
- return self();
- }
-
- @Override
- public VAppNetworkConfiguration build() {
- return new VAppNetworkConfiguration(this);
- }
-
- public B fromVAppNetworkConfiguration(VAppNetworkConfiguration in) {
- return fromResource(in)
- .description(in.getDescription())
- .configuration(in.getConfiguration())
- .isDeployed(in.isDeployed())
- .networkName(in.getNetworkName());
- }
- }
-
- @XmlElement(name = "Description")
- private String description;
- @XmlElement(name = "Configuration", required = true)
- private NetworkConfiguration configuration;
- @XmlElement(name = "IsDeployed")
- private Boolean deployed;
- @XmlAttribute(required = true)
- private String networkName;
-
- protected VAppNetworkConfiguration(Builder<?> builder) {
- super(builder);
- this.description = builder.description;
- this.configuration = builder.configuration;
- this.deployed = builder.deployed;
- this.networkName = builder.networkName;
- }
-
- protected VAppNetworkConfiguration() {
- // For JAXB
- }
-
- /**
- * Gets the value of the description property.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Gets the value of the configuration property.
- */
- public NetworkConfiguration getConfiguration() {
- return configuration;
- }
-
- /**
- * Gets the value of the deployed property.
- */
- public Boolean isDeployed() {
- return deployed;
- }
-
- /**
- * Gets the value of the networkName property.
- */
- public String getNetworkName() {
- return networkName;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VAppNetworkConfiguration that = VAppNetworkConfiguration.class.cast(o);
- return super.equals(that) &&
- equal(this.description, that.description) &&
- equal(this.configuration, that.configuration) &&
- equal(this.deployed, that.deployed) &&
- equal(this.networkName, that.networkName);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), description, configuration, deployed, networkName);
- }
-
- @Override
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("description", description)
- .add("configuration", configuration)
- .add("deployed", deployed)
- .add("networkName", networkName);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/package-info.java
deleted file mode 100644
index e9d7912..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
[07/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiLiveTest.java
deleted file mode 100644
index c4f2425..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiLiveTest.java
+++ /dev/null
@@ -1,947 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CORRECT_VALUE_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.ENTITY_EQUAL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.MEDIA;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkGuestCustomizationSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataFor;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataKeyAbsentFor;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkNetworkConnectionSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOperatingSystemSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkProductSectionList;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkRasdItemsList;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkResourceAllocationSettingData;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkRuntimeInfoSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkScreenTicket;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkVirtualHardwareSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkVm;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkVmPendingQuestion;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.jclouds.dmtf.cim.OSType;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.ovf.MsgType;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.vcloud.director.v1_5.AbstractVAppApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status;
-import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion;
-import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer;
-import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswerChoice;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection.IpAddressAllocationMode;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.MediaInsertOrEjectParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "VmApiLiveTest")
-public class VmApiLiveTest extends AbstractVAppApiLiveTest {
-
- private String metadataValue;
- private String key;
- private boolean testUserCreated = false;
-
- @BeforeClass(alwaysRun = true)
- protected void setupRequiredEntities() {
-
- if (adminContext != null) {
- userId = adminContext.getApi().getUserApi().addUserToOrg(randomTestUser("VAppAccessTest"), org.getHref())
- .getId();
- }
- }
-
- @AfterClass(alwaysRun = true, dependsOnMethods = { "cleanUpEnvironment" })
- public void cleanUp() {
- if (adminContext != null && testUserCreated && userId != null) {
- try {
- adminContext.getApi().getUserApi().remove(context.resolveIdToAdminHref(userId));
- } catch (Exception e) {
- logger.warn("Error when deleting user: %s", e.getMessage());
- }
- }
- }
-
- /**
- * @see VmApi#get(String)
- */
- @Test(description = "GET /vApp/{id}")
- public void testGetVm() {
- // The method under test
- vm = vmApi.get(context.resolveIdToHref(vmId));
-
- // Check the retrieved object is well formed
- checkVm(vm);
-
- // Check the required fields are set
- assertEquals(vm.isDeployed(), Boolean.FALSE,
- String.format(OBJ_FIELD_EQ, VM, "deployed", "FALSE", vm.isDeployed().toString()));
- String vAppNetworkName = context.getApi().getNetworkApi().get(context.resolveIdToHref(networkId)).getName();
- attachVmToVAppNetwork(vm, vAppNetworkName);
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- /**
- * @see VmApi#edit(String, Vm)
- */
- @Test(description = "PUT /vApp/{id}", dependsOnMethods = { "testGetVm" })
- public void testEditVm() {
- Vm newVm = Vm.builder().name(name("new-name-")).description("New Description").build();
-
- // The method under test
- Task editVm = vmApi.edit(vm.getHref(), newVm);
- assertTrue(retryTaskSuccess.apply(editVm), String.format(TASK_COMPLETE_TIMELY, "editVm"));
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check the required fields are set
- assertEquals(vm.getName(), newVm.getName(),
- String.format(OBJ_FIELD_EQ, VM, "Name", newVm.getName(), vm.getName()));
- assertEquals(vm.getDescription(), newVm.getDescription(),
- String.format(OBJ_FIELD_EQ, VM, "Description", newVm.getDescription(), vm.getDescription()));
- }
-
- @Test(description = "POST /vApp/{id}/action/deploy", dependsOnMethods = { "testGetVm" })
- public void testDeployVm() {
- DeployVAppParams params = DeployVAppParams.builder()
- .deploymentLeaseSeconds((int) TimeUnit.SECONDS.convert(1L, TimeUnit.HOURS)).notForceCustomization()
- .notPowerOn().build();
-
- // The method under test
- Task deployVm = vmApi.deploy(vm.getHref(), params);
- assertTrue(retryTaskSuccessLong.apply(deployVm), String.format(TASK_COMPLETE_TIMELY, "deployVm"));
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check the required fields are set
- assertTrue(vm.isDeployed(), String.format(OBJ_FIELD_EQ, VM, "deployed", "TRUE", vm.isDeployed().toString()));
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- @Test(description = "POST /vApp/{id}/power/action/powerOn", dependsOnMethods = { "testDeployVm" })
- public void testPowerOnVm() {
- // Power off Vm
- vm = powerOffVm(vm.getHref());
-
- // The method under test
- Task powerOnVm = vmApi.powerOn(vm.getHref());
- assertTaskSucceedsLong(powerOnVm);
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_ON);
- }
-
- @Test(description = "POST /vApp/{id}/power/action/reboot", dependsOnMethods = { "testDeployVm" })
- public void testReboot() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- Task reboot = vmApi.reboot(vm.getHref());
- assertTaskSucceedsLong(reboot);
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- @Test(description = "POST /vApp/{id}/power/action/shutdown", dependsOnMethods = { "testInstallVMwareTools" })
- public void testShutdown() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- Task shutdown = vmApi.shutdown(vm.getHref());
- assertTaskSucceedsLong(shutdown);
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- @Test(description = "POST /vApp/{id}/power/action/suspend", dependsOnMethods = { "testDeployVm" })
- public void testSuspend() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- Task suspend = vmApi.suspend(vm.getHref());
- assertTaskSucceedsLong(suspend);
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check status
- assertVmStatus(vm.getHref(), Status.SUSPENDED);
-
- // Power on the Vm again
- vm = powerOnVm(vm.getHref());
- }
-
- @Test(description = "POST /vApp/{id}/power/action/reset", dependsOnMethods = { "testDeployVm" })
- public void testReset() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- Task reset = vmApi.reset(vm.getHref());
- assertTaskSucceedsLong(reset);
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_ON);
- }
-
- @Test(description = "POST /vApp/{id}/action/undeploy", dependsOnMethods = { "testDeployVm" })
- public void testUndeployVm() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- UndeployVAppParams params = UndeployVAppParams.builder().build();
-
- // The method under test
- Task undeploy = vmApi.undeploy(vm.getHref(), params);
- assertTrue(retryTaskSuccess.apply(undeploy), String.format(TASK_COMPLETE_TIMELY, "undeploy"));
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check status
- assertFalse(vm.isDeployed(), String.format(OBJ_FIELD_EQ, VM, "deployed", "FALSE", vm.isDeployed().toString()));
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- @Test(description = "POST /vApp/{id}/power/action/powerOff", dependsOnMethods = { "testUndeployVm" })
- public void testPowerOffVm() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- // NB this will put the vm in partially powered off state
- Task powerOffVm = vmApi.powerOff(vm.getHref());
- assertTrue(retryTaskSuccess.apply(powerOffVm), String.format(TASK_COMPLETE_TIMELY, "powerOffVm"));
-
- // Get the edited Vm
- vm = vmApi.get(vm.getHref());
-
- // Check status
- assertVmStatus(vm.getHref(), Status.POWERED_OFF);
- }
-
- @Test(description = "POST /vApp/{id}/action/discardSuspendedState", dependsOnMethods = { "testDeployVm" })
- public void testDiscardSuspendedState() {
- // Suspend the Vm
- vm = suspendVm(vm.getHref());
-
- // The method under test
- Task discardSuspendedState = vmApi.discardSuspendedState(vm.getHref());
- assertTrue(retryTaskSuccess.apply(discardSuspendedState),
- String.format(TASK_COMPLETE_TIMELY, "discardSuspendedState"));
- }
-
- @Test(description = "POST /vApp/{id}/action/installVMwareTools", dependsOnMethods = { "testDeployVm" })
- public void testInstallVMwareTools() {
- // First ensure the vApp is powered on
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- Task installVMwareTools = vmApi.installVMwareTools(vm.getHref());
- assertTrue(retryTaskSuccess.apply(installVMwareTools), String.format(TASK_COMPLETE_TIMELY, "installVMwareTools"));
- }
-
- @Test(description = "POST /vApp/{id}/action/upgradeHardwareVersion", dependsOnMethods = { "testGetVm" })
- public void testUpgradeHardwareVersion() {
- // Power off Vm
- vm = powerOffVm(vm.getHref());
-
- // The method under test
- Task upgradeHardwareVersion = vmApi.upgradeHardwareVersion(vm.getHref());
- assertTrue(retryTaskSuccess.apply(upgradeHardwareVersion),
- String.format(TASK_COMPLETE_TIMELY, "upgradeHardwareVersion"));
-
- // Power on the Vm again
- vm = powerOnVm(vm.getHref());
- }
-
- @Test(description = "GET /vApp/{id}/guestCustomizationSection", dependsOnMethods = { "testGetVm" })
- public void testGetGuestCustomizationSection() {
- getGuestCustomizationSection(new Function<URI, GuestCustomizationSection>() {
- @Override
- public GuestCustomizationSection apply(URI uri) {
- return vmApi.getGuestCustomizationSection(uri);
- }
- });
- }
-
- @Test(description = "PUT /vApp/{id}/guestCustomizationSection", dependsOnMethods = { "testGetGuestCustomizationSection" })
- public void testEditGuestCustomizationSection() {
- // Copy existing section and edit fields
- GuestCustomizationSection oldSection = vmApi.getGuestCustomizationSection(vm.getHref());
- GuestCustomizationSection newSection = oldSection.toBuilder().computerName(name("n")).enabled(Boolean.TRUE)
- .adminPassword(null) // Not allowed
- .build();
-
- // The method under test
- Task editGuestCustomizationSection = vmApi.editGuestCustomizationSection(vm.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editGuestCustomizationSection),
- String.format(TASK_COMPLETE_TIMELY, "editGuestCustomizationSection"));
-
- // Retrieve the modified section
- GuestCustomizationSection modified = vmApi.getGuestCustomizationSection(vm.getHref());
-
- // Check the retrieved object is well formed
- checkGuestCustomizationSection(modified);
-
- // Check the modified section fields are set correctly
- assertEquals(modified.getComputerName(), newSection.getComputerName());
- assertTrue(modified.isEnabled());
-
- // Reset the admin password in the retrieved GuestCustomizationSection for equality check
- modified = modified.toBuilder().adminPassword(null).build();
-
- // Check the section was modified correctly
- assertEquals(modified, newSection, String.format(ENTITY_EQUAL, "GuestCustomizationSection"));
- }
-
- @Test(description = "PUT /vApp/{id}/media/action/insertMedia", dependsOnMethods = { "testGetVm" })
- public void testInsertMedia() {
- // Setup media params from configured media id
- MediaInsertOrEjectParams params = MediaInsertOrEjectParams
- .builder()
- .media(Reference.builder().href(lazyGetMedia().getHref())
- .type(MEDIA).build()).build();
-
- // The method under test
- Task insertMediaTask = vmApi.insertMedia(vm.getHref(), params);
- assertTrue(retryTaskSuccess.apply(insertMediaTask),
- String.format(TASK_COMPLETE_TIMELY, "insertMedia"));
- }
-
- @Test(description = "PUT /vApp/{id}/media/action/ejectMedia", dependsOnMethods = { "testInsertMedia" })
- public void testEjectMedia() {
-
- // Setup media params from configured media id
- MediaInsertOrEjectParams params = MediaInsertOrEjectParams.builder()
- .media(Reference.builder()
- .href(lazyGetMedia().getHref()).type(MEDIA).build()).build();
-
- // The method under test
- Task ejectMedia = vmApi.ejectMedia(vm.getHref(), params);
- assertTrue(retryTaskSuccess.apply(ejectMedia), String.format(TASK_COMPLETE_TIMELY, "ejectMedia"));
- }
-
- @Test(description = "GET /vApp/{id}/networkConnectionSection", dependsOnMethods = { "testGetVm" })
- public void testGetNetworkConnectionSection() {
- getNetworkConnectionSection(new Function<URI, NetworkConnectionSection>() {
- @Override
- public NetworkConnectionSection apply(URI uri) {
- return vmApi.getNetworkConnectionSection(uri);
- }
- });
- }
-
- @Test(description = "PUT /vApp/{id}/networkConnectionSection", dependsOnMethods = { "testEditGuestCustomizationSection" })
- public void testEditNetworkConnectionSection() {
-
- // Look up a network in the Vdc
- Set<Reference> networks = vdc.getAvailableNetworks();
- Reference network = Iterables.getLast(networks);
-
- // Copy existing section and edit fields
- NetworkConnectionSection oldSection = vmApi
- .getNetworkConnectionSection(vm.getHref());
- NetworkConnection newNetworkConnection = NetworkConnection.builder()
- .network(network.getName()).networkConnectionIndex(1)
- .ipAddressAllocationMode(IpAddressAllocationMode.DHCP).build();
- NetworkConnectionSection newSection = oldSection.toBuilder()
- .networkConnection(newNetworkConnection).build();
-
- // The method under test
- Task editNetworkConnectionSection = vmApi.editNetworkConnectionSection(vm.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editNetworkConnectionSection),
- String.format(TASK_COMPLETE_TIMELY,
- "editNetworkConnectionSection"));
-
- // Retrieve the modified section
- NetworkConnectionSection modified = vmApi
- .getNetworkConnectionSection(vm.getHref());
-
- // Check the retrieved object is well formed
- checkNetworkConnectionSection(modified);
-
- // Check the section was modified correctly
- for (NetworkConnection connection : modified.getNetworkConnections()) {
- if (connection.getNetwork().equals(
- newNetworkConnection.getNetwork())) {
- assertEquals(connection.getIpAddressAllocationMode(),
- newNetworkConnection.getIpAddressAllocationMode());
- assertSame(connection.getNetworkConnectionIndex(), newNetworkConnection
- .getNetworkConnectionIndex());
- }
- }
- }
-
- @Test(description = "GET /vApp/{id}/operatingSystemSection", dependsOnMethods = { "testGetVm" })
- public void testGetOperatingSystemSection() {
- // The method under test
- OperatingSystemSection section = vmApi.getOperatingSystemSection(vm.getHref());
-
- // Check the retrieved object is well formed
- checkOperatingSystemSection(section);
- }
-
- @Test(description = "PUT /vApp/{id}/operatingSystemSection", dependsOnMethods = { "testGetOperatingSystemSection",
- "testEditVirtualHardwareSection" })
- public void testEditOperatingSystemSection() {
- // Create new OperatingSystemSection
- OperatingSystemSection newSection = OperatingSystemSection.builder().info("") // NOTE Required
- // OVF field,
- // ignored
- .id(OSType.RHEL_64.getCode()).osType("rhel5_64Guest").build();
-
- // The method under test
- Task editOperatingSystemSection = vmApi.editOperatingSystemSection(vm.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editOperatingSystemSection),
- String.format(TASK_COMPLETE_TIMELY, "editOperatingSystemSection"));
-
- // Retrieve the modified section
- OperatingSystemSection modified = vmApi.getOperatingSystemSection(vm.getHref());
-
- // Check the retrieved object is well formed
- checkOperatingSystemSection(modified);
-
- // Check the modified section fields are set correctly
- assertEquals(modified.getHref(), newSection.getHref());
- }
-
- @Test(description = "GET /vApp/{id}/productSections", dependsOnMethods = { "testGetVm" })
- public void testGetProductSections() {
- // The method under test
- ProductSectionList sectionList = vmApi.getProductSections(vm.getHref());
-
- // Check the retrieved object is well formed
- checkProductSectionList(sectionList);
- }
-
- @Test(description = "PUT /vApp/{id}/productSections", dependsOnMethods = { "testGetProductSections" })
- public void testEditProductSections() {
- powerOffVm(vm.getHref());
- // Copy existing section and edit fields
- ProductSectionList oldSections = vmApi.getProductSections(vm.getHref());
- ProductSectionList newSections = oldSections
- .toBuilder()
- .productSection(
- ProductSection.builder().info("Information about the installed software")
- // Default ovf:Info text
- .required().product(MsgType.builder().value("jclouds").build())
- .vendor(MsgType.builder().value("jclouds Inc.").build())
- // NOTE other ProductSection elements not returned by vCloud
- .build()).build();
-
- // The method under test
- Task editProductSections = vmApi.editProductSections(vm.getHref(), newSections);
- assertTrue(retryTaskSuccess.apply(editProductSections),
- String.format(TASK_COMPLETE_TIMELY, "editProductSections"));
-
- // Retrieve the modified section
- ProductSectionList modified = vmApi.getProductSections(vm.getHref());
-
- // Check the retrieved object is well formed
- checkProductSectionList(modified);
-
- // Check the modified object has an extra ProductSection
- assertEquals(modified.getProductSections().size(), oldSections.getProductSections().size() + 1);
-
- // Check the section was modified correctly
- assertEquals(modified, newSections);
- }
-
- // FIXME How do we force it to ask a question?
- @Test(description = "GET /vApp/{id}/question", dependsOnMethods = { "testDeployVm" })
- public void testGetPendingQuestion() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // TODO how to test?
-
- // The method under test
- VmPendingQuestion question = vmApi.getPendingQuestion(vm.getHref());
-
- // Check the retrieved object is well formed
- checkVmPendingQuestion(question);
- }
-
- @Test(description = "POST /vApp/{id}/question/action/answer", dependsOnMethods = { "testGetPendingQuestion" })
- public void testAnswerQuestion() {
- // TODO check that the question has been answered (e.g. asking for getPendingQuestion does not
- // include our answered question).
-
- VmPendingQuestion question = vmApi.getPendingQuestion(vm.getHref());
- List<VmQuestionAnswerChoice> answerChoices = question.getChoices();
- VmQuestionAnswerChoice answerChoice = Iterables.getFirst(answerChoices, null);
- assertNotNull(answerChoice, "Question " + question + " must have at least once answer-choice");
-
- VmQuestionAnswer answer = VmQuestionAnswer.builder().choiceId(answerChoice.getId())
- .questionId(question.getQuestionId()).build();
-
- vmApi.answerQuestion(vm.getHref(), answer);
- }
-
- @Test(description = "GET /vApp/{id}/runtimeInfoSection", dependsOnMethods = { "testGetVm" })
- public void testGetRuntimeInfoSection() {
- // The method under test
- RuntimeInfoSection section = vmApi.getRuntimeInfoSection(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRuntimeInfoSection(section);
- }
-
- @Test(description = "GET /vApp/{id}/screen", dependsOnMethods = { "testInstallVMwareTools" })
- public void testGetScreenImage() {
- // Power on Vm
- vm = powerOnVm(vm.getHref()); // we need to have a way to wait for complete bootstrap
-
- // The method under test
- byte[] image = vmApi.getScreenImage(vm.getHref());
-
- // Check returned bytes against PNG header magic number
- byte[] pngHeaderBytes = new byte[] { (byte) 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
- assertNotNull(image);
- assertTrue(image.length > pngHeaderBytes.length);
- for (int i = 0; i < pngHeaderBytes.length; i++) {
- assertEquals(image[i], pngHeaderBytes[i],
- String.format("Image differs from PNG format at byte %d of header", i));
- }
- }
-
- @Test(description = "POST /vApp/{id}/screen/action/acquireTicket", dependsOnMethods = { "testDeployVm" })
- public void testGetScreenTicket() {
- // Power on Vm
- vm = powerOnVm(vm.getHref());
-
- // The method under test
- ScreenTicket ticket = vmApi.getScreenTicket(vm.getHref());
-
- // Check the retrieved object is well formed
- checkScreenTicket(ticket);
- }
-
- @Test(description = "GET /vApp/{id}/virtualHardwareSection", dependsOnMethods = { "testGetVm" })
- public void testGetVirtualHardwareSection() {
- // Method under test
- VirtualHardwareSection hardware = vmApi.getVirtualHardwareSection(vm.getHref());
-
- // Check the retrieved object is well formed
- checkVirtualHardwareSection(hardware);
- }
-
- @Test(description = "PUT /vApp/{id}/virtualHardwareSection", dependsOnMethods = { "testGetVirtualHardwareSection" })
- public void testEditVirtualHardwareSection() {
- // Power off Vm
- vm = powerOffVm(vm.getHref());
-
- // Copy existing section and edit fields
- VirtualHardwareSection oldSection = vmApi.getVirtualHardwareSection(vm.getHref());
- Set<? extends ResourceAllocationSettingData> oldItems = oldSection.getItems();
- Set<ResourceAllocationSettingData> newItems = Sets.newLinkedHashSet(oldItems);
- ResourceAllocationSettingData oldMemory = Iterables.find(oldItems,
- new Predicate<ResourceAllocationSettingData>() {
- @Override
- public boolean apply(ResourceAllocationSettingData rasd) {
- return rasd.getResourceType() == ResourceAllocationSettingData.ResourceType.MEMORY;
- }
- });
- ResourceAllocationSettingData newMemory = oldMemory.toBuilder().elementName("1024 MB of memory")
- .virtualQuantity(new BigInteger("1024")).build();
- newItems.remove(oldMemory);
- newItems.add(newMemory);
- VirtualHardwareSection newSection = oldSection.toBuilder().items(newItems).build();
-
- // The method under test
- Task editVirtualHardwareSection = vmApi.editVirtualHardwareSection(vm.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editVirtualHardwareSection),
- String.format(TASK_COMPLETE_TIMELY, "editVirtualHardwareSection"));
-
- // Retrieve the modified section
- VirtualHardwareSection modifiedSection = vmApi.getVirtualHardwareSection(vm.getHref());
-
- // Check the retrieved object is well formed
- checkVirtualHardwareSection(modifiedSection);
-
- // Check the modified section fields are set correctly
- ResourceAllocationSettingData modifiedMemory = Iterables.find(modifiedSection.getItems(),
- new Predicate<ResourceAllocationSettingData>() {
- @Override
- public boolean apply(ResourceAllocationSettingData rasd) {
- return rasd.getResourceType() == ResourceAllocationSettingData.ResourceType.MEMORY;
- }
- });
- assertEquals(modifiedMemory.getVirtualQuantity(), new BigInteger("1024"));
- assertEquals(modifiedMemory, newMemory);
- assertEquals(modifiedSection, newSection);
- }
-
- @Test(description = "GET /vApp/{id}/virtualHardwareSection/cpu", dependsOnMethods = { "testGetVirtualHardwareSection" })
- public void testGetVirtualHardwareSectionCpu() {
- // Method under test
- RasdItem rasd = vmApi.getVirtualHardwareSectionCpu(vm.getHref());
-
- // Check the retrieved object is well formed
- checkResourceAllocationSettingData(rasd);
- }
-
- @Test(description = "PUT /vApp/{id}/virtualHardwareSection/cpu", dependsOnMethods = { "testGetVirtualHardwareSectionCpu" })
- public void testEditVirtualHardwareSectionCpu() {
- // Copy existing section and edit fields
- RasdItem oldItem = vmApi.getVirtualHardwareSectionCpu(vm.getHref());
- RasdItem newItem = oldItem.toBuilder().elementName("2 virtual CPU(s)").virtualQuantity(new BigInteger("2"))
- .build();
-
- // Method under test
- Task editVirtualHardwareSectionCpu = vmApi.editVirtualHardwareSectionCpu(vm.getHref(), newItem);
- assertTrue(retryTaskSuccess.apply(editVirtualHardwareSectionCpu),
- String.format(TASK_COMPLETE_TIMELY, "editVirtualHardwareSectionCpu"));
-
- // Retrieve the modified section
- RasdItem modified = vmApi.getVirtualHardwareSectionCpu(vm.getHref());
-
- // Check the retrieved object
- checkResourceAllocationSettingData(modified);
-
- // Check modified item
- assertEquals(modified.getVirtualQuantity(), new BigInteger("2"), String.format(OBJ_FIELD_EQ,
- "ResourceAllocationSettingData", "VirtualQuantity", "2", modified.getVirtualQuantity().toString()));
- assertEquals(modified, newItem);
- }
-
- @Test(description = "GET /vApp/{id}/virtualHardwareSection/disks", dependsOnMethods = { "testGetVirtualHardwareSection" })
- public void testGetVirtualHardwareSectionDisks() {
- // Method under test
- RasdItemsList rasdItems = vmApi.getVirtualHardwareSectionDisks(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRasdItemsList(rasdItems);
- }
-
- @Test(description = "PUT /vApp/{id}/virtualHardwareSection/disks", dependsOnMethods = { "testGetVirtualHardwareSectionDisks" })
- public void testEditVirtualHardwareSectionDisks() {
- // Copy the existing items list and edit the name of an item
- RasdItemsList oldSection = vmApi.getVirtualHardwareSectionDisks(vm.getHref());
- RasdItemsList newSection = oldSection.toBuilder().build();
-
- // Method under test
- Task editVirtualHardwareSectionDisks = vmApi.editVirtualHardwareSectionDisks(vm.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editVirtualHardwareSectionDisks),
- String.format(TASK_COMPLETE_TIMELY, "editVirtualHardwareSectionDisks"));
-
- // Retrieve the modified section
- RasdItemsList modified = vmApi.getVirtualHardwareSectionDisks(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRasdItemsList(modified);
-
- // TODO What is modifiable? What can we change, so we can assert the change took effect?
- // I tried changing "elementName" of one of the items, but it continued to have the old value
- // when looked up post-edit.
- //
- // List<ResourceAllocationSettingData> newItems = new
- // ArrayList<ResourceAllocationSettingData>(oldSection.getItems());
- // ResourceAllocationSettingData item0 = newItems.get(0);
- // String item0InstanceId = item0.getInstanceID().getValue();
- // String item0ElementName =
- // item0.getElementName().getValue()+"-"+random.nextInt(Integer.MAX_VALUE);
- // newItems.set(0, item0.toBuilder().elementName(newCimString(item0ElementName)).build());
- // RasdItemsList newSection = oldSection.toBuilder()
- // .items(newItems)
- // .build();
- // ...
- // long weight = random.nextInt(Integer.MAX_VALUE);
- // ResourceAllocationSettingData newSection = origSection.toBuilder()
- // .weight(newCimUnsignedInt(weight))
- // .build();
- // ...
- // checkHasMatchingItem("virtualHardwareSection/disk", modified, item0InstanceId,
- // item0ElementName);
- }
-
- @Test(description = "GET /vApp/{id}/virtualHardwareSection/media", dependsOnMethods = { "testGetVirtualHardwareSection" })
- public void testGetVirtualHardwareSectionMedia() {
- // Method under test
- RasdItemsList rasdItems = vmApi.getVirtualHardwareSectionMedia(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRasdItemsList(rasdItems);
- }
-
- @Test(description = "GET /vApp/{id}/virtualHardwareSection/memory", dependsOnMethods = { "testGetVirtualHardwareSection" })
- public void testGetVirtualHardwareSectionMemory() {
- // Method under test
- RasdItem rasd = vmApi.getVirtualHardwareSectionCpu(vm.getHref());
-
- // Check the retrieved object is well formed
- checkResourceAllocationSettingData(rasd);
- }
-
- @Test(description = "PUT /vApp/{id}/virtualHardwareSection/memory", dependsOnMethods = { "testGetVirtualHardwareSectionMemory" })
- public void testEditVirtualHardwareSectionMemory() {
- RasdItem origItem = vmApi.getVirtualHardwareSectionMemory(vm.getHref());
- RasdItem newItem = origItem.toBuilder().elementName("1024 MB of memory").virtualQuantity(new BigInteger("1024"))
- .build();
-
- // Method under test
- Task editVirtualHardwareSectionMemory = vmApi.editVirtualHardwareSectionMemory(vm.getHref(), newItem);
- assertTrue(retryTaskSuccess.apply(editVirtualHardwareSectionMemory),
- String.format(TASK_COMPLETE_TIMELY, "editVirtualHardwareSectionMemory"));
-
- // Retrieve the modified section
- RasdItem modified = vmApi.getVirtualHardwareSectionMemory(vm.getHref());
-
- // Check the retrieved object
- checkResourceAllocationSettingData(modified);
-
- // Check modified item
- assertEquals(modified.getVirtualQuantity(), new BigInteger("1024"), String.format(OBJ_FIELD_EQ,
- "ResourceAllocationSettingData", "VirtualQuantity", "1024", modified.getVirtualQuantity().toString()));
- assertEquals(modified, newItem);
- }
-
- @Test(description = "GET /vApp/{id}/virtualHardwareSection/networkCards", dependsOnMethods = { "testGetVirtualHardwareSection" })
- public void testGetVirtualHardwareSectionNetworkCards() {
- // Method under test
- RasdItemsList rasdItems = vmApi.getVirtualHardwareSectionNetworkCards(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRasdItemsList(rasdItems);
- }
-
- @Test(description = "PUT /vApp/{id}/virtualHardwareSection/networkCards", dependsOnMethods = { "testGetVirtualHardwareSectionNetworkCards" })
- public void testEditVirtualHardwareSectionNetworkCards() {
- RasdItemsList oldSection = vmApi.getVirtualHardwareSectionNetworkCards(vm.getHref());
- RasdItemsList newSection = oldSection.toBuilder().build();
-
- // Method under test
- Task editVirtualHardwareSectionNetworkCards = vmApi.editVirtualHardwareSectionNetworkCards(vm.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editVirtualHardwareSectionNetworkCards),
- String.format(TASK_COMPLETE_TIMELY, "editVirtualHardwareSectionNetworkCards"));
-
- // Retrieve the modified section
- RasdItemsList modified = vmApi.getVirtualHardwareSectionNetworkCards(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRasdItemsList(modified);
-
- // TODO What is modifiable? What can we change, so we can assert the change took effect?
- // I tried changing "elementName" of one of the items, but it continued to have the old value
- // when looked up post-edit.
- // See the description in testEditVirtualHardwareSectionDisks
- }
-
- @Test(description = "GET /vApp/{id}/virtualHardwareSection/serialPorts", dependsOnMethods = { "testGetVirtualHardwareSection" })
- public void testGetVirtualHardwareSectionSerialPorts() {
- // Method under test
- RasdItemsList rasdItems = vmApi.getVirtualHardwareSectionSerialPorts(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRasdItemsList(rasdItems);
- }
-
- @Test(description = "PUT /vApp/{id}/virtualHardwareSection/serialPorts", dependsOnMethods = { "testGetVirtualHardwareSectionSerialPorts" })
- public void testEditVirtualHardwareSectionSerialPorts() {
- RasdItemsList oldSection = vmApi.getVirtualHardwareSectionSerialPorts(vm.getHref());
- RasdItemsList newSection = oldSection.toBuilder().build();
-
- // Method under test
- Task editVirtualHardwareSectionSerialPorts = vmApi.editVirtualHardwareSectionSerialPorts(vm.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editVirtualHardwareSectionSerialPorts),
- String.format(TASK_COMPLETE_TIMELY, "editVirtualHardwareSectionSerialPorts"));
-
- // Retrieve the modified section
- RasdItemsList modified = vmApi.getVirtualHardwareSectionSerialPorts(vm.getHref());
-
- // Check the retrieved object is well formed
- checkRasdItemsList(modified);
-
- // TODO What is modifiable? What can we change, so we can assert the change took effect?
- // I tried changing "elementName" of one of the items, but it continued to have the old value
- // when looked up post-edit.
- // See the description in testEditVirtualHardwareSectionDisks
- }
-
- @Test(description = "PUT /vApp/{id}/metadata/{key}", dependsOnMethods = { "testGetVm" })
- public void testSetMetadataValue() {
- key = name("key-");
- metadataValue = name("value-");
- //TODO: block!!
- context.getApi().getMetadataApi(vm.getHref()).put(key, metadataValue);
-
- // Retrieve the value, and assert it was set correctly
- String newMetadataValue = context.getApi().getMetadataApi(vm.getHref()).get(key);
-
- // Check the retrieved object is well formed
- assertEquals(newMetadataValue, metadataValue,
- String.format(CORRECT_VALUE_OBJECT_FMT, "Value", "MetadataValue", metadataValue, newMetadataValue));
- }
-
- @Test(description = "GET /vApp/{id}/metadata", dependsOnMethods = { "testSetMetadataValue" })
- public void testGetMetadata() {
-
- key = name("key-");
- metadataValue = name("value-");
-
- context.getApi().getMetadataApi(vm.getHref()).put(key, metadataValue);
- // Call the method being tested
- Metadata metadata = context.getApi().getMetadataApi(vm.getHref()).get();
-
- checkMetadata(metadata);
-
- // Check requirements for this test
- assertTrue(metadata.containsValue(metadataValue), String.format(CORRECT_VALUE_OBJECT_FMT, "Value", "MetadataValue", metadata.get(key), metadataValue));
- }
-
- @Test(description = "GET /vApp/{id}/metadata/{key}", dependsOnMethods = { "testGetMetadata" })
- public void testGetOrgMetadataValue() {
- key = name("key-");
- metadataValue = name("value-");
-
- //TODO: block!!
- context.getApi().getMetadataApi(vm.getHref()).put(key, metadataValue);
-
- // Call the method being tested
- String newMetadataValue = context.getApi().getMetadataApi(vm.getHref()).get(key);
-
- assertEquals(newMetadataValue, metadataValue,
- String.format(CORRECT_VALUE_OBJECT_FMT, "Value", "MetadataValue", metadataValue, newMetadataValue));
- }
-
- @Test(description = "DELETE /vApp/{id}/metadata/{key}", dependsOnMethods = { "testSetMetadataValue" })
- public void testRemoveMetadataEntry() {
- // Delete the entry
- Task task = context.getApi().getMetadataApi(vm.getHref()).remove(key);
- retryTaskSuccess.apply(task);
-
- // Confirm the entry has been removed
- Metadata newMetadata = context.getApi().getMetadataApi(vm.getHref()).get();
-
- // Check the retrieved object is well formed
- checkMetadataKeyAbsentFor(VM, newMetadata, key);
- }
-
- @Test(description = "POST /vApp/{id}/metadata", dependsOnMethods = { "testGetMetadata" })
- public void testMergeMetadata() {
- Metadata oldMetadata = context.getApi().getMetadataApi(vm.getHref()).get();
- Map<String, String> oldMetadataMap = Checks.metadataToMap(oldMetadata);
-
- // Store a value, to be removed
- String key = name("key-");
- String value = name("value-");
- Task task = context.getApi().getMetadataApi(vm.getHref()).putAll(ImmutableMap.of(key, value));
- retryTaskSuccess.apply(task);
-
- // Confirm the entry contains everything that was there, and everything that was being added
- Metadata newMetadata = context.getApi().getMetadataApi(vm.getHref()).get();
- Map<String, String> expectedMetadataMap = ImmutableMap.<String, String> builder().putAll(oldMetadataMap)
- .put(key, value).build();
-
- // Check the retrieved object is well formed
- checkMetadataFor(VM, newMetadata, expectedMetadataMap);
- }
-
- @Test(description = "DELETE /vApp/{id}")
- public void testRemoveVm() {
- // Create a temporary VApp to remove
- VApp remove = instantiateVApp();
- DeployVAppParams params = DeployVAppParams.builder()
- .deploymentLeaseSeconds((int) TimeUnit.SECONDS.convert(1L, TimeUnit.HOURS)).notForceCustomization()
- .powerOn().build();
- Task deployVApp = vAppApi.deploy(remove.getHref(), params);
- assertTaskSucceedsLong(deployVApp);
-
- // Get the edited VApp and the Vm
- remove = vAppApi.get(remove.getHref());
- List<Vm> vms = remove.getChildren().getVms();
- Vm temp = Iterables.get(vms, 0);
-
- // otherwise it's impossible to stop a running vApp with no vms
- if (vms.size() == 1) {
- UndeployVAppParams undeployParams = UndeployVAppParams.builder().build();
- Task shutdownVapp = vAppApi.undeploy(remove.getHref(), undeployParams);
- assertTaskSucceedsLong(shutdownVapp);
- } else {
- powerOffVm(temp.getHref());
- }
- // The method under test
- Task removeVm = vmApi.remove(temp.getHref());
- assertTrue(retryTaskSuccess.apply(removeVm), String.format(TASK_COMPLETE_TIMELY, "removeVm"));
-
- Vm removed = vmApi.get(temp.getHref());
- assertNull(removed, "The Vm " + temp.getName() + " should have been removed");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiExpectTest.java
deleted file mode 100644
index ad64c64..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiExpectTest.java
+++ /dev/null
@@ -1,378 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ADMIN_CATALOG;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OWNER;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.PUBLISH_CATALOG_PARAMS;
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "admin" }, singleThreaded = true, testName = "AdminCatalogApiExpectTest")
-public class AdminCatalogApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- static String catalog = "7212e451-76e1-4631-b2de-ba1dfd8080e4";
- static URI catalogAdminHref = URI.create(endpoint + "/admin/catalog/" + catalog);
-
- HttpRequest get = HttpRequest.builder()
- .method("GET")
- .endpoint(catalogAdminHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/admin/catalog.xml", ADMIN_CATALOG + ";version=1.5"))
- .build();
-
- @Test
- public void testGetCatalogHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, get, getResponse);
- assertEquals(api.getCatalogApi().get(catalogAdminHref), catalog());
- }
-
- static String org = "7212e451-76e1-4631-b2de-asdasdasd";
- static URI orgAdminHref = URI.create(endpoint + "/admin/org/" + org);
-
- HttpRequest add = HttpRequest.builder()
- .method("POST")
- .endpoint(orgAdminHref + "/catalogs")
- .addHeader("Accept", ADMIN_CATALOG)
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/admin/addCatalogSource.xml", VCloudDirectorMediaType.ADMIN_CATALOG))
- .build();
-
- HttpResponse addResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/admin/addCatalog.xml", ADMIN_CATALOG + ";version=1.5"))
- .build();
-
- @Test
- public void testAddCatalogHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, add, addResponse);
- assertEquals(api.getCatalogApi().addCatalogToOrg(addCatalogToOrgSource(), orgAdminHref), addCatalogToOrg());
- }
-
- HttpRequest edit = HttpRequest.builder()
- .method("PUT")
- .endpoint(catalogAdminHref)
- .addHeader("Accept", ADMIN_CATALOG)
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/admin/editCatalogSource.xml", VCloudDirectorMediaType.ADMIN_CATALOG))
- .build();
-
- HttpResponse editResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/admin/editCatalog.xml", ADMIN_CATALOG + ";version=1.5"))
- .build();
-
- @Test
- public void testEditCatalogHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, edit, editResponse);
- assertEquals(api.getCatalogApi().edit(catalogAdminHref, editCatalog()), editCatalog());
- }
-
- HttpRequest getOwner = HttpRequest.builder()
- .method("GET")
- .endpoint(catalogAdminHref + "/owner")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getOwnerResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/admin/owner.xml", OWNER + ";version=1.5"))
- .build();
-
- Owner expectedGetOwner = owner().toBuilder()
- .link(Link.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .rel("up")
- .build())
- .link(Link.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner"))
- .type("application/vnd.vmware.vcloud.owner+xml")
- .rel("edit")
- .build())
- .build();
-
- @Test
- public void testGetCatalogOwnerHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, getOwner, getOwnerResponse);
- assertEquals(api.getCatalogApi().getOwner(catalogAdminHref), expectedGetOwner);
- }
-
- HttpRequest setOwner = HttpRequest.builder()
- .method("PUT")
- .endpoint(catalogAdminHref + "/owner")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/admin/editOwnerSource.xml", OWNER + ";version=1.5"))
- .build();
-
- HttpResponse setOwnerResponse = HttpResponse.builder()
- .statusCode(204)
- .build();
-
- Owner ownerToSet = Owner.builder()
- .type("application/vnd.vmware.vcloud.owner+xml")
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .build();
-
- @Test
- public void testSetCatalogOwnerHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, setOwner, setOwnerResponse);
- api.getCatalogApi().setOwner(catalogAdminHref, ownerToSet);
- }
-
- HttpRequest publishCatalog = HttpRequest.builder()
- .method("POST")
- .endpoint(catalogAdminHref + "/action/publish")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/admin/publishCatalogParams.xml", PUBLISH_CATALOG_PARAMS + ";version=1.5"))
- .build();
-
- HttpResponse publishCatalogResponse = HttpResponse.builder()
- .statusCode(204)
- .build();
-
- @Test
- public void testPublishCatalogHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, publishCatalog,
- publishCatalogResponse);
- api.getCatalogApi().publish(catalogAdminHref, PublishCatalogParams.builder().isPublished(true).build());
- }
-
- HttpRequest removeCatalog = HttpRequest.builder()
- .method("DELETE")
- .endpoint(catalogAdminHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse removeCatalogResponse = HttpResponse.builder()
- .statusCode(204)
- .build();
-
- @Test
- public void testRemoveCatalogHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, removeCatalog,
- removeCatalogResponse);
- api.getCatalogApi().remove(catalogAdminHref);
- }
-
- //TODO: tests for access control!
-
- public static final AdminCatalog addCatalogToOrgSource() {
- return AdminCatalog.builder()
- .name("Test Catalog")
- .description("created by testCreateCatalog()")
- .build();
- }
-
- public static final AdminCatalog addCatalogToOrg() {
- return AdminCatalog.builder()
- .name("Test Catalog")
- .id("urn:vcloud:catalog:c56d9159-7838-446f-bb35-9ee12dfbbef3")
- .type("application/vnd.vmware.admin.catalog+xml")
- .description("created by testCreateCatalog()")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.admin.organization+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.owner+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3/owner"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3/catalogItems"))
- .build())
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.catalog+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3/metadata"))
- .build())
- .tasks(ImmutableSet.<Task>builder()
- .add(Task.builder()
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-03-11T18:43:02.429-04:00"))
- .operationName("catalogCreateCatalog")
- .operation("Creating Catalog Test Catalog(c56d9159-7838-446f-bb35-9ee12dfbbef3)")
- .expiryTime(dateService.iso8601DateParse("2012-06-09T18:43:02.429-04:00"))
- .name("task")
- .id("urn:vcloud:task:20f556f9-9125-4090-9092-0da9f72bedf4")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/20f556f9-9125-4090-9092-0da9f72bedf4"))
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/20f556f9-9125-4090-9092-0da9f72bedf4/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .name("Test Catalog")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("dan@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build())
- .build())
- .isPublished(false)
- .build();
- }
-
- public static final AdminCatalog catalog() {
- return AdminCatalog.builder()
- .name("QunyingTestCatalog")
- .id("urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4")
- .type("application/vnd.vmware.admin.catalog+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.admin.organization+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.owner+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/catalogItems"))
- .build())
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.catalog+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata"))
- .build())
- .description("Testing")
- .owner(owner())
- .item(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("image")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/67a469a1-aafe-4b5b-bb31-a6202ad8961f"))
- .build())
- .item(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("ubuntu10")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"))
- .build())
- .item(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("imageTesting")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939"))
- .build())
- .item(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("TestCase")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/f7598606-aea4-41d7-8f67-2090e28e7876"))
- .build())
- .isPublished(false)
- .build();
- }
-
- private static Owner owner() {
- return Owner.builder()
- .type("application/vnd.vmware.vcloud.owner+xml")
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("qunying.huang@enstratus.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"))
- .build())
- .build();
- }
-
- public static final AdminCatalog editCatalog() {
- return catalog().toBuilder()
- .name("new QunyingTestCatalog")
- .description("new Testing")
- .build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiLiveTest.java
deleted file mode 100644
index bb686b3..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApiLiveTest.java
+++ /dev/null
@@ -1,221 +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.vcloud.director.v1_5.features.admin;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_NULL_OBJ_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_DEL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_UPDATABLE;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkControlAccessParams;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.User;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CatalogApiLiveTest")
-public class AdminCatalogApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String CATALOG = "admin catalog";
-
- /*
- * Convenience references to API apis.
- */
-
- private AdminCatalogApi catalogApi;
-
- /*
- * Shared state between dependant tests.
- */
-
- private Org org;
- private AdminCatalog catalog;
- private Owner owner;
-
- @Override
- @BeforeClass(alwaysRun = true)
- protected void setupRequiredApis() {
- catalogApi = adminContext.getApi().getCatalogApi();
- org = context.getApi().getOrgApi().get(Iterables.get(context.getApi().getOrgApi().list(), 0).getHref());
- }
-
- @AfterClass(alwaysRun = true)
- protected void tidyUp() {
- if (catalog != null) {
- try {
- catalogApi.remove(catalog.getHref());
- } catch (Exception e) {
- logger.warn(e, "Error deleting admin catalog '%s'", catalog.getName());
- }
- }
- }
-
- @Test(description = "POST /admin/org/{id}/catalogs")
- public void testAddCatalog() {
- AdminCatalog newCatalog = AdminCatalog.builder().name(name("Test Catalog "))
- .description("created by testAddCatalog()").build();
- catalog = catalogApi.addCatalogToOrg(newCatalog, org.getHref());
-
- Checks.checkAdminCatalog(catalog);
-
- // FIXME: documentation suggests we should wait for a task here
- }
-
- @Test(description = "GET /admin/catalog/{id}", dependsOnMethods = { "testAddCatalog" })
- public void testGetCatalog() {
- catalog = catalogApi.get(catalog.getHref());
-
- Checks.checkAdminCatalog(catalog);
- }
-
- @Test(description = "GET /admin/catalog/{id}/owner", dependsOnMethods = { "testGetCatalog" })
- public void testGetCatalogOwner() {
- owner = catalogApi.getOwner(catalog.getHref());
- Checks.checkOwner(owner);
- }
-
- @Test(description = "PUT /admin/catalog/{id}/owner", dependsOnMethods = { "testGetCatalog" })
- public void editCatalogOwner() {
- User newOwnerUser = randomTestUser("testEditCatalogOwner");
- newOwnerUser = adminContext.getApi().getUserApi().addUserToOrg(newOwnerUser, org.getHref());
- assertNotNull(newOwnerUser, "failed to add temp user to test editCatalogOwner");
-
- Owner oldOwner = owner;
- Owner newOwner = Owner.builder().type("application/vnd.vmware.vcloud.owner+xml")
- .user(Reference.builder().fromEntity(newOwnerUser).build()).build();
-
- try {
- catalogApi.setOwner(catalog.getHref(), newOwner);
- owner = catalogApi.getOwner(catalog.getHref());
- Checks.checkOwner(owner);
- assertTrue(
- equal(owner.toBuilder().links(ImmutableSet.<Link> of()).build(),
- newOwner.toBuilder().user(newOwner.getUser()).build()),
- String.format(OBJ_FIELD_UPDATABLE, CATALOG, "owner"));
- } finally {
- catalogApi.setOwner(catalog.getHref(), oldOwner);
- owner = catalogApi.getOwner(catalog.getHref());
- adminContext.getApi().getUserApi().remove(newOwnerUser.getHref());
- }
- }
-
- @Test(description = "PUT /admin/catalog/{id}", dependsOnMethods = { "testGetCatalogOwner" })
- public void testEditCatalog() {
- String oldName = catalog.getName();
- String newName = "new " + oldName;
- String oldDescription = catalog.getDescription();
- String newDescription = "new " + oldDescription;
- // TODO: can we edit/manage catalogItems directly like this? or does it just do a merge
- // (like metadata)
- // CatalogItems oldCatalogItems = catalog.getCatalogItems();
- // CatalogItems newCatalogItems = CatalogItems.builder().build();
-
- try {
- catalog = catalog.toBuilder().name(newName).description(newDescription)
- // .catalogItems(newCatalogItems)
- .build();
-
- catalog = catalogApi.edit(catalog.getHref(), catalog);
-
- assertTrue(equal(catalog.getName(), newName), String.format(OBJ_FIELD_UPDATABLE, CATALOG, "name"));
- assertTrue(equal(catalog.getDescription(), newDescription),
- String.format(OBJ_FIELD_UPDATABLE, CATALOG, "description"));
- // assertTrue(equal(catalog.getCatalogItems(), newCatalogItems),
- // String.format(OBJ_FIELD_UPDATABLE, CATALOG, "catalogItems"));
-
- // TODO negative tests?
-
- Checks.checkAdminCatalog(catalog);
- } finally {
- catalog = catalog.toBuilder().name(oldName).description(oldDescription)
- // .catalogItems(oldCatalogItems)
- .build();
-
- catalog = catalogApi.edit(catalog.getHref(), catalog);
- }
- }
-
- // FIXME fails with a 403
- @Test(description = "POST /admin/catalog/{id}/action/publish", dependsOnMethods = { "testEditCatalog" })
- public void testPublishCatalog() {
- assertNotNull(catalog, String.format(NOT_NULL_OBJ_FMT, "Catalog"));
- assertFalse(catalog.isPublished(),
- String.format(OBJ_FIELD_EQ, CATALOG, "isPublished", false, catalog.isPublished()));
-
- PublishCatalogParams params = PublishCatalogParams.builder().isPublished(true).build();
-
- catalogApi.publish(catalog.getHref(), params);
- catalog = catalogApi.get(catalog.getHref());
-
- assertTrue(catalog.isPublished(),
- String.format(OBJ_FIELD_EQ, CATALOG, "isPublished", true, catalog.isPublished()));
- }
-
- @Test(description = "GET /org/{id}/catalog/{catalogId}/controlAccess", dependsOnMethods = { "testAddCatalog" })
- public void testGetControlAccessControl() {
- // Call the method being tested
- ControlAccessParams params = catalogApi.getAccessControl(catalog.getHref());
-
- // Check params are well formed
- checkControlAccessParams(params);
- }
-
- @Test(description = "POST /org/{id}/catalog/{catalogId}/action/controlAccess", dependsOnMethods = { "testAddCatalog" })
- public void testEditAccessControl() {
- // Setup params
- ControlAccessParams params = catalogApi.getAccessControl(catalog.getHref());
-
- // Call the method being tested
- ControlAccessParams modified = catalogApi.editAccessControl(catalog.getHref(), params);
-
- // Check params are well formed
- checkControlAccessParams(modified);
- }
-
- @Test(description = "DELETE /admin/catalog/{id}", dependsOnMethods = { "testAddCatalog" })
- public void testRemoveCatalog() {
- // assertEquals(catalog.getCatalogItems().getCatalogItems().size(), 0,
- // String.format(OBJ_FIELD_EMPTY_TO_DELETE, "Catalog", "CatalogItems",
- // catalog.getCatalogItems().getCatalogItems().toString()));
- AdminCatalog removeCatalog = AdminCatalog.builder().name(name("Test Catalog "))
- .description("created by testAddCatalog()").build();
- removeCatalog = catalogApi.addCatalogToOrg(removeCatalog, org.getHref());
- catalogApi.remove(removeCatalog.getHref());
-
- removeCatalog = catalogApi.get(removeCatalog.getHref());
- assertNull(removeCatalog, String.format(OBJ_DEL, CATALOG, removeCatalog != null ? removeCatalog.toString() : ""));
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiExpectTest.java
deleted file mode 100644
index 2a23d83..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiExpectTest.java
+++ /dev/null
@@ -1,232 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_NETWORK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.network.DhcpService;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRange;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpScope;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures;
-import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "admin" }, singleThreaded = true, testName = "AdminNetworkApiExpectTest")
-public class AdminNetworkApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- static String network = "55a677cf-ab3f-48ae-b880-fab90421980c";
- static URI networkAdminHref = URI.create(endpoint + "/admin/network/" + network);
-
- HttpRequest get = HttpRequest.builder()
- .method("GET")
- .endpoint(networkAdminHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/network/network.xml", ORG + ";version=1.5"))
- .build();
-
- @Test
- public void testGetNetworkHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, get, getResponse);
- assertEquals(api.getNetworkApi().get(networkAdminHref), network());
- }
-
- HttpRequest edit = HttpRequest.builder()
- .method("PUT")
- .endpoint(networkAdminHref )
- .addHeader("Accept", TASK)
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/network/admin/editNetworkSource.xml", ORG_NETWORK))
- .build();
-
- HttpResponse editResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/network/admin/editNetworkTask.xml", TASK))
- .build();
-
- @Test
- public void testEditNetworkHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, edit, editResponse);
- assertEquals(api.getNetworkApi().edit(networkAdminHref, editNetwork()), editNetworkTask());
- }
-
- HttpRequest reset = HttpRequest.builder()
- .method("POST")
- .endpoint(networkAdminHref + "/action/reset")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse resetResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/network/admin/resetNetworkTask.xml", TASK))
- .build();
-
- @Test
- public void testResetNetworkHref() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, reset, resetResponse);
- assertEquals(api.getNetworkApi().reset(networkAdminHref), resetNetworkTask());
- }
-
- public static OrgNetwork network() {
- return OrgNetwork.builder()
- .name("ilsolation01-Jclouds")
- .id("urn:vcloud:network:f3ba8256-6f48-4512-aad6-600e85b4dc38")
- .type("application/vnd.vmware.vcloud.orgNetwork+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.org+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38/metadata"))
- .build())
- .description("")
- .configuration(NetworkConfiguration.builder()
- .ipScope(IpScope.builder()
- .isInherited(false)
- .gateway("192.168.1.1")
- .netmask("255.255.255.0")
- .dns1("173.240.111.52")
- .dns2("173.240.111.53")
- .ipRanges(IpRanges.builder()
- .ipRange(IpRange.builder()
- .startAddress("192.168.1.100")
- .endAddress("192.168.1.199")
- .build())
- .build())
- .build())
- .fenceMode(FenceMode.ISOLATED)
- .retainNetInfoAcrossDeployments(false)
- .features(NetworkFeatures.builder()
- .service(DhcpService.builder()
- .enabled(false)
- .defaultLeaseTime(3600)
- .maxLeaseTime(7200)
- .ipRange(IpRange.builder()
- .startAddress("192.168.1.2")
- .endAddress("192.168.1.99")
- .build())
- .build())
- .build())
- .syslogServerSettings(SyslogServerSettings.builder().build())
- .build())
- .allowedExternalIpAddresses(IpAddresses.builder().build())
- .build();
- }
-
- public final OrgNetwork editNetwork() {
- return network().toBuilder()
-
- .build();
- }
-
- public final Task resetNetworkTask() {
- return Task.builder()
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-03-14T12:39:23.720-04:00"))
- .operationName("networkResetNetwork")
- .operation("Resetting Network ilsolation01-Jclouds(f3ba8256-6f48-4512-aad6-600e85b4dc38)")
- .expiryTime(dateService.iso8601DateParse("2012-06-12T12:39:23.720-04:00"))
- .name("task")
- .id("urn:vcloud:task:49d2e180-7921-4902-ac39-b4ff5406bb94")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94"))
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.network+xml")
- .name("ilsolation01-Jclouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("dan@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- public final Task editNetworkTask() {
- return Task.builder()
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-03-14T12:39:23.720-04:00"))
- .operationName("networkUpdateNetwork")
- .operation("Updating Network ilsolation01-Jclouds(f3ba8256-6f48-4512-aad6-600e85b4dc38)")
- .expiryTime(dateService.iso8601DateParse("2012-06-12T12:39:23.720-04:00"))
- .name("task")
- .id("urn:vcloud:task:49d2e180-7921-4902-ac39-b4ff5406bb94")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94"))
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/49d2e180-7921-4902-ac39-b4ff5406bb94/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.network+xml")
- .name("ilsolation01-Jclouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("dan@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-}
[20/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
deleted file mode 100644
index cd1e7d4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
+++ /dev/null
@@ -1,100 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "MediaInsertOrEjectParams")
-@XmlType(name = "MediaInsertOrEjectParamsType")
-public class MediaInsertOrEjectParams {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromMediaInsertOrEjectParams(this);
- }
-
- public static class Builder {
-
- private Reference media;
-
- /**
- * @see MediaInsertOrEjectParams#getMedia()
- */
- public Builder media(Reference media) {
- this.media = media;
- return this;
- }
-
- public MediaInsertOrEjectParams build() {
- MediaInsertOrEjectParams mediaInsertOrEjectParams = new MediaInsertOrEjectParams(media);
- return mediaInsertOrEjectParams;
- }
-
- public Builder fromMediaInsertOrEjectParams(MediaInsertOrEjectParams in) {
- return media(in.getMedia());
- }
- }
-
- protected MediaInsertOrEjectParams() {
- // For JAXB and builder use
- }
-
- public MediaInsertOrEjectParams(Reference media) {
- this.media = media;
- }
-
- @XmlElement(name = "Media", required = true)
- protected Reference media;
-
- /**
- * Gets the value of the media property.
- */
- public Reference getMedia() {
- return media;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- MediaInsertOrEjectParams that = MediaInsertOrEjectParams.class.cast(o);
- return equal(media, that.media);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(media);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("media", media).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
deleted file mode 100644
index 50d9d32..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
+++ /dev/null
@@ -1,133 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * A basic type used to specify parameters for operations.
- */
-@XmlType(name = "ParamsType")
-public class ParamsType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromParamsType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> {
-
- private String description;
- private String name;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see ParamsType#getDescription()
- */
- public B description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see ParamsType#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- public ParamsType build() {
- return new ParamsType(this);
- }
-
- public B fromParamsType(ParamsType in) {
- return description(in.getDescription())
- .name(in.getName());
- }
- }
-
- protected ParamsType(Builder<?> builder) {
- this.description = builder.description;
- this.name = builder.name;
- }
-
- protected ParamsType() {
- // for JAXB
- }
-
-
- @XmlElement(name = "Description")
- protected String description;
- @XmlAttribute
- protected String name;
-
- /**
- * Optional description.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * A name as parameter.
- */
- public String getName() {
- return name;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ParamsType that = ParamsType.class.cast(o);
- return equal(this.description, that.description) && equal(this.name, that.name);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(description, name);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- public ToStringHelper string() {
- return Objects.toStringHelper("").add("description", description).add("name", name);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
deleted file mode 100644
index e6da358..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
+++ /dev/null
@@ -1,104 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "PublishCatalogParams")
-@XmlType(propOrder = {
- "isPublished"
-})
-//TODO: this is ridiculously complex boolean wrapper.
-public class PublishCatalogParams {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromPublishCatalogParams(this);
- }
-
- public static class Builder {
-
- private boolean isPublished;
-
- /**
- * @see PublishCatalogParams#getIsPublished()
- */
- public Builder isPublished(boolean isPublished) {
- this.isPublished = isPublished;
- return this;
- }
-
- public PublishCatalogParams build() {
- return new PublishCatalogParams(isPublished);
- }
-
- public Builder fromPublishCatalogParams(PublishCatalogParams in) {
- return isPublished(in.isPublished());
- }
- }
-
- @SuppressWarnings("unused")
- private PublishCatalogParams() {
- // For JAXB and builder use
- }
-
- public PublishCatalogParams(Boolean isPublished) {
- this.isPublished = isPublished;
- }
-
- @XmlElement(name = "IsPublished")
- protected boolean isPublished;
-
- /**
- * Gets the value of the isPublished property.
- *
- */
- public boolean isPublished() {
- return isPublished;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- PublishCatalogParams that = PublishCatalogParams.class.cast(o);
- return equal(isPublished, that.isPublished);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(isPublished);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("isPublished", isPublished).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
deleted file mode 100644
index f42a385..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
+++ /dev/null
@@ -1,137 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "RecomposeVAppParams")
-@XmlType(name = "RecomposeVAppParamsType")
-public class RecomposeVAppParams extends ComposeVAppParams {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromRecomposeVAppParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ComposeVAppParams.Builder<B> {
-
- private List<Vm> createItem;
- private List<Reference> removeItem;
-
- /**
- * @see RecomposeVAppParams#getCreateItem()
- */
- public B createItem(List<Vm> createItem) {
- this.createItem = createItem;
- return self();
- }
-
- /**
- * @see RecomposeVAppParams#getDeleteItem()
- */
- public B removeItem(List<Reference> removeItem) {
- this.removeItem = removeItem;
- return self();
- }
-
- @Override
- public RecomposeVAppParams build() {
- return new RecomposeVAppParams(this);
- }
-
- public B fromRecomposeVAppParams(RecomposeVAppParams in) {
- return fromComposeVAppParams(in).createItem(in.getCreateItem()).removeItem(in.getDeleteItem());
- }
- }
-
- private RecomposeVAppParams() {
- // For JAXB and B use
- }
-
- private RecomposeVAppParams(Builder<?> builder) {
- super(builder);
- this.createItem = builder.createItem;
- this.removeItem = builder.removeItem;
- }
-
- @XmlElement(name = "CreateItem")
- protected List<Vm> createItem;
- @XmlElement(name = "DeleteItem")
- protected List<Reference> removeItem;
-
- /**
- * Gets the value of the createItem property.
- */
- public List<Vm> getCreateItem() {
- if (createItem == null) {
- createItem = Lists.newArrayList();
- }
- return this.createItem;
- }
-
- /**
- * Gets the value of the removeItem property.
- */
- public List<Reference> getDeleteItem() {
- if (removeItem == null) {
- removeItem = Lists.newArrayList();
- }
- return this.removeItem;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RecomposeVAppParams that = RecomposeVAppParams.class.cast(o);
- return super.equals(that) &&
- equal(this.createItem, that.createItem) && equal(this.removeItem, that.removeItem);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), createItem, removeItem);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("createItem", createItem).add("removeItem", removeItem);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
deleted file mode 100644
index 19462c4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
+++ /dev/null
@@ -1,93 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "RelocateParams")
-@XmlType(propOrder = {
- "datastore"
-})
-public class RelocateParams {
- public static Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
- private Reference datastore;
-
- public Builder datastore(Reference dataStore) {
- this.datastore = dataStore;
- return this;
- }
-
- public RelocateParams build() {
- return new RelocateParams(datastore);
- }
- }
-
- @XmlElement(name = "Datastore", required = true)
- private Reference datastore;
-
- private RelocateParams(Reference datastore) {
- this.datastore = checkNotNull(datastore);
- }
-
- private RelocateParams() {
- // for JAXB
- }
-
- /**
- * Gets the value of the datastore property.
- *
- * @return possible object is
- * {@link Reference }
- */
- public Reference getDatastore() {
- return datastore;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RelocateParams that = RelocateParams.class.cast(o);
- return equal(datastore, that.datastore);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(datastore);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("datastore", datastore).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
deleted file mode 100644
index f53fedc..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
+++ /dev/null
@@ -1,217 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkAssignment;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlType(name = "SourcedCompositionItemParam", propOrder = {
- "source",
- "vAppScopedLocalId",
- "instantiationParams",
- "networkAssignment"
-})
-public class SourcedCompositionItemParam {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromSourcedCompositionItemParam(this);
- }
-
- public static class Builder {
-
- private Reference source;
- private String vAppScopedLocalId;
- private InstantiationParams instantiationParams;
- private Set<NetworkAssignment> networkAssignment = Sets.newLinkedHashSet();
- private Boolean sourceDelete;
-
- /**
- * @see SourcedCompositionItemParam#getSource()
- */
- public Builder source(Reference source) {
- this.source = source;
- return this;
- }
-
- /**
- * @see SourcedCompositionItemParam#getVAppScopedLocalId()
- */
- public Builder vAppScopedLocalId(String vAppScopedLocalId) {
- this.vAppScopedLocalId = vAppScopedLocalId;
- return this;
- }
-
- /**
- * @see SourcedCompositionItemParam#getInstantiationParams()
- */
- public Builder instantiationParams(InstantiationParams instantiationParams) {
- this.instantiationParams = instantiationParams;
- return this;
- }
-
- /**
- * @see SourcedCompositionItemParam#getNetworkAssignment()
- */
- public Builder networkAssignment(Set<NetworkAssignment> networkAssignment) {
- this.networkAssignment = ImmutableSet.copyOf(checkNotNull(networkAssignment, "networkAssignments"));
- return this;
- }
-
- /**
- * @see SourcedCompositionItemParam#isSourceDelete()
- */
- public Builder sourceDelete(Boolean sourceDelete) {
- this.sourceDelete = sourceDelete;
- return this;
- }
-
- public SourcedCompositionItemParam build() {
- return new SourcedCompositionItemParam(source, vAppScopedLocalId, instantiationParams, networkAssignment, sourceDelete);
- }
-
- public Builder fromSourcedCompositionItemParam(SourcedCompositionItemParam in) {
- return source(in.getSource())
- .vAppScopedLocalId(in.getVAppScopedLocalId())
- .instantiationParams(in.getInstantiationParams())
- .networkAssignment(in.getNetworkAssignment())
- .sourceDelete(in.isSourceDelete());
- }
- }
-
- public SourcedCompositionItemParam(Reference source, String vAppScopedLocalId, InstantiationParams instantiationParams,
- Set<NetworkAssignment> networkAssignment, Boolean sourceDelete) {
- this.source = source;
- this.vAppScopedLocalId = vAppScopedLocalId;
- this.instantiationParams = instantiationParams;
- this.networkAssignment = ImmutableSet.copyOf(networkAssignment);
- this.sourceDelete = sourceDelete;
- }
-
- SourcedCompositionItemParam() {
- // for JAXB
- }
-
- @XmlElement(name = "Source", required = true)
- protected Reference source;
- @XmlElement(name = "VAppScopedLocalId")
- protected String vAppScopedLocalId;
- @XmlElement(name = "InstantiationParams")
- protected InstantiationParams instantiationParams;
- @XmlElement(name = "NetworkAssignment")
- protected Set<NetworkAssignment> networkAssignment = Sets.newLinkedHashSet();
- @XmlAttribute
- protected Boolean sourceDelete;
-
- /**
- * Gets the value of the source property.
- *
- * @return possible object is
- * {@link Reference }
- */
- public Reference getSource() {
- return source;
- }
-
-
- /**
- * Gets the value of the vAppScopedLocalId property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVAppScopedLocalId() {
- return vAppScopedLocalId;
- }
-
- /**
- * Gets the value of the instantiationParams property.
- *
- * @return possible object is
- * {@link InstantiationParams }
- */
- public InstantiationParams getInstantiationParams() {
- return instantiationParams;
- }
-
- /**
- * Gets the value of the networkAssignment property.
- */
- public Set<NetworkAssignment> getNetworkAssignment() {
- return Collections.unmodifiableSet(this.networkAssignment);
- }
-
- /**
- * Gets the value of the sourceDelete property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isSourceDelete() {
- return sourceDelete;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- SourcedCompositionItemParam that = SourcedCompositionItemParam.class.cast(o);
- return equal(source, that.source) &&
- equal(vAppScopedLocalId, that.vAppScopedLocalId) &&
- equal(instantiationParams, that.instantiationParams) &&
- equal(networkAssignment, that.networkAssignment) &&
- equal(sourceDelete, that.sourceDelete);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(source,
- vAppScopedLocalId,
- instantiationParams,
- networkAssignment,
- sourceDelete);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("source", source)
- .add("vAppScopedLocalId", vAppScopedLocalId)
- .add("instantiationParams", instantiationParams)
- .add("networkAssignment", networkAssignment)
- .add("sourceDelete", sourceDelete).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
deleted file mode 100644
index e8ddb01..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
+++ /dev/null
@@ -1,165 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-@XmlRootElement(name = "UndeployVAppParams")
-@XmlType(name = "UndeployVAppParamsType")
-public class UndeployVAppParams {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS;
-
- @XmlType
- @XmlEnum(String.class)
- public static enum PowerAction {
- @XmlEnumValue("powerOff") POWER_OFF("powerOff"),
- @XmlEnumValue("suspend") SUSPEND("suspend"),
- @XmlEnumValue("shutdown") SHUTDOWN("shutdown"),
- @XmlEnumValue("force") FORCE("force"),
- @XmlEnumValue("") UNRECOGNIZED("unrecognized");
-
- public static final List<PowerAction> ALL = ImmutableList.of( POWER_OFF, SUSPEND, SHUTDOWN, FORCE );
-
- protected final String stringValue;
-
- PowerAction(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, PowerAction> POWER_ACTION_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(PowerAction.values()), new Function<PowerAction, String>() {
- @Override
- public String apply(PowerAction input) {
- return input.stringValue;
- }
- });
-
- public static PowerAction fromValue(String value) {
- PowerAction action = POWER_ACTION_BY_ID.get(checkNotNull(value, "stringValue"));
- return action == null ? UNRECOGNIZED : action;
- }
- }
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromUndeployVAppParams(this);
- }
-
- public static class Builder {
-
- private PowerAction undeployPowerAction;
-
- /**
- * @see UndeployVAppParams#getUndeployPowerAction()
- */
- public Builder undeployPowerAction(PowerAction undeployPowerAction) {
- this.undeployPowerAction = undeployPowerAction;
- return this;
- }
-
- /**
- * @see UndeployVAppParams#getUndeployPowerAction()
- */
- public Builder undeployPowerAction(String undeployPowerAction) {
- this.undeployPowerAction = PowerAction.valueOf(undeployPowerAction);
- return this;
- }
-
- public UndeployVAppParams build() {
- UndeployVAppParams undeployVAppParams = new UndeployVAppParams();
- undeployVAppParams.undeployPowerAction = undeployPowerAction;
- return undeployVAppParams;
- }
-
- public Builder fromUndeployVAppParams(UndeployVAppParams in) {
- return undeployPowerAction(in.getUndeployPowerAction());
- }
- }
-
- private UndeployVAppParams() {
- // For JAXB and builder use
- }
-
- @XmlElement(name = "UndeployPowerAction")
- protected PowerAction undeployPowerAction;
-
- /**
- * The specified action is applied to all VMs in the vApp.
- *
- * All values other than {@code default} ignore actions, order, and delay specified in the StartupSection. One of:
- * <ul>
- * <li>{@link PowerAction#POWER_OFF powerOff}
- * <li>{@link PowerAction#SUSPEND suspend}
- * <li>{@link PowerAction#SHUTDOWN shutdown}
- * <li>{@link PowerAction#FORCE force}
- * </ul>
- * Failures in undeploying the VM or associated networks are ignored. All references to the vApp and its VMs are
- * removed from the database), default (Use the actions, order, and delay specified in the StartupSection).
- *
- * @since 1.5
- */
- public PowerAction getUndeployPowerAction() {
- return undeployPowerAction;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- UndeployVAppParams that = UndeployVAppParams.class.cast(o);
- return equal(undeployPowerAction, that.undeployPowerAction);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(undeployPowerAction);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("undeployPowerAction", undeployPowerAction).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
deleted file mode 100644
index 0dd54e7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
+++ /dev/null
@@ -1,136 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "UploadVAppTemplateParams")
-@XmlType(name = "UploadVAppTemplateParamsType")
-public class UploadVAppTemplateParams extends ParamsType {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromUploadVAppTemplateParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ParamsType.Builder<B> {
-
- private String transferFormat;
- private Boolean manifestRequired;
-
- /**
- * @see UploadVAppTemplateParams#getTransferFormat()
- */
- public B transferFormat(String transferFormat) {
- this.transferFormat = transferFormat;
- return self();
- }
-
- /**
- * @see UploadVAppTemplateParams#isManifestRequired()
- */
- public B manifestRequired(Boolean manifestRequired) {
- this.manifestRequired = manifestRequired;
- return self();
- }
-
-
- @Override
- public UploadVAppTemplateParams build() {
- return new UploadVAppTemplateParams(this);
- }
-
- public B fromUploadVAppTemplateParams(UploadVAppTemplateParams in) {
- return fromParamsType(in)
- .transferFormat(in.getTransferFormat())
- .manifestRequired(in.isManifestRequired());
- }
- }
-
- public UploadVAppTemplateParams(Builder<?> builder) {
- super(builder);
- this.transferFormat = builder.transferFormat;
- this.manifestRequired = builder.manifestRequired;
- }
-
- protected UploadVAppTemplateParams() {
- // For JAXB
- }
-
-
- @XmlAttribute
- protected String transferFormat;
- @XmlAttribute
- protected Boolean manifestRequired;
-
- /**
- * Gets the value of the transferFormat property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getTransferFormat() {
- return transferFormat;
- }
-
- /**
- * Gets the value of the manifestRequired property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isManifestRequired() {
- return manifestRequired;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- UploadVAppTemplateParams that = UploadVAppTemplateParams.class.cast(o);
- return equal(transferFormat, that.transferFormat) &&
- equal(manifestRequired, that.manifestRequired);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(transferFormat,
- manifestRequired);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("transferFormat", transferFormat)
- .add("manifestRequired", manifestRequired).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
deleted file mode 100644
index 221caa4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
+++ /dev/null
@@ -1,201 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "VAppCreationParams")
-@XmlType(name = "VAppCreationParamsType")
-public class VAppCreationParams extends ParamsType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVAppCreationParamsType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ParamsType.Builder<B> {
-
- private Reference vAppParent;
- private InstantiationParams instantiationParams;
- private Boolean deploy;
- private Boolean powerOn;
-
- /**
- * @see VAppCreationParamsType#getVAppParent()
- */
- public B vAppParent(Reference vAppParent) {
- this.vAppParent = vAppParent;
- return self();
- }
-
- /**
- * @see VAppCreationParamsType#getInstantiationParams()
- */
- public B instantiationParams(InstantiationParams instantiationParams) {
- this.instantiationParams = instantiationParams;
- return self();
- }
-
- /**
- * @see VAppCreationParamsType#isDeploy()
- */
- public B deploy(Boolean deploy) {
- this.deploy = deploy;
- return self();
- }
-
- /**
- * @see VAppCreationParamsType#isDeploy()
- */
- public B deploy() {
- this.deploy = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see VAppCreationParamsType#isDeploy()
- */
- public B notDeploy() {
- this.deploy = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see VAppCreationParamsType#isPowerOn()
- */
- public B powerOn(Boolean powerOn) {
- this.powerOn = powerOn;
- return self();
- }
-
- /**
- * @see VAppCreationParamsType#isPowerOn()
- */
- public B powerOn() {
- this.powerOn = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see VAppCreationParamsType#isPowerOn()
- */
- public B notPowerOn() {
- this.powerOn = Boolean.FALSE;
- return self();
- }
-
- public B fromVAppCreationParamsType(VAppCreationParams in) {
- return fromParamsType(in).vAppParent(in.getVAppParent()).instantiationParams(in.getInstantiationParams()).deploy(in.isDeploy()).powerOn(in.isPowerOn());
- }
- }
-
- protected VAppCreationParams() {
- // For JAXB and B use
- }
-
- public VAppCreationParams(Builder<?> builder) {
- super(builder);
- this.vAppParent = builder.vAppParent;
- this.instantiationParams = builder.instantiationParams;
- this.deploy = builder.deploy;
- this.powerOn = builder.powerOn;
- }
-
- @XmlElement(name = "VAppParent")
- protected Reference vAppParent;
- @XmlElement(name = "InstantiationParams")
- protected InstantiationParams instantiationParams;
- @XmlAttribute
- protected Boolean deploy;
- @XmlAttribute
- protected Boolean powerOn;
-
- /**
- * Reserved.
- *
- * Unimplemented.
- */
- public Reference getVAppParent() {
- return vAppParent;
- }
-
- /**
- * Instantiation parameters of a VApp.
- */
- public InstantiationParams getInstantiationParams() {
- return instantiationParams;
- }
-
- /**
- * Flag to deploy the VApp after successful creation.
- */
- public Boolean isDeploy() {
- return deploy;
- }
-
- /**
- * Flag to deploy and power on the VApp after successful creation.
- */
- public Boolean isPowerOn() {
- return powerOn;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VAppCreationParams that = VAppCreationParams.class.cast(o);
- return super.equals(that) &&
- equal(vAppParent, that.vAppParent) &&
- equal(instantiationParams, that.instantiationParams) &&
- equal(deploy, that.deploy) &&
- equal(powerOn, that.powerOn);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), vAppParent, instantiationParams, deploy, powerOn);
- }
-
- @Override
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("vAppParent", vAppParent)
- .add("instantiationParams", instantiationParams)
- .add("deploy", deploy)
- .add("powerOn", powerOn);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java
deleted file mode 100644
index c83b00d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.params;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
deleted file mode 100644
index 5fe4014..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
+++ /dev/null
@@ -1,67 +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.vcloud.director.v1_5.domain.query;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "CatalogReferences")
-public class CatalogReferences extends QueryResultReferences {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCatalogReferences(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultReferences.Builder<B> {
-
- @Override
- public CatalogReferences build() {
- return new CatalogReferences(this);
- }
-
- public B fromCatalogReferences(CatalogReferences in) {
- return fromQueryResultReferences(in);
- }
- }
-
- protected CatalogReferences(Builder<?> builder) {
- super(builder);
- }
-
- protected CatalogReferences() {
- // for JAXB
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CatalogReferences that = CatalogReferences.class.cast(o);
- return super.equals(that);
- }
-
- // NOTE hashcode inherited from QueryResultReferences
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
deleted file mode 100644
index 67cb49f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
+++ /dev/null
@@ -1,165 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Container for query result sets.
- */
-public class Container extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromContainerType(this);
- }
-
- public static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private String name;
- private Integer page;
- private Integer pageSize;
- private Long total;
-
- /**
- * @see Container#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Container#getPage()
- */
- public B page(Integer page) {
- this.page = page;
- return self();
- }
-
- /**
- * @see Container#getPageSize()
- */
- public B pageSize(Integer pageSize) {
- this.pageSize = pageSize;
- return self();
- }
-
- /**
- * @see Container#getTotal()
- */
- public B total(Long total) {
- this.total = total;
- return self();
- }
-
- @Override
- public Container build() {
- return new Container(this);
- }
-
- public B fromContainerType(Container in) {
- return fromResource(in).name(in.getName()).page(in.getPage()).pageSize(in.getPageSize()).total(in.getTotal());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private Integer page;
- @XmlAttribute
- private Integer pageSize;
- @XmlAttribute
- private Long total;
-
- protected Container(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.page = builder.page;
- this.pageSize = builder.pageSize;
- this.total = builder.total;
- }
-
- protected Container() {
- // for JAXB
- }
-
- /**
- * Query name that generated this result set.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Page of the result set that this container holds. The first page is page number 1.
- */
- public Integer getPage() {
- return page;
- }
-
- /**
- * Page size, as a number of records or references.
- */
- public Integer getPageSize() {
- return pageSize;
- }
-
- /**
- * Total number of records or references in the container.
- */
- public Long getTotal() {
- return total;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Container that = Container.class.cast(o);
- return super.equals(that) &&
- equal(this.name, that.name) && equal(this.page, that.page) &&
- equal(this.pageSize, that.pageSize) && equal(this.total, that.total);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, page, pageSize, total);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("page", page).add("pageSize", pageSize).add("total", total);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
deleted file mode 100644
index 7f7ef92..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
+++ /dev/null
@@ -1,84 +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.vcloud.director.v1_5.domain.query;
-
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Container for the list of typed queries available to the
- * requesting user.
- */
-@XmlType(name = "QueryList")
-public class QueryList extends Container {
-
- // FIXME Should this class have fields?!
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryList(this);
- }
-
- public static class Builder<B extends Builder<B>> extends Container.Builder<B> {
-
- @Override
- public QueryList build() {
- return new QueryList(this);
- }
-
- public Builder<?> fromQueryList(QueryList in) {
- return fromContainerType(in);
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- QueryList() {
- // for JAXB
- }
-
- protected QueryList(Builder<?> builder) {
- super(builder);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryList that = QueryList.class.cast(o);
- return super.equals(that);
- }
-
- @Override
- public int hashCode() {
- return super.hashCode();
- }
-
- @Override
- public ToStringHelper string() {
- return super.string();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
deleted file mode 100644
index 67f37d5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
+++ /dev/null
@@ -1,167 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "GroupRecord")
-@XmlType(name = "QueryResultAdminGroupRecordType")
-public class QueryResultAdminGroupRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultAdminGroupRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String org;
- private String roleName;
- private Boolean isReadOnly;
-
- /**
- * @see QueryResultAdminGroupRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminGroupRecord#get()
- */
- public B org(String val) {
- this.org = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminGroupRecord#getRoleName()
- */
- public B roleName(String val) {
- this.roleName = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminGroupRecord#isReadOnly()
- */
- public B isReadOnly(Boolean val) {
- this.isReadOnly = val;
- return self();
- }
-
- @Override
- public QueryResultAdminGroupRecord build() {
- return new QueryResultAdminGroupRecord(this);
- }
-
- public B fromQueryResultAdminGroupRecord(QueryResultAdminGroupRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .org(in.get())
- .roleName(in.getRoleName())
- .isReadOnly(in.isReadOnly());
- }
-
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String org;
- @XmlAttribute
- private String roleName;
- @XmlAttribute
- private Boolean isReadOnly;
-
- protected QueryResultAdminGroupRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.org = builder.org;
- this.roleName = builder.roleName;
- this.isReadOnly = builder.isReadOnly;
- }
-
- protected QueryResultAdminGroupRecord() {
- // for JAXB
- }
-
- /**
- * name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Organization reference or id
- */
- public String get() {
- return org;
- }
-
- /**
- * Role name
- */
- public String getRoleName() {
- return roleName;
- }
-
- /**
- * Shows whether it is read only
- */
- public Boolean isReadOnly() {
- return isReadOnly;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultAdminGroupRecord that = QueryResultAdminGroupRecord.class.cast(o);
-
- return super.equals(that) && equal(name, that.name) && equal(org, that.org) && equal(roleName, that.roleName) &&
- equal(isReadOnly, that.isReadOnly);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, org, roleName, isReadOnly);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("org", org).add("roleName", roleName).add("isReadOnly", isReadOnly);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
deleted file mode 100644
index d17ed0b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
+++ /dev/null
@@ -1,314 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "UserRecord")
-@XmlType(name = "QueryResultAdminUserRecordType")
-public class QueryResultAdminUserRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultAdminUserRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String org;
- private String fullName;
- private Boolean isEnabled;
- private Integer numberOfDeployedVMs;
- private Integer deployedVMQuota;
- private Integer numberOfStoredVMs;
- private Integer storedVMQuota;
- private Boolean isLdapUser;
- private Integer deployedVMQuotaRank;
- private Integer storedVMQuotaRank;
-
- /**
- * @see QueryResultAdminUserRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#get()
- */
- public B org(String val) {
- this.org = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#getFullName()
- */
- public B fullName(String val) {
- this.fullName = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#isEnabled()
- */
- public B isEnabled(Boolean val) {
- this.isEnabled = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#getNumberOfDeployedVMs()
- */
- public B numberOfDeployedVMs(Integer val) {
- this.numberOfDeployedVMs = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#getDeployedVMQuota()
- */
- public B deployedVMQuota(Integer val) {
- this.deployedVMQuota = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#getNumberOfStoredVMs()
- */
- public B numberOfStoredVMs(Integer val) {
- this.numberOfStoredVMs = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#getStoredVMQuota()
- */
- public B storedVMQuota(Integer val) {
- this.storedVMQuota = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#isLdapUser()
- */
- public B isLdapUser(Boolean val) {
- this.isLdapUser = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#getDeployedVMQuotaRank()
- */
- public B deployedVMQuotaRank(Integer val) {
- this.deployedVMQuotaRank = val;
- return self();
- }
-
- /**
- * @see QueryResultAdminUserRecord#getStoredVMQuotaRank()
- */
- public B storedVMQuotaRank(Integer val) {
- this.storedVMQuotaRank = val;
- return self();
- }
-
- @Override
- public QueryResultAdminUserRecord build() {
- return new QueryResultAdminUserRecord(this);
- }
-
- public B fromQueryResultAdminUserRecord(QueryResultAdminUserRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .org(in.get())
- .fullName(in.getFullName())
- .isEnabled(in.isEnabled())
- .numberOfDeployedVMs(in.getNumberOfDeployedVMs())
- .deployedVMQuota(in.getDeployedVMQuota())
- .numberOfStoredVMs(in.getNumberOfStoredVMs())
- .storedVMQuota(in.getStoredVMQuota())
- .isLdapUser(in.isLdapUser())
- .deployedVMQuotaRank(in.getDeployedVMQuotaRank())
- .storedVMQuotaRank(in.getStoredVMQuotaRank());
- }
-
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String org;
- @XmlAttribute
- private String fullName;
- @XmlAttribute
- private Boolean isEnabled;
- @XmlAttribute
- private Integer numberOfDeployedVMs;
- @XmlAttribute
- private Integer deployedVMQuota;
- @XmlAttribute
- private Integer numberOfStoredVMs;
- @XmlAttribute
- private Integer storedVMQuota;
- @XmlAttribute
- private Boolean isLdapUser;
- @XmlAttribute
- private Integer deployedVMQuotaRank;
- @XmlAttribute
- private Integer storedVMQuotaRank;
-
- protected QueryResultAdminUserRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.org = builder.org;
- this.fullName = builder.fullName;
- this.isEnabled = builder.isEnabled;
- this.numberOfDeployedVMs = builder.numberOfDeployedVMs;
- this.deployedVMQuota = builder.deployedVMQuota;
- this.numberOfStoredVMs = builder.numberOfStoredVMs;
- this.storedVMQuota = builder.storedVMQuota;
- this.isLdapUser = builder.isLdapUser;
- this.deployedVMQuotaRank = builder.deployedVMQuotaRank;
- this.storedVMQuotaRank = builder.storedVMQuotaRank;
- }
-
- protected QueryResultAdminUserRecord() {
- // for JAXB
- }
-
- /**
- * name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Organization reference or id
- */
- public String get() {
- return org;
- }
-
- /**
- * Full name
- */
- public String getFullName() {
- return fullName;
- }
-
- /**
- * Shows whether it is enabled
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Number of deployed VMs
- */
- public Integer getNumberOfDeployedVMs() {
- return numberOfDeployedVMs;
- }
-
- /**
- * Deployed VM quota
- */
- public Integer getDeployedVMQuota() {
- return deployedVMQuota;
- }
-
- /**
- * Number of stored VMs
- */
- public Integer getNumberOfStoredVMs() {
- return numberOfStoredVMs;
- }
-
- /**
- * Stored VM Quota
- */
- public Integer getStoredVMQuota() {
- return storedVMQuota;
- }
-
- /**
- * Shows if the user was imported from LDAP
- */
- public Boolean isLdapUser() {
- return isLdapUser;
- }
-
- /**
- * Deployed VM quota rank
- */
- public Integer getDeployedVMQuotaRank() {
- return deployedVMQuotaRank;
- }
-
- /**
- * Stored VM Quota rank
- */
- public Integer getStoredVMQuotaRank() {
- return storedVMQuotaRank;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultAdminUserRecord that = QueryResultAdminUserRecord.class.cast(o);
-
- return super.equals(that) && equal(name, that.name) && equal(org, that.org) && equal(fullName, that.fullName)
- && equal(isEnabled, that.isEnabled) && equal(numberOfDeployedVMs, that.numberOfDeployedVMs)
- && equal(deployedVMQuota, that.deployedVMQuota) && equal(numberOfStoredVMs, that.numberOfStoredVMs)
- && equal(storedVMQuota, that.storedVMQuota) && equal(isLdapUser, that.isLdapUser)
- && equal(deployedVMQuotaRank, that.deployedVMQuotaRank) && equal(storedVMQuotaRank, that.storedVMQuotaRank);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, org, fullName, isEnabled, numberOfDeployedVMs, deployedVMQuota, numberOfStoredVMs, storedVMQuota, isLdapUser, deployedVMQuotaRank, storedVMQuotaRank);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("org", org).add("fullName", fullName).add("isEnabled", isEnabled)
- .add("numberOfDeployedVMs", numberOfDeployedVMs).add("deployedVMQuota", deployedVMQuota)
- .add("numberOfStoredVMs", numberOfStoredVMs).add("storedVMQuota", storedVMQuota)
- .add("isLdapUser", isLdapUser).add("deployedVMQuotaRank", deployedVMQuotaRank)
- .add("storedVMQuotaRank", storedVMQuotaRank);
- }
-}
[11/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java
deleted file mode 100644
index 392c53a..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiExpectTest.java
+++ /dev/null
@@ -1,192 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ENTITY;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASKS_LIST;
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.TasksList;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.Test;
-
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "TaskApiExpectTest")
-public class TaskApiExpectTest extends VCloudDirectorAdminApiExpectTest {
- static String tasksList = "6f312e42-cd2b-488d-a2bb-97519cd57ed0";
- static URI tasksListHref = URI.create(endpoint + "/tasksList/" + tasksList);
-
- HttpRequest getTasksList = HttpRequest.builder()
- .method("GET")
- .endpoint(tasksListHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getTasksListResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/task/tasksList.xml", TASKS_LIST + ";version=1.5"))
- .build();
-
- @Test
- public void testGetTasksListHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getTasksList, getTasksListResponse);
- assertEquals(api.getTaskApi().getTasksList(tasksListHref), tasksList());
- }
-
- private TasksList tasksList() {
- return TasksList.builder()
- .name("Tasks Lists")
- .type("application/vnd.vmware.vcloud.tasksList+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/tasksList/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .task(task())
- .task(taskTwo())
- .build();
- }
-
- static String task = "5fcd2af3-d0ec-45ce-9451-8c585a2c766b";
- static String taskUrn = "urn:vcloud:task:" + task;
- static URI taskHref = URI.create(endpoint + "/task/" + task);
-
- HttpRequest get = HttpRequest.builder()
- .method("GET")
- .endpoint(taskHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/task/task.xml", TASK + ";version=1.5"))
- .build();
-
- @Test
- public void testGetTaskHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, get, getResponse);
- assertEquals(api.getTaskApi().get(taskHref), task());
- }
-
- HttpRequest resolveTask = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/entity/" + taskUrn)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- String taskEntity = asString(createXMLBuilder("Entity").a("xmlns", "http://www.vmware.com/vcloud/v1.5")
- .a("name", taskUrn)
- .a("id", taskUrn)
- .a("type", ENTITY)
- .a("href", endpoint + "/entity/" + taskUrn)
- .e("Link").a("rel", "alternate").a("type", TASK).a("href", taskHref.toString()).up());
-
- HttpResponse resolveTaskResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromStringWithContentType(taskEntity, ENTITY + ";version=1.5"))
- .build();
-
- public static Task task() {
- return Task.builder()
- .type("application/vnd.vmware.vcloud.task+xml")
- .name("task")
- .id("urn:vcloud:task:5fcd2af3-d0ec-45ce-9451-8c585a2c766b")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/5fcd2af3-d0ec-45ce-9451-8c585a2c766b"))
- .status("success")
- .operation("Created Catalog QunyingTestCatalog(7212e451-76e1-4631-b2de-ba1dfd8080e4)")
- .operationName("catalogCreateCatalog")
- .startTime(dateService.iso8601DateParse("2012-02-07T00:16:28.450-05:00"))
- .endTime(dateService.iso8601DateParse("2012-02-07T00:16:28.867-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-07T00:16:28.450-04:00"))
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .name("QunyingTestCatalog")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- HttpRequest cancel = HttpRequest.builder()
- .method("POST")
- .endpoint(taskHref + "/action/cancel")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse cancelResponse = HttpResponse.builder()
- .statusCode(200)
- .build();
-
- @Test
- public void testCancelTaskHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, cancel, cancelResponse);
- api.getTaskApi().cancel(taskHref);
- }
-
- @Test
- public void testCancelTaskUrn() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, resolveTask, resolveTaskResponse, cancel, cancelResponse);
- api.getTaskApi().cancel(taskHref);
- }
-
- public static Task taskTwo() {
- return Task.builder()
- .type("application/vnd.vmware.vcloud.task+xml")
- .name("task")
- .id("urn:vcloud:task:bd22e745-9c2a-4f82-a954-0e35b6f76ba5")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/bd22e745-9c2a-4f82-a954-0e35b6f76ba5"))
- .status("success")
- .operation("Enabled User (967d317c-4273-4a95-b8a4-bf63b78e9c69)")
- .operationName("jobEnable")
- .startTime(dateService.iso8601DateParse("2012-02-06T17:30:38.507-05:00"))
- .endTime(dateService.iso8601DateParse("2012-02-06T17:30:38.507-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-06T17:30:38.507-04:00"))
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adrian@jclouds.org")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/8c360b93-ed25-4c9a-8e24-d48cd9966d93"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiLiveTest.java
deleted file mode 100644
index e3baac1..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskApiLiveTest.java
+++ /dev/null
@@ -1,128 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_EMPTY_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkTask;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.TasksList;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgList;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "TaskApiLiveTest")
-public class TaskApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- /*
- * Convenience references to API apis.
- */
-
- private OrgApi orgApi;
- private TaskApi taskApi;
-
- /*
- * Shared state between dependant tests.
- */
-
- private OrgList orgList;
- private URI orgURI;
- private TasksList taskList;
- private Task task;
- private URI taskURI;
-
- private VApp vApp;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- orgApi = context.getApi().getOrgApi();
- taskApi = context.getApi().getTaskApi();
- }
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() throws Exception {
- if (vApp != null) cleanUpVApp(vApp);
- }
-
- @Test(description = "GET /tasksList/{id}")
- public void testGetTaskList() {
- orgList = orgApi.list();
- Reference orgRef = Iterables.getFirst(orgList, null);
- assertNotNull(orgRef);
- orgURI = orgRef.getHref();
-
- Org org = orgApi.get(orgURI);
-
- URI taskListHref = Iterables.find(org.getLinks(), LinkPredicates.typeEquals(VCloudDirectorMediaType.TASKS_LIST)).getHref();
-
- // Call the method being tested
- taskList = taskApi.getTasksList(taskListHref);
-
- // NOTE The environment MUST have ...
-
- // Check required elements and attributes
- assertFalse(Iterables.isEmpty(taskList), String.format(NOT_EMPTY_OBJECT_FMT, "Task", "TaskList"));
-
- for (Task task : taskList) {
- checkTask(task);
- }
- }
-
- @Test(description = "GET /task/{id}", dependsOnMethods = { "testGetTaskList" })
- public void testGetTask() {
- //TODO: upload media or something so you can get a fresh cancellable task?
-
- Task taskRef = Iterables.getFirst(taskList, null);
- taskURI = taskRef.getHref();
-
- // Call the method being tested
- task = taskApi.get(taskURI);
-
- // Check required elements and attributes
- checkTask(task);
- }
-
- // FIXME cancelTask complains "This task can not be canceled"
- // However, when I do this through the UI, I can cancel the task for instantiating a vApp.
- @Test(description = "POST /task/{id}/action/cancel", dependsOnMethods = { "testGetTask" })
- public void testCancelTask() {
- vApp = instantiateVApp();
-
- Task task = Iterables.getFirst(vApp.getTasks(), null);
- assertNotNull(task, "instantiateVApp should contain one long-running task");
- assertTaskStatusEventually(task, Task.Status.RUNNING, ImmutableSet.of(Task.Status.ERROR, Task.Status.ABORTED));
-
- // Call the method being tested
- taskApi.cancel(taskURI);
- assertTaskStatusEventually(task, Task.Status.CANCELED, ImmutableSet.of(Task.Status.ERROR, Task.Status.ABORTED, Task.Status.SUCCESS));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UploadApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UploadApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UploadApiLiveTest.java
deleted file mode 100644
index a7612c5..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UploadApiLiveTest.java
+++ /dev/null
@@ -1,42 +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.vcloud.director.v1_5.features;
-
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "UploadApiLiveTest")
-public class UploadApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String UPLOAD = "upload";
-
- /*
- * Convenience reference to API api.
- */
- protected UploadApi uploadApi;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- uploadApi = context.getApi().getUploadApi();
- }
-
- @Test(description = "PUT ???", enabled = false)
- public void testUpload() {
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiExpectTest.java
deleted file mode 100644
index 0e2250e..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiExpectTest.java
+++ /dev/null
@@ -1,1012 +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.vcloud.director.v1_5.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion;
-import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.internal.annotations.Sets;
-
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "VAppApiExpectTest")
-public class VAppApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private static final String id = "6ef7767a-9522-4f8a-aa61-772ea1dc3145";
- private static final String vAppId = "vapp-" + id;
- private static final String vAppUrn = "urn:vcloud:vapp:" + id;
-
- private static final URI vAppURI = URI.create(endpoint + "/vApp/" + vAppId);
-
-
- @BeforeClass
- public void before() {
- }
-
- @Test(enabled = false)//TODO
- public void testGetVapp() {
- VCloudDirectorApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId)
- .acceptMedia(VCloudDirectorMediaType.VAPP)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/vApp.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- VApp expected = getVApp();
-
- assertEquals(api.getVAppApi().get(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVApp() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vAppId)
- .xmlFilePayload("/vApp/editVApp.xml", VCloudDirectorMediaType.VAPP)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/modifiedVapp.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- VApp modified = getVApp();
- modified.setName("new-name");
- modified.setDescription("New Description");
-
- Task expected = editVAppTask();
-
- assertEquals(api.getVAppApi().edit(vAppURI, modified), expected);
- }
-
- @Test(enabled = false)
- public void testRemoveVApp() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("DELETE", vAppId)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/removeVAppTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = removeVAppTask();
-
- assertEquals(api.getVAppApi().remove(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testControlAccess() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/controlAccess")
- .xmlFilePayload("/vApp/controlAccessParams.xml", VCloudDirectorMediaType.CONTROL_ACCESS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/controlAccessParams.xml", VCloudDirectorMediaType.CONTROL_ACCESS)
- .httpResponseBuilder().build());
-
- ControlAccessParams params = controlAccessParams();
-
- ControlAccessParams expected = controlAccessParams();
-
- assertEquals(api.getVAppApi().editControlAccess(vAppURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testDeploy() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/deploy")
- .xmlFilePayload("/vApp/deployParams.xml", VCloudDirectorMediaType.DEPLOY_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/deployTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- DeployVAppParams params = DeployVAppParams.builder()
- .build();
-
- Task expected = deployTask();
-
- assertEquals(api.getVAppApi().deploy(vAppURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testDiscardSuspendedState() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/discardSuspendedState")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/discardSuspendedStateTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = discardSuspendedStateTask();
-
- assertEquals(api.getVAppApi().discardSuspendedState(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testEnterMaintenanceMode() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/enterMaintenanceMode")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder().statusCode(204).build());
-
- // TODO how to test?
- api.getVAppApi().enterMaintenanceMode(vAppURI);
- }
-
- @Test(enabled = false)
- public void testExitMaintenanceMode() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/exitMaintenanceMode")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder().statusCode(204).build());
-
- // TODO how to test?
- api.getVAppApi().exitMaintenanceMode(vAppURI);
- }
-
- @Test(enabled = false)
- public void testRecomposeVApp() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/recomposeVApp")
- .xmlFilePayload("/vApp/recomposeVAppParams.xml", VCloudDirectorMediaType.RECOMPOSE_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/recomposeVAppTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RecomposeVAppParams params = RecomposeVAppParams.builder()
- .build();
-
- Task expected = recomposeVAppTask();
-
- assertEquals(api.getVAppApi().recompose(vAppURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testUndeploy() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/action/undeploy")
- .xmlFilePayload("/vApp/undeployParams.xml", VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/undeployTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- UndeployVAppParams params = UndeployVAppParams.builder()
- .build();
-
- Task expected = undeployTask();
-
- assertEquals(api.getVAppApi().undeploy(vAppURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testPowerOff() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/power/action/powerOff")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/powerOffTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = powerOffTask();
-
- assertEquals(api.getVAppApi().powerOff(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testPowerOn() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/power/action/powerOn")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/powerOnTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = powerOnTask();
-
- assertEquals(api.getVAppApi().powerOn(vAppURI), expected);
- }
-
-
- @Test(enabled = true)
- public void testReboot() {
-
- URI vAppRebootUri = URI.create(endpoint + "/vApp/" + vAppId + "/power/action/reboot");
-
- HttpRequest vAppRebootRequest = HttpRequest.builder()
- .method("POST")
- .endpoint(vAppRebootUri)
- .addHeader("Accept", "application/vnd.vmware.vcloud.task+xml")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse vAppRebootResponse = HttpResponse.builder()
- .payload(payloadFromResourceWithContentType("/vapp/vAppRebootTask.xml", VCloudDirectorMediaType.TASK))
- .statusCode(200)
- .build();
-
- VCloudDirectorApi vCloudDirectorApi = requestsSendResponses(
- loginRequest, sessionResponse,
- vAppRebootRequest, vAppRebootResponse
- );
-
- Task actual = vCloudDirectorApi.getVAppApi().reboot(URI.create(endpoint + "/vApp/" + vAppId));
- Task expected = rebootTask();
-
- assertEquals(actual, expected);
- }
-
- @Test(enabled = false)
- public void testReset() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/power/action/reset")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/resetTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = resetTask();
-
- assertEquals(api.getVAppApi().reset(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testShutdown() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/power/action/shutdown")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/shutdownTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = shutdownTask();
-
- assertEquals(api.getVAppApi().shutdown(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testSuspend() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vAppId + "/power/action/suspend")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/suspend.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = suspendTask();
-
- assertEquals(api.getVAppApi().suspend(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetControlAccesss() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId + "/controlAccess")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getAccessControl.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- ControlAccessParams expected = getAccessControlParams();
-
- assertEquals(api.getVAppApi().getAccessControl(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetLeaseSettingsSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId + "/leaseSettingsSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getLeaseSettingsSection.xml", VCloudDirectorMediaType.LEASE_SETTINGS_SECTION)
- .httpResponseBuilder().build());
-
- LeaseSettingsSection expected = getLeaseSettingsSection();
-
- assertEquals(api.getVAppApi().getLeaseSettingsSection(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditLeaseSettingsSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vAppId + "/leaseSettingsSection")
- .xmlFilePayload("/vApp/editLeaseSettingsSection.xml", VCloudDirectorMediaType.LEASE_SETTINGS_SECTION)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editLeaseSettingsSectionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- LeaseSettingsSection section = getLeaseSettingsSection().toBuilder()
- .build();
-
- Task expected = editLeaseSettingsSectionTask();
-
- assertEquals(api.getVAppApi().editLeaseSettingsSection(vAppURI, section), expected);
- }
-
- @Test(enabled = false)
- public void testGetNetworkConfigSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId + "/networkConfigSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getNetworkConfigSection.xml", VCloudDirectorMediaType.NETWORK_CONFIG_SECTION)
- .httpResponseBuilder().build());
-
- NetworkConfigSection expected = getNetworkConfigSection();
-
- assertEquals(api.getVAppApi().getNetworkConfigSection(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditNetworkConfigSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vAppId + "/networkConfigSection")
- .xmlFilePayload("/vApp/editNetworkConfigSection.xml", VCloudDirectorMediaType.NETWORK_CONFIG_SECTION)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editNetworkConfigSectionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- NetworkConfigSection section = getNetworkConfigSection().toBuilder()
- .build();
-
- Task expected = editNetworkConfigSectionTask();
-
- assertEquals(api.getVAppApi().editNetworkConfigSection(vAppURI, section), expected);
- }
-
- @Test(enabled = false)
- public void testGetNetworkSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId + "/networkSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getNetworkSection.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- NetworkSection expected = getNetworkSection();
-
- assertEquals(api.getVAppApi().getNetworkSection(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetOwner() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId + "/owner")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getOwner.xml", VCloudDirectorMediaType.OWNER)
- .httpResponseBuilder().build());
-
- Owner expected = getOwner();
-
- assertEquals(api.getVAppApi().getOwner(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditOwner() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vAppId + "/owner")
- .xmlFilePayload("/vApp/editOwner.xml", VCloudDirectorMediaType.OWNER)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder().statusCode(204).build());
-
- Owner owner = Owner.builder()
- .build();
-
- api.getVAppApi().editOwner(vAppURI, owner);
- }
-
- @Test(enabled = false)
- public void testGetProductSections() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId + "/productSections")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getProductSections.xml", VCloudDirectorMediaType.PRODUCT_SECTION_LIST)
- .httpResponseBuilder().build());
-
- ProductSectionList expected = getProductSections();
-
- assertEquals(api.getVAppApi().getProductSections(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditProductSections() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vAppId + "/productSections")
- .xmlFilePayload("/vApp/editProductSections.xml", VCloudDirectorMediaType.PRODUCT_SECTION_LIST)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editProductSections.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- Task expected = editProductSectionsTask();
-
- assertEquals(api.getVAppApi().editProductSections(vAppURI, null), expected);
- }
-
- @Test(enabled = false)
- public void testGetStartupSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vAppId + "/startupSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getStartupSection.xml", VCloudDirectorMediaType.STARTUP_SECTION)
- .httpResponseBuilder().build());
-
- StartupSection expected = getStartupSection();
-
- assertEquals(api.getVAppApi().getStartupSection(vAppURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditStartupSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vAppId + "/startupSection")
- .xmlFilePayload("/vApp/editStartupSection.xml", VCloudDirectorMediaType.STARTUP_SECTION)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editStartupSectionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- StartupSection section = null; // getStartupSection().toBuilder()
-// .build();
-
- Task expected = editStartupSectionTask();
-
- assertEquals(api.getVAppApi().editStartupSection(vAppURI, section), expected);
- }
-
- public static VApp getVApp() {
- // FIXME Does not match XML
- VApp vApp = VApp.builder()
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"))
-// .link(Link.builder()
-// .href(URI.create())
-// .build())
- .build();
-
-// <Link rel="power:powerOn" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/power/action/powerOn"/>
-// <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/deploy"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.vAppNetwork+xml" name="orgNet-cloudsoft-External" href="https://mycloud.greenhousedata.com/api/network/2a2e2da4-446a-4ebc-a086-06df7c9570f0"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/controlAccess/"/>
-// <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/controlAccess"/>
-// <Link rel="recompose" type="application/vnd.vmware.vcloud.recomposeVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/recomposeVApp"/>
-// <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
-// <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="remove" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/owner"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/metadata"/>
-
- return vApp;
- }
-
- public static Task editVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task removeVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task consolidateVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams controlAccessParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static Task deployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task discardSuspendedStateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task installVMwareToolsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task recomposeVAppTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task relocateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task undeployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task upgradeHardwareVersionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOffTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOnTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task rebootTask() {
- return Task.builder()
- .id("urn:vcloud:task:5bc25a1b-79cb-4904-b53f-4ca09088e434")
- .name("task")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/5bc25a1b-79cb-4904-b53f-4ca09088e434"))
- .link(Link.builder()
- .rel(Link.Rel.TASK_CANCEL)
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/5bc25a1b-79cb-4904-b53f-4ca09088e434/action/cancel"))
- .build())
- .org(Reference.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/4559b367-8af2-4ee1-8429-a0d39e7df3de"))
- .name("jclouds")
- .type(VCloudDirectorMediaType.ORG)
- .build())
- .operation("Rebooting Virtual Machine damn small(b7e995a7-1468-4873-af39-bc703feefd63)")
- .operationName("vappReboot")
- .progress(0)
- .startTime(dateService.cDateParse("Thu Oct 25 13:39:25 EDT 2012"))
- .expiryTime(dateService.cDateParse("Wed Jan 23 13:39:25 EST 2013"))
- .status(Task.Status.RUNNING)
- .type(VCloudDirectorMediaType.TASK)
- .build();
- }
-
- public static Task resetTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task shutdownTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task suspendTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams getAccessControlParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static GuestCustomizationSection getGuestCustomizationSection() {
- GuestCustomizationSection section = GuestCustomizationSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editGuestCustomizationSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static LeaseSettingsSection getLeaseSettingsSection() {
- LeaseSettingsSection section = LeaseSettingsSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editLeaseSettingsSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task ejectMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task insertMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConfigSection getNetworkConfigSection() {
- NetworkConfigSection section = NetworkConfigSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConfigSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConnectionSection getNetworkConnectionSection() {
- NetworkConnectionSection section = NetworkConnectionSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConnectionSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkSection getNetworkSection() {
- NetworkSection section = NetworkSection.builder()
- .build();
-
- return section;
- }
-
- public static OperatingSystemSection getOperatingSystemSection() {
- OperatingSystemSection section = OperatingSystemSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editOperatingSystemSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Owner getOwner() {
- Owner owner = Owner.builder()
- .build();
-
- return owner;
- }
-
- public static Task editOwnerTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ProductSectionList getProductSections() {
- ProductSectionList sectionItems = ProductSectionList.builder()
- .build();
-
- return sectionItems;
- }
-
- public static Task editProductSectionsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VmPendingQuestion getPendingQuestion() {
- VmPendingQuestion question = VmPendingQuestion.builder()
- .build();
-
- return question;
- }
-
- public static VmQuestionAnswer answerQuestion() {
- VmQuestionAnswer answer = null; // = VmQuestionAnswer.builder()
-// .build();
-
- return answer;
- }
-
- public static RuntimeInfoSection getRuntimeInfoSection() {
- RuntimeInfoSection section = RuntimeInfoSection.builder()
- .build();
-
- return section;
- }
-
- public static byte[] getScreenImage() {
- byte[] image = new byte[0];
-
- return image;
- }
-
- public static ScreenTicket getScreenTicket() {
- ScreenTicket ticket = null; // = ScreenTicket.builder();
-// .build();
-
- return ticket;
- }
-
- public static StartupSection getStartupSection() {
- StartupSection section = null; // = StartupSection.builder();
-// .build();
-
- return section;
- }
-
- public static Task editStartupSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VirtualHardwareSection getVirtualHardwareSection() {
- VirtualHardwareSection section = VirtualHardwareSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editVirtualHardwareSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItem getVirtualHardwareSectionCpu() {
- RasdItem cpu = RasdItem.builder()
- .build();
-
- return cpu;
- }
-
- public static Task editVirtualHardwareSectionCpuTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionDisks() {
- RasdItemsList disks = RasdItemsList.builder()
- .build();
-
- return disks;
- }
-
- public static Task editVirtualHardwareSectionDisksTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionMedia() {
- RasdItemsList media = RasdItemsList.builder()
- .build();
-
- return media;
- }
-
- public static RasdItem getVirtualHardwareSectionMemory() {
- RasdItem memory = RasdItem.builder()
- .build();
-
- return memory;
- }
-
- public static Task editVirtualHardwareSectionMemoryTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionNetworkCards() {
- RasdItemsList networkCards = RasdItemsList.builder()
- .build();
-
- return networkCards;
- }
-
- public static Task editVirtualHardwareSectionNetworkCardsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionSerialPorts() {
- RasdItemsList serialPorts = RasdItemsList.builder()
- .build();
-
- return serialPorts;
- }
-
- public static Task editVirtualHardwareSectionSerialPortsTask() {
- return task("id", "name", "description", "status", "operation", "operationName", "startTime");
- }
-
- /** Used by other methods to add a custom {@link Task} object. */
- private static Task task(String taskId, String name, String description, String status, String operation, String operationName, String startTime) {
- Task task = Task.builder()
- .error(Error.builder().build())
- .org(Reference.builder().build())
- .owner(Reference.builder().build())
- .user(Reference.builder().build())
- .params(null)
- .progress(0)
- .status(status)
- .operation(operation)
- .operationName(operationName)
- .startTime(dateService.iso8601DateParse(startTime))
- .endTime(null)
- .expiryTime(null)
- .tasks(Sets.<Task>newLinkedHashSet())
- .description(description)
- .name(name)
- .id("urn:vcloud:" + taskId)
- .href(URI.create(endpoint + "/task/" + taskId))
- .links(Sets.<Link>newLinkedHashSet())
- .build();
-
- return task;
- }
-}
[16/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmApi.java
deleted file mode 100644
index 4ae534b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmApi.java
+++ /dev/null
@@ -1,404 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ANY_IMAGE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.DEPLOY_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.GUEST_CUSTOMIZATION_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.MEDIA_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_CONNECTION_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OPERATING_SYSTEM_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OVF_RASD_ITEM;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.PRODUCT_SECTION_LIST;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.RELOCATE_VM_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VIRTUAL_HARDWARE_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VM;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VM_PENDING_ANSWER;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList;
-import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion;
-import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.MediaInsertOrEjectParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-import org.jclouds.vcloud.director.v1_5.functions.ReturnPayloadBytes;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VmApi {
-
- /** Returns the virtual machine or null if not found. */
- @GET
- @Consumes(VM)
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Vm get(@EndpointParam URI vmHref);
-
- /** Modifies the name/description of a {@link Vm}. */
- @PUT
- @Produces(VM)
- @Consumes(TASK)
- @JAXBResponseParser
- Task edit(@EndpointParam URI vmHref, @BinderParam(BindToXMLPayload.class) Vm vApp);
-
- @DELETE
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@EndpointParam URI vmHref);
-
- @POST
- @Path("/action/consolidate")
- @Consumes(TASK)
- @JAXBResponseParser
- Task consolidate(@EndpointParam URI vmHref);
-
- @POST
- @Path("/action/deploy")
- @Produces(DEPLOY_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task deploy(@EndpointParam URI vmHref, @BinderParam(BindToXMLPayload.class) DeployVAppParams params);
-
- @POST
- @Path("/action/discardSuspendedState")
- @Consumes(TASK)
- @JAXBResponseParser
- Task discardSuspendedState(@EndpointParam URI vmHref);
-
- /**
- * Installs VMware tools to the virtual machine.
- *
- * <p />It should be running in order for them to be installed.
- */
- @POST
- @Path("/action/installVMwareTools")
- @Consumes(TASK)
- @JAXBResponseParser
- Task installVMwareTools(@EndpointParam URI vmHref);
-
- @POST
- @Path("/action/relocate")
- @Produces(RELOCATE_VM_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task relocate(@EndpointParam URI vmHref, @BinderParam(BindToXMLPayload.class) RelocateParams params);
-
- @POST
- @Path("/action/undeploy")
- @Produces(UNDEPLOY_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task undeploy(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) UndeployVAppParams params);
-
- /**
- * Upgrade virtual hardware version of a VM to the highest supported virtual hardware version of
- * provider vDC where the VM locates.
- */
- @POST
- @Path("/action/upgradeHardwareVersion")
- @Consumes(TASK)
- @JAXBResponseParser
- Task upgradeHardwareVersion(@EndpointParam URI vmHref);
-
- @POST
- @Path("/power/action/powerOff")
- @Consumes(TASK)
- @JAXBResponseParser
- Task powerOff(@EndpointParam URI vmHref);
-
- @POST
- @Path("/power/action/powerOn")
- @Consumes(TASK)
- @JAXBResponseParser
- Task powerOn(@EndpointParam URI vmHref);
-
- @POST
- @Path("/power/action/reboot")
- @Consumes(TASK)
- @JAXBResponseParser
- Task reboot(@EndpointParam URI vmHref);
-
- @POST
- @Path("/power/action/reset")
- @Consumes(TASK)
- @JAXBResponseParser
- Task reset(@EndpointParam URI vmHref);
-
- @POST
- @Path("/power/action/shutdown")
- @Consumes(TASK)
- @JAXBResponseParser
- Task shutdown(@EndpointParam URI vmHref);
-
- @POST
- @Path("/power/action/suspend")
- @Consumes(TASK)
- @JAXBResponseParser
- Task suspend(@EndpointParam URI vmHref);
-
- @GET
- @Path("/guestCustomizationSection")
- @Consumes
- @JAXBResponseParser
- GuestCustomizationSection getGuestCustomizationSection(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/guestCustomizationSection")
- @Produces(GUEST_CUSTOMIZATION_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editGuestCustomizationSection(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) GuestCustomizationSection section);
-
- @POST
- @Path("/media/action/ejectMedia")
- @Produces(MEDIA_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task ejectMedia(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) MediaInsertOrEjectParams mediaParams);
-
- @POST
- @Path("/media/action/insertMedia")
- @Produces(MEDIA_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task insertMedia(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) MediaInsertOrEjectParams mediaParams);
-
- @GET
- @Path("/networkConnectionSection")
- @Consumes
- @JAXBResponseParser
- NetworkConnectionSection getNetworkConnectionSection(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/networkConnectionSection")
- @Produces(NETWORK_CONNECTION_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editNetworkConnectionSection(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) NetworkConnectionSection section);
-
- @GET
- @Path("/operatingSystemSection")
- @Consumes
- @JAXBResponseParser
- OperatingSystemSection getOperatingSystemSection(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/operatingSystemSection")
- @Produces(OPERATING_SYSTEM_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editOperatingSystemSection(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) OperatingSystemSection section);
-
- @GET
- @Path("/productSections")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- ProductSectionList getProductSections(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/productSections")
- @Produces(PRODUCT_SECTION_LIST)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editProductSections(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) ProductSectionList sectionList);
-
- /**
- * Retrieves a pending question for a {@link Vm}.
- *
- * <p/> The user should answer to the question by operation
- * {@link #answerQuestion(URI, VmQuestionAnswer)}. Usually questions will be asked when the VM
- * is powering on.
- */
- @GET
- @Path("/question")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- VmPendingQuestion getPendingQuestion(@EndpointParam URI vmHref);
-
- /**
- * Answer a pending question on a {@link Vm}.
- *
- * The answer IDs of choice and question should match the ones returned from operation
- * {@link #getPendingQuestion(URI)}.
- */
- @POST
- @Path("/question/action/answer")
- @Produces(VM_PENDING_ANSWER)
- @Consumes
- @JAXBResponseParser
- void answerQuestion(@EndpointParam URI vmHref, @BinderParam(BindToXMLPayload.class) VmQuestionAnswer answer);
-
- @GET
- @Path("/runtimeInfoSection")
- @Consumes
- @JAXBResponseParser
- RuntimeInfoSection getRuntimeInfoSection(@EndpointParam URI vmHref);
-
- @GET
- @Path("/screen")
- @Consumes(ANY_IMAGE)
- @ResponseParser(ReturnPayloadBytes.class)
- byte[] getScreenImage(@EndpointParam URI vmHref);
-
- @POST
- @Path("/screen/action/acquireTicket")
- @Consumes
- @JAXBResponseParser
- ScreenTicket getScreenTicket(@EndpointParam URI vmHref);
-
- @GET
- @Path("/virtualHardwareSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- VirtualHardwareSection getVirtualHardwareSection(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/virtualHardwareSection")
- @Produces(VIRTUAL_HARDWARE_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editVirtualHardwareSection(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) VirtualHardwareSection section);
-
- @GET
- @Path("/virtualHardwareSection/cpu")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- RasdItem getVirtualHardwareSectionCpu(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/virtualHardwareSection/cpu")
- @Produces(OVF_RASD_ITEM)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editVirtualHardwareSectionCpu(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) RasdItem rasd);
-
- @GET
- @Path("/virtualHardwareSection/disks")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- RasdItemsList getVirtualHardwareSectionDisks(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/virtualHardwareSection/disks")
- @Produces(OVF_RASD_ITEMS_LIST)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editVirtualHardwareSectionDisks(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) RasdItemsList rasdItemsList);
-
- /**
- * Retrieves the list of items that represents the floppies and CD/DVD drives in a {@link Vm}.
- */
- @GET
- @Path("/virtualHardwareSection/media")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- RasdItemsList getVirtualHardwareSectionMedia(@EndpointParam URI vmHref);
-
- @GET
- @Path("/virtualHardwareSection/memory")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- RasdItem getVirtualHardwareSectionMemory(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/virtualHardwareSection/memory")
- @Produces(OVF_RASD_ITEM)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editVirtualHardwareSectionMemory(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) RasdItem rasd);
-
- @GET
- @Path("/virtualHardwareSection/networkCards")
- @Consumes
- @JAXBResponseParser
- RasdItemsList getVirtualHardwareSectionNetworkCards(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/virtualHardwareSection/networkCards")
- @Produces(OVF_RASD_ITEMS_LIST)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editVirtualHardwareSectionNetworkCards(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) RasdItemsList rasdItemsList);
-
- @GET
- @Path("/virtualHardwareSection/serialPorts")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- RasdItemsList getVirtualHardwareSectionSerialPorts(@EndpointParam URI vmHref);
-
- @PUT
- @Path("/virtualHardwareSection/serialPorts")
- @Produces(OVF_RASD_ITEMS_LIST)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editVirtualHardwareSectionSerialPorts(@EndpointParam URI vmHref,
- @BinderParam(BindToXMLPayload.class) RasdItemsList rasdItemsList);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApi.java
deleted file mode 100644
index 567cfcb..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApi.java
+++ /dev/null
@@ -1,128 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ADMIN_CATALOG;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CONTROL_ACCESS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OWNER;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.PUBLISH_CATALOG_PARAMS;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams;
-import org.jclouds.vcloud.director.v1_5.features.CatalogApi;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface AdminCatalogApi extends CatalogApi {
-
- @Override
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- AdminCatalog get(@EndpointParam URI orgHref);
-
- /**
- * Creates a catalog in an organization. The catalog will always be added in unpublished state.
- */
- @POST
- @Path("/catalogs")
- @Consumes(ADMIN_CATALOG)
- @Produces(ADMIN_CATALOG)
- @JAXBResponseParser
- AdminCatalog addCatalogToOrg(@BinderParam(BindToXMLPayload.class) AdminCatalog catalog,
- @EndpointParam URI orgHref);
-
- /**
- * Modifies a catalog. A catalog could be published or unpublished. The IsPublished property is
- * treated as a read only value by the server. In order to control publishing settings use the
- * 'publish' action must be used.
- */
- @PUT
- @Consumes(ADMIN_CATALOG)
- @Produces(ADMIN_CATALOG)
- @JAXBResponseParser
- AdminCatalog edit(@EndpointParam URI catalogAdminHref,
- @BinderParam(BindToXMLPayload.class) AdminCatalog catalog);
-
- /**
- * Deletes a catalog. The catalog could be removed if it is either published or unpublished.
- */
- @DELETE
- @Consumes
- @JAXBResponseParser
- void remove(@EndpointParam URI catalogAdminHref);
-
- @GET
- @Path("/owner")
- @Consumes
- @JAXBResponseParser
- Owner getOwner(@EndpointParam URI catalogAdminHref);
-
- @PUT
- @Path("/owner")
- @Consumes
- @Produces(OWNER)
- @JAXBResponseParser
- void setOwner(@EndpointParam URI catalogAdminHref, @BinderParam(BindToXMLPayload.class) Owner newOwner);
-
- /**
- * Publish a catalog. Publishing a catalog makes the catalog visible to all organizations in a
- * vCloud.
- */
- @POST
- @Path("/action/publish")
- @Consumes
- @Produces(PUBLISH_CATALOG_PARAMS)
- @JAXBResponseParser
- void publish(@EndpointParam URI catalogAdminHref, @BinderParam(BindToXMLPayload.class) PublishCatalogParams params);
-
- @POST
- @Path("/action/controlAccess")
- @Produces(CONTROL_ACCESS)
- @Consumes(CONTROL_ACCESS)
- @JAXBResponseParser
- ControlAccessParams editAccessControl(@EndpointParam URI catalogAdminHref,
- @BinderParam(BindToXMLPayload.class) ControlAccessParams params);
-
- @GET
- @Path("/controlAccess")
- @Consumes
- @JAXBResponseParser
- ControlAccessParams getAccessControl(@EndpointParam URI catalogAdminHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApi.java
deleted file mode 100644
index 7e50534..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApi.java
+++ /dev/null
@@ -1,76 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ADMIN_ORG_NETWORK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
-import org.jclouds.vcloud.director.v1_5.features.NetworkApi;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface AdminNetworkApi extends NetworkApi {
-
- /**
- * Gets admin representation of the network or null if not found.
- *
- * <p />This operation could return admin representation of
- * organization network or external network. vApp networks do not have admin representation.
- */
- @Override
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- Network get(@EndpointParam URI networkAdminHref);
-
- @PUT
- @Consumes(TASK)
- @Produces(ADMIN_ORG_NETWORK)
- @JAXBResponseParser
- Task edit(@EndpointParam URI networkAdminHref, @BinderParam(BindToXMLPayload.class) OrgNetwork network);
-
- /**
- * Reset(undeploy & redeploy) networking services on a logical network. The reset operation can
- * be performed on: - external networks - organization networks - vApp networks The reset
- * operation can be performed only on deployed networks.
- */
- @POST
- @Path("/action/reset")
- @Consumes
- @JAXBResponseParser
- Task reset(@EndpointParam URI networkAdminHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApi.java
deleted file mode 100644
index 555c46c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApi.java
+++ /dev/null
@@ -1,159 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_EMAIL_SETTINGS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_GENERAL_SETTINGS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_LEASE_SETTINGS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_SETTINGS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.features.OrgApi;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface AdminOrgApi extends OrgApi {
-
- /** Retrieves an admin view of an organization or null if not found. */
- @Override
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- AdminOrg get(@EndpointParam URI adminOrgHref);
-
- @GET
- @Path("/settings")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- OrgSettings getSettings(@EndpointParam URI adminOrgHref);
-
- @PUT
- @Path("/settings")
- @Consumes(ORG_SETTINGS)
- @Produces(ORG_SETTINGS)
- @JAXBResponseParser
- OrgSettings editSettings(@EndpointParam URI adminOrgHref,
- @BinderParam(BindToXMLPayload.class) OrgSettings settings);
-
- @GET
- @Path("/settings/email")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- OrgEmailSettings getEmailSettings(@EndpointParam URI adminOrgHref);
-
- @PUT
- @Path("/settings/email")
- @Consumes(ORG_EMAIL_SETTINGS)
- @Produces(ORG_EMAIL_SETTINGS)
- @JAXBResponseParser
- OrgEmailSettings editEmailSettings(@EndpointParam URI adminOrgHref,
- @BinderParam(BindToXMLPayload.class) OrgEmailSettings settings);
-
- @GET
- @Path("/settings/general")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- OrgGeneralSettings getGeneralSettings(@EndpointParam URI adminOrgHref);
-
- @PUT
- @Path("/settings/general")
- @Consumes(ORG_GENERAL_SETTINGS)
- @Produces(ORG_GENERAL_SETTINGS)
- @JAXBResponseParser
- OrgGeneralSettings editGeneralSettings(@EndpointParam URI adminOrgHref,
- @BinderParam(BindToXMLPayload.class) OrgGeneralSettings settings);
-
- @GET
- @Path("/settings/ldap")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- OrgLdapSettings getLdapSettings(@EndpointParam URI adminOrgHref);
-
- @GET
- @Path("/settings/passwordPolicy")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- OrgPasswordPolicySettings getPasswordPolicy(@EndpointParam URI adminOrgHref);
-
- @PUT
- @Path("/settings/passwordPolicy")
- @Consumes(ORG_PASSWORD_POLICY_SETTINGS)
- @Produces(ORG_PASSWORD_POLICY_SETTINGS)
- @JAXBResponseParser
- OrgPasswordPolicySettings editPasswordPolicy(@EndpointParam URI adminOrgHref,
- @BinderParam(BindToXMLPayload.class) OrgPasswordPolicySettings settings);
-
- @GET
- @Path("/settings/vAppLeaseSettings")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- OrgLeaseSettings getVAppLeaseSettings(@EndpointParam URI adminOrgHref);
-
- @PUT
- @Path("/settings/vAppLeaseSettings")
- @Consumes(ORG_LEASE_SETTINGS)
- @Produces(ORG_LEASE_SETTINGS)
- @JAXBResponseParser
- OrgLeaseSettings editVAppLeaseSettings(@EndpointParam URI adminOrgHref,
- @BinderParam(BindToXMLPayload.class) OrgLeaseSettings settings);
-
- @GET
- @Path("/settings/vAppTemplateLeaseSettings")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- OrgVAppTemplateLeaseSettings getVAppTemplateLeaseSettings(@EndpointParam URI adminOrgHref);
-
- @PUT
- @Path("/settings/vAppTemplateLeaseSettings")
- @Consumes(ORG_VAPP_TEMPLATE_LEASE_SETTINGS)
- @Produces(ORG_VAPP_TEMPLATE_LEASE_SETTINGS)
- @JAXBResponseParser
- OrgVAppTemplateLeaseSettings editVAppTemplateLeaseSettings(@EndpointParam URI adminOrgHref,
- @BinderParam(BindToXMLPayload.class) OrgVAppTemplateLeaseSettings settings);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApi.java
deleted file mode 100644
index e25f8be..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApi.java
+++ /dev/null
@@ -1,143 +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.vcloud.director.v1_5.features.admin;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.RoleReferences;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.jclouds.vcloud.director.v1_5.features.QueryApi;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface AdminQueryApi extends QueryApi {
-
- /**
- * Retrieves a list of {@link Group}s for organization the org admin belongs to by using REST API general
- * QueryHandler
- *
- * <pre>
- * GET /admin/groups/query
- * </pre>
- */
- @GET
- @Path("/admin/groups/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords groupsQueryAll();
-
- /**
- * Retrieves a list of {@link Org}s by using REST API general QueryHandler.
- *
- * <pre>
- * GET /admin/orgs/query
- * </pre>
- */
- @GET
- @Path("/admin/orgs/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords orgsQueryAll();
-
- /**
- * Retrieves a list of {@link Right}s by using REST API general QueryHandler.
- *
- * <pre>
- * GET /admin/rights/query
- * </pre>
- */
- @GET
- @Path("/admin/rights/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords rightsQueryAll();
-
- /**
- * Retrieves a list of {@link Role}s by using REST API general QueryHandler.
- *
- * <pre>
- * GET /admin/roles/query
- * </pre>
- */
- @GET
- @Path("/admin/roles/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords rolesQueryAll();
-
- /**
- * Retrieves a list of {@link RoleReference}s by using REST API general QueryHandler.
- *
- * <pre>
- * GET /admin/roles/query?format=references
- * </pre>
- */
- @GET
- @Path("/admin/roles/query")
- @Consumes
- @QueryParams(keys = { "format" }, values = { "references" })
- @JAXBResponseParser
- RoleReferences roleReferencesQueryAll();
-
- /**
- * Retrieves a list of {@link User}s by using REST API general QueryHandler.
- *
- * <pre>
- * GET /admin/strandedUsers/query
- * </pre>
- */
- @GET
- @Path("/admin/strandedUsers/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords strandedUsersQueryAll();
-
- /**
- * Retrieves a list of {@link User}s by using REST API general QueryHandler.
- *
- * <pre>
- * GET /admin/users/query
- * </pre>
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/admin/users/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords usersQueryAll();
-
- /**
- * Retrieves a list of {@link Vdc}s by using REST API general QueryHandler.
- *
- * <pre>
- * GET /admin/vdcs/query
- * </pre>
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/admin/vdcs/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vdcsQueryAll();
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApi.java
deleted file mode 100644
index dcd6fba..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApi.java
+++ /dev/null
@@ -1,92 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.AdminVdc;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.features.VdcApi;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface AdminVdcApi extends VdcApi {
-
- /** Returns an admin view of the virtual datacenter or null if not found. */
- @Override
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- AdminVdc get(@EndpointParam URI vdcAdminHref);
-
- /**
- * Modifies a Virtual Data Center. Virtual Data Center could be enabled or disabled.
- * Additionally it could have one of these states FAILED_CREATION(-1), NOT_READY(0),
- * READY(1), UNKNOWN(1) and UNRECOGNIZED(3).
- */
- @PUT
- @Consumes
- @Produces(VCloudDirectorMediaType.ADMIN_VDC)
- @JAXBResponseParser
- Task edit(@EndpointParam URI vdcAdminHref, AdminVdc vdc);
-
- /**
- * Deletes a Virtual Data Center. The Virtual Data Center should be disabled when remove is issued.
- * Otherwise error code 400 Bad Request is returned.
- */
- // TODO Saw what exception, instead of 400
- @DELETE
- @Consumes
- @JAXBResponseParser
- Task remove(@EndpointParam URI vdcAdminHref);
-
- /**
- * Enables a Virtual Data Center. This operation enables disabled Virtual Data Center.
- * If it is already enabled this operation has no effect.
- */
- @POST
- @Consumes
- @Path("/action/enable")
- @JAXBResponseParser
- void enable(@EndpointParam URI vdcAdminHref);
-
- /**
- * Disables a Virtual Data Center. If the Virtual Data Center is disabled this operation does not
- * have an effect.
- */
- @POST
- @Consumes
- @Path("/action/disable")
- @JAXBResponseParser
- void disable(@EndpointParam URI vdcAdminHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApi.java
deleted file mode 100644
index 77fdae5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApi.java
+++ /dev/null
@@ -1,69 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.GROUP;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Group;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface GroupApi {
- /** Returns the group or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Group get(@EndpointParam URI groupUri);
-
- @POST
- @Path("/groups")
- @Consumes(GROUP)
- @Produces(GROUP)
- @JAXBResponseParser
- Group addGroupToOrg(@BinderParam(BindToXMLPayload.class) Group group, @EndpointParam URI adminUrn);
-
- @PUT
- @Consumes(GROUP)
- @Produces(GROUP)
- @JAXBResponseParser
- Group edit(@EndpointParam URI groupUrn, @BinderParam(BindToXMLPayload.class) Group group);
-
- @DELETE
- @Consumes
- @JAXBResponseParser
- void remove(@EndpointParam URI groupUrn);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApi.java
deleted file mode 100644
index cf94dea..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApi.java
+++ /dev/null
@@ -1,84 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.USER;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.User;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface UserApi {
-
- /** Returns the user, even if disabled, or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- User get(@EndpointParam URI userHref);
-
- /**
- * Creates or imports a user in an organization. The user could be enabled or disabled.
- */
- @POST
- @Path("/users")
- @Consumes(USER)
- @Produces(USER)
- @JAXBResponseParser
- User addUserToOrg(@BinderParam(BindToXMLPayload.class) User user, @EndpointParam URI orgAdminHref);
-
-
- /**
- * Modifies a user. The user object could be enabled or disabled. Note: the lock status cannot be
- * changed using this call: use {@link #unlock(URI)}.
- */
- @PUT
- @Consumes(USER)
- @Produces(USER)
- @JAXBResponseParser
- User edit(@EndpointParam URI userHref, @BinderParam(BindToXMLPayload.class) User user);
-
- @DELETE
- @Consumes
- @JAXBResponseParser
- void remove(@EndpointParam URI userHref);
-
- @POST
- @Path("/action/unlock")
- @Consumes
- @JAXBResponseParser
- void unlock(@EndpointParam URI userHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java
deleted file mode 100644
index 50a8a96..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationAndCookieToRequest.java
+++ /dev/null
@@ -1,51 +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.vcloud.director.v1_5.filters;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpException;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpRequestFilter;
-import org.jclouds.vcloud.director.v1_5.annotations.Session;
-
-import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.net.HttpHeaders;
-
-@Singleton
-public class AddVCloudAuthorizationAndCookieToRequest implements HttpRequestFilter {
-
- private final Supplier<String> sessionSupplier;
-
- @Inject
- public AddVCloudAuthorizationAndCookieToRequest(@Session Supplier<String> sessionSupplier) {
- this.sessionSupplier = sessionSupplier;
- }
-
- @Override
- public HttpRequest filter(HttpRequest request) throws HttpException {
- String token = sessionSupplier.get();
- return request
- .toBuilder()
- .replaceHeaders(
- ImmutableMultimap.of("x-vcloud-authorization", token, HttpHeaders.COOKIE, "vcloud-token="
- + token)).build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToAdminHref.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToAdminHref.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToAdminHref.java
deleted file mode 100644
index 8b969ac..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToAdminHref.java
+++ /dev/null
@@ -1,63 +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.vcloud.director.v1_5.functions;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.Iterables;
-
-/**
- * Resolves URN to its Admin HREF via the entity Resolver
- */
-@Singleton
-public final class IdToAdminHref implements Function<String, URI> {
- private final LoadingCache<String, Entity> resolveEntityCache;
-
- @Inject
- public IdToAdminHref(LoadingCache<String, Entity> resolveEntityCache) {
- this.resolveEntityCache = checkNotNull(resolveEntityCache, "resolveEntityCache");
- }
-
- @Override
- public URI apply(String from) {
- checkNotNull(from, "urn");
- Entity entity = resolveEntityCache.getUnchecked(from.toString());
- Optional<Link> link = Iterables.tryFind(entity.getLinks(), typeContainsAdmin);
- checkArgument(link.isPresent(), "no admin link found for entity %s", entity);
- return link.get().getHref();
- }
-
- private static final Predicate<Link> typeContainsAdmin = new Predicate<Link>() {
- @Override
- public boolean apply(Link in) {
- return in.getType().indexOf(".admin.") != -1;
- }
- };
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToHref.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToHref.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToHref.java
deleted file mode 100644
index 790e1ed..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/IdToHref.java
+++ /dev/null
@@ -1,51 +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.vcloud.director.v1_5.functions;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.get;
-
-import java.net.URI;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-
-import com.google.common.base.Function;
-import com.google.common.cache.LoadingCache;
-
-/**
- * Resolves URN to its HREF via the entity Resolver, caching to avoid excess network requests.
- */
-@Singleton
-public final class IdToHref implements Function<String, URI> {
- private final LoadingCache<String, Entity> resolveEntityCache;
-
- @Inject
- public IdToHref(LoadingCache<String, Entity> resolveEntityCache) {
- this.resolveEntityCache = checkNotNull(resolveEntityCache, "resolveEntityCache");
- }
-
- @Override
- public URI apply(String urn) {
- Entity entity = resolveEntityCache.getUnchecked(checkNotNull(urn, "urn"));
- checkArgument(entity.getLinks().size() > 0, "no links found for entity %s", entity);
- return get(entity.getLinks(), 0).getHref();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/RegexValueParser.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/RegexValueParser.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/RegexValueParser.java
deleted file mode 100644
index ad93b7f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/RegexValueParser.java
+++ /dev/null
@@ -1,52 +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.vcloud.director.v1_5.functions;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ReturnStringIf2xx;
-
-import com.google.common.base.Function;
-import com.google.inject.Singleton;
-
-@Singleton
-public class RegexValueParser implements Function<HttpResponse, String> {
- Pattern pattern = Pattern.compile("<Value>([^<]+)</Value>");
- private final ReturnStringIf2xx returnStringIf200;
-
- @Inject
- RegexValueParser(ReturnStringIf2xx returnStringIf200) {
- this.returnStringIf200 = returnStringIf200;
- }
-
- @Override
- public String apply(HttpResponse response) {
- String content = returnStringIf200.apply(response);
- if (content != null) {
- Matcher matcher = pattern.matcher(content);
- if (matcher.find()) {
- return matcher.group(1);
- }
- }
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/ReturnPayloadBytes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/ReturnPayloadBytes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/ReturnPayloadBytes.java
deleted file mode 100644
index 03cce1c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/ReturnPayloadBytes.java
+++ /dev/null
@@ -1,40 +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.vcloud.director.v1_5.functions;
-
-import java.io.IOException;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.io.ByteStreams2;
-
-import com.google.common.base.Function;
-import com.google.common.base.Throwables;
-
-@Singleton
-public class ReturnPayloadBytes implements Function<HttpResponse, byte[]> {
-
- @Override
- public byte[] apply(HttpResponse from) {
- try {
- return ByteStreams2.toByteArrayAndClose(from.getPayload().openStream());
- } catch (IOException e) {
- throw Throwables.propagate(e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVApp.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVApp.java
deleted file mode 100644
index ef48233..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVApp.java
+++ /dev/null
@@ -1,42 +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.vcloud.director.v1_5.functions;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.AbstractVApp;
-
-import com.google.common.base.Function;
-
-public class SectionForVApp<S extends SectionType> implements Function<AbstractVApp, S> {
-
- private final Class<? extends SectionType> sectionType;
-
- public SectionForVApp(Class<S> sectionType) {
- this.sectionType = sectionType;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public S apply(AbstractVApp from) {
- for (SectionType section : from.getSections()) {
- if (sectionType.isAssignableFrom(section.getClass())) {
- return (S)section;
- }
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVAppTemplate.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVAppTemplate.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVAppTemplate.java
deleted file mode 100644
index 394baa1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVAppTemplate.java
+++ /dev/null
@@ -1,47 +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.vcloud.director.v1_5.functions;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-
-import com.google.common.base.Function;
-
-@Singleton
-public class SectionForVAppTemplate<S extends SectionType> implements Function<VAppTemplate, S> {
-
- private final Class<? extends SectionType> sectionType;
-
- @Inject
- SectionForVAppTemplate(Class<S> sectionType) {
- this.sectionType = sectionType;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public S apply(VAppTemplate from) {
- for (SectionType section : from.getSections()) {
- if (sectionType.isAssignableFrom(section.getClass())) {
- return (S)section;
- }
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java
deleted file mode 100644
index 25b9f7b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java
+++ /dev/null
@@ -1,87 +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.vcloud.director.v1_5.handlers;
-
-import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream;
-import static org.jclouds.http.HttpUtils.releasePayload;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-
-import org.jclouds.domain.Credentials;
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.jclouds.vcloud.director.v1_5.login.SessionApi;
-
-import com.google.common.cache.LoadingCache;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-/**
- * If the credentials supplied in the authentication header are invalid, or if the token has
- * expired, the server returns HTTP response code 401. The token expires after a configurable
- * interval of api inactivity. The default is 30 minutes after the token is created. After the
- * token expires, you must log in again to obtain a new token.
- */
-@Singleton
-public class InvalidateSessionAndRetryOn401AndLogoutOnClose extends BackoffLimitedRetryHandler {
- @Resource
- protected Logger logger = Logger.NULL;
-
- private final LoadingCache<Credentials, SessionWithToken> authenticationResponseCache;
- private final SessionApi sessionApi;
-
- @Inject
- protected InvalidateSessionAndRetryOn401AndLogoutOnClose(
- LoadingCache<Credentials, SessionWithToken> authenticationResponseCache, SessionApi sessionApi) {
- this.authenticationResponseCache = authenticationResponseCache;
- this.sessionApi = sessionApi;
- }
-
- @Override
- public boolean shouldRetryRequest(HttpCommand command, HttpResponse response) {
- boolean retry = false; // default
- try {
- if (response.getStatusCode() == 401) {
- closeClientButKeepContentStream(response);
- logger.debug("invalidating session");
- authenticationResponseCache.invalidateAll();
- retry = super.shouldRetryRequest(command, response);
- }
- return retry;
- } finally {
- releasePayload(response);
- }
- }
-
- /**
- * it is important that we close any sessions on close to help the server not become overloaded.
- */
- @PreDestroy
- public void logoutOnClose() {
- for (SessionWithToken s : authenticationResponseCache.asMap().values()) {
- try {
- sessionApi.logoutSessionWithToken(s.getSession().getHref(), s.getToken());
- } catch (Exception e) {
- logger.error(e, "error logging out session %s", s.getSession());
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandler.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandler.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandler.java
deleted file mode 100644
index 23a42a7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/VCloudDirectorErrorHandler.java
+++ /dev/null
@@ -1,74 +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.vcloud.director.v1_5.handlers;
-
-import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream;
-
-import java.io.ByteArrayInputStream;
-import javax.inject.Singleton;
-import javax.xml.bind.JAXB;
-
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpErrorHandler;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpResponseException;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-
-import com.google.common.base.Throwables;
-
-/**
- * This will parse and set an appropriate exception on the command object.
- */
-@Singleton
-public class VCloudDirectorErrorHandler implements HttpErrorHandler {
-
- @Override
- public void handleError(HttpCommand command, HttpResponse response) {
- // it is important to always read fully and close streams
- byte[] data = closeClientButKeepContentStream(response);
-
- // Create default exception
- String message = data != null
- ? new String(data)
- : String.format("%s -> %s", command.getCurrentRequest().getRequestLine(), response.getStatusLine());
- Exception exception = new HttpResponseException(command, response, message);
-
- // Try to create a VCloudDirectorException from XML payload, if it exists
- if (response.getPayload() != null && response.getPayload().getContentMetadata().getContentType().startsWith(VCloudDirectorMediaType.ERROR)) {
- try {
- Error error = JAXB.unmarshal(new ByteArrayInputStream(data), Error.class);
- exception = new VCloudDirectorException(error);
- message = error.getMessage();
- } catch (Exception e) {
- Throwables.propagate(e);
- }
- }
-
- // Create custom exception for error codes we know about
- if (response.getStatusCode() == 401) {
- exception = new AuthorizationException(message, exception);
- } else if (response.getStatusCode() == 403 || response.getStatusCode() == 404) {
- exception = new ResourceNotFoundException(message, exception);
- }
-
- command.setException(exception);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java
deleted file mode 100644
index 1d15f40..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java
+++ /dev/null
@@ -1,71 +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.vcloud.director.v1_5.internal;
-
-import java.net.URI;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.annotations.Name;
-import org.jclouds.domain.Credentials;
-import org.jclouds.lifecycle.Closer;
-import org.jclouds.location.Provider;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.ApiContext;
-import org.jclouds.rest.Utils;
-import org.jclouds.rest.internal.ApiContextImpl;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorContext;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.functions.IdToAdminHref;
-import org.jclouds.vcloud.director.v1_5.functions.IdToHref;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
-
-@Singleton
-public class VCloudDirectorContextImpl extends ApiContextImpl<VCloudDirectorApi> implements VCloudDirectorContext {
- private final ApiContext<VCloudDirectorAdminApi> adminContext;
- private final Function<String, URI> idToHref;
- private final Function<String, URI> idToAdminHref;
-
- @Inject VCloudDirectorContextImpl(@Name String name, ProviderMetadata providerMetadata,
- @Provider Supplier<Credentials> creds, Utils utils, Closer closer, Injector injector,
- ApiContext<VCloudDirectorAdminApi> adminContext, IdToHref idToHref, IdToAdminHref idToAdminHref) {
- super(name, providerMetadata, creds, utils, closer, injector, TypeLiteral.get(VCloudDirectorApi.class));
- this.adminContext = adminContext;
- this.idToHref = idToHref;
- this.idToAdminHref = idToAdminHref;
-
- }
-
- @Override
- public ApiContext<VCloudDirectorAdminApi> getAdminContext() {
- return adminContext;
- }
-
- @Override public URI resolveIdToHref(String id) {
- return idToHref.apply(id);
- }
-
- @Override public URI resolveIdToAdminHref(String adminId) {
- return idToAdminHref.apply(adminId);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/LoginUserInOrgWithPassword.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/LoginUserInOrgWithPassword.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/LoginUserInOrgWithPassword.java
deleted file mode 100644
index 8444e9e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/LoginUserInOrgWithPassword.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.loaders;
-
-import java.net.URI;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.domain.Credentials;
-import org.jclouds.vcloud.director.v1_5.annotations.Login;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.jclouds.vcloud.director.v1_5.login.SessionApi;
-
-import com.google.common.base.Supplier;
-import com.google.common.cache.CacheLoader;
-
-@Singleton
-public class LoginUserInOrgWithPassword extends CacheLoader<Credentials, SessionWithToken> {
- private final SessionApi api;
- private final Supplier<URI> loginUrl;
-
- @Inject
- public LoginUserInOrgWithPassword(SessionApi api, @Login Supplier<URI> loginUrl) {
- this.api = api;
- this.loginUrl = loginUrl;
- }
-
- @Override
- public SessionWithToken load(Credentials input) {
- String user = input.identity.substring(0, input.identity.lastIndexOf('@'));
- String org = input.identity.substring(input.identity.lastIndexOf('@') + 1);
- String password = input.credential;
- return api.loginUserInOrgWithPassword(loginUrl.get(), user, org, password);
- }
-
- @Override
- public String toString() {
- return "loginUserInOrgWithPassword()";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/ResolveEntity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/ResolveEntity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/ResolveEntity.java
deleted file mode 100644
index 009105e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/loaders/ResolveEntity.java
+++ /dev/null
@@ -1,47 +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.vcloud.director.v1_5.loaders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-
-import com.google.common.cache.CacheLoader;
-
-@Singleton
-public class ResolveEntity extends CacheLoader<String, Entity> {
- private final VCloudDirectorApi api;
-
- @Inject
- public ResolveEntity(VCloudDirectorApi api) {
- this.api = checkNotNull(api, "api");
- }
-
- @Override
- public Entity load(String input) {
- return api.resolveEntity(checkNotNull(input, "urn"));
- }
-
- @Override
- public String toString() {
- return "resolveEntity()";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionApi.java
deleted file mode 100644
index 272789b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionApi.java
+++ /dev/null
@@ -1,58 +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.vcloud.director.v1_5.login;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.MapBinder;
-import org.jclouds.rest.annotations.PayloadParam;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.vcloud.director.v1_5.binders.BindUserOrgAndPasswordAsBasicAuthorizationHeader;
-import org.jclouds.vcloud.director.v1_5.domain.Session;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.jclouds.vcloud.director.v1_5.parsers.SessionWithTokenFromXMLAndHeader;
-
-public interface SessionApi {
-
- @POST
- @Consumes
- @ResponseParser(SessionWithTokenFromXMLAndHeader.class)
- @MapBinder(BindUserOrgAndPasswordAsBasicAuthorizationHeader.class)
- SessionWithToken loginUserInOrgWithPassword(@EndpointParam URI loginUrl,
- @PayloadParam("user") String user, @PayloadParam("org") String org,
- @PayloadParam("password") String password);
-
- @GET
- @Consumes
- @JAXBResponseParser
- Session getSessionWithToken(@EndpointParam URI session,
- @HeaderParam("x-vcloud-authorization") String authenticationToken);
-
- @DELETE
- @Consumes
- @JAXBResponseParser
- void logoutSessionWithToken(@EndpointParam URI session,
- @HeaderParam("x-vcloud-authorization") String authenticationToken);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/parsers/SessionWithTokenFromXMLAndHeader.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/parsers/SessionWithTokenFromXMLAndHeader.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/parsers/SessionWithTokenFromXMLAndHeader.java
deleted file mode 100644
index 23861a2..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/parsers/SessionWithTokenFromXMLAndHeader.java
+++ /dev/null
@@ -1,48 +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.vcloud.director.v1_5.parsers;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseXMLWithJAXB;
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.domain.Session;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-
-import com.google.common.base.Function;
-
-@Singleton
-public class SessionWithTokenFromXMLAndHeader implements Function<HttpResponse, SessionWithToken> {
- @Resource
- protected Logger logger = Logger.NULL;
- private ParseXMLWithJAXB<Session> sessionParser;
-
- @Inject
- public SessionWithTokenFromXMLAndHeader(ParseXMLWithJAXB<Session> sessionParser) {
- this.sessionParser = sessionParser;
- }
-
- @Override
- public SessionWithToken apply(final HttpResponse from) {
- Session session = sessionParser.apply(from);
- return SessionWithToken.builder().session(session).token(from.getFirstHeaderOrNull("x-vcloud-authorization"))
- .build();
- }
-}
[12/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java
deleted file mode 100644
index 7f24595..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java
+++ /dev/null
@@ -1,351 +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.vcloud.director.v1_5.features;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Predicates.and;
-import static com.google.common.collect.Iterables.find;
-import static com.google.common.collect.Iterables.getFirst;
-import static com.google.common.collect.Iterables.isEmpty;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.GETTER_RETURNS_SAME_OBJ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_DEL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_ATTRB_DEL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_CLONE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_LIST_SIZE_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_LIST_SIZE_GE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_REQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_UPDATABLE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.relEquals;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.typeEquals;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URISyntaxException;
-import java.util.Set;
-
-import org.jclouds.io.Payloads;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.File;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-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.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "MediaApiLiveTest")
-public class MediaApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String MEDIA = "media";
- public static final String VDC = "vdc";
-
- /*
- * Convenience references to API apis.
- */
- protected VdcApi vdcApi;
- protected MediaApi mediaApi;
-
- /*
- * Shared state between dependent tests.
- */
- private Media media;
- private Media oldMedia;
- private Owner owner;
- private Metadata metadata;
- private String metadataValue;
- private String metadataEntryValue = "value";
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- vdcApi = context.getApi().getVdcApi();
- mediaApi = context.getApi().getMediaApi();
- }
-
- @AfterClass(alwaysRun = true)
- protected void tidyUp() {
- if (media != null) {
- try {
- Task remove = mediaApi.remove(media.getHref());
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error when deleting media '%s': %s", media.getName());
- }
- }
- if (oldMedia != null) {
- try {
- Task remove = mediaApi.remove(oldMedia.getHref());
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error when deleting media '%s': %s", oldMedia.getName());
- }
- }
- }
-
- @Test(description = "POST /vdc/{id}/media")
- public void testAddMedia() throws URISyntaxException {
- Vdc vdc = lazyGetVdc();
- Link addMedia = find(vdc.getLinks(), and(relEquals("add"), typeEquals(VCloudDirectorMediaType.MEDIA)));
-
- // TODO: generate an iso
- byte[] iso = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
-
- Media sourceMedia = Media.builder().type(VCloudDirectorMediaType.MEDIA).name("Test media " + random.nextInt())
- .size(iso.length).imageType(Media.ImageType.ISO).description("Test media generated by testAddMedia()")
- .build();
- media = mediaApi.add(addMedia.getHref(), sourceMedia);
-
- Checks.checkMediaFor(MEDIA, media);
-
- assertNotNull(media.getFiles(), String.format(OBJ_FIELD_REQ, MEDIA, "files"));
- assertEquals(1, media.getFiles().size(),
- String.format(OBJ_FIELD_LIST_SIZE_EQ, MEDIA, "files", 1, media.getFiles().size()));
- File uploadFile = getFirst(media.getFiles(), null);
- assertNotNull(uploadFile, String.format(OBJ_FIELD_REQ, MEDIA, "files.first"));
- assertEquals(uploadFile.getSize(), Long.valueOf(iso.length));
- assertEquals(uploadFile.getSize().longValue(), sourceMedia.getSize(),
- String.format(OBJ_FIELD_EQ, MEDIA, "uploadFile.size()", sourceMedia.getSize(), uploadFile.getSize()));
-
- Set<Link> links = uploadFile.getLinks();
- assertNotNull(links, String.format(OBJ_FIELD_REQ, MEDIA, "uploadFile.links"));
- assertTrue(links.size() >= 1, String.format(OBJ_FIELD_LIST_SIZE_GE, MEDIA, "uploadfile.links", 1, links.size()));
- assertTrue(
- Iterables.all(
- links,
- Predicates.or(LinkPredicates.relEquals(Link.Rel.UPLOAD_DEFAULT),
- LinkPredicates.relEquals(Link.Rel.UPLOAD_ALTERNATE))),
- String.format(OBJ_FIELD_REQ, MEDIA, "uploadFile.links.first"));
-
- Link uploadLink = Iterables.find(links, LinkPredicates.relEquals(Link.Rel.UPLOAD_DEFAULT));
- context.getApi().getUploadApi().upload(uploadLink.getHref(), Payloads.newPayload(iso));
-
- media = mediaApi.get(media.getHref());
- if (media.getTasks().size() == 1) {
- Task uploadTask = Iterables.getOnlyElement(media.getTasks());
- Checks.checkTask(uploadTask);
- assertEquals(uploadTask.getStatus(), Task.Status.RUNNING);
- assertTrue(retryTaskSuccess.apply(uploadTask), String.format(TASK_COMPLETE_TIMELY, "uploadTask"));
- media = mediaApi.get(media.getHref());
- }
- }
-
- @Test(description = "GET /media/{id}", dependsOnMethods = { "testAddMedia" })
- public void testGetMedia() {
- media = mediaApi.get(media.getHref());
- assertNotNull(media, String.format(OBJ_REQ_LIVE, MEDIA));
-
- owner = media.getOwner();
- assertNotNull(owner, String.format(OBJ_FIELD_REQ_LIVE, MEDIA, "owner"));
- Checks.checkResource(media.getOwner());
-
- Checks.checkMediaFor(MEDIA, media);
- }
-
- @Test(description = "GET /media/{id}/owner", dependsOnMethods = { "testGetMedia" })
- public void testGetMediaOwner() {
- Owner directOwner = mediaApi.getOwner(media.getHref());
- assertEquals(owner.toBuilder().user(owner.getUser()).build(),
- directOwner.toBuilder().links(ImmutableSet.<Link> of()).build(), String.format(
- GETTER_RETURNS_SAME_OBJ, "getOwner()", "owner", "media.getOwner()", owner.toString(),
- directOwner.toString()));
-
- // parent type
- Checks.checkResource(directOwner);
-
- // required
- assertNotNull(directOwner.getUser(), String.format(OBJ_FIELD_REQ, "Owner", "user"));
- Checks.checkReferenceType(directOwner.getUser());
- }
-
- @Test(description = "POST /vdc/{id}/action/cloneMedia", dependsOnMethods = { "testGetMediaOwner" })
- public void testCloneMedia() {
- oldMedia = media;
- media = vdcApi.cloneMedia(context.resolveIdToHref(vdcId),
- CloneMediaParams.builder().source(Reference.builder().fromEntity(media).build())
- .name("copied " + media.getName()).description("copied by testCloneMedia()").build());
-
- Checks.checkMediaFor(VDC, media);
-
- if (media.getTasks() != null) {
- Task copyTask = getFirst(media.getTasks(), null);
- if (copyTask != null) {
- Checks.checkTask(copyTask);
- assertTrue(retryTaskSuccess.apply(copyTask), String.format(TASK_COMPLETE_TIMELY, "copyTask"));
- media = mediaApi.get(media.getHref());
- }
- }
-
- Checks.checkMediaFor(MEDIA, media);
- assertTrue(media.clone(oldMedia),
- String.format(OBJ_FIELD_CLONE, MEDIA, "copied media", media.toString(), oldMedia.toString()));
-
- context.getApi().getMetadataApi(media.getHref()).put("key", "value");
-
- media = vdcApi.cloneMedia(context.resolveIdToHref(vdcId),
- CloneMediaParams.builder().source(Reference.builder().fromEntity(media).build()).name("moved test media")
- .description("moved by testCloneMedia()").isSourceDelete(true).build());
-
- Checks.checkMediaFor(VDC, media);
-
- if (media.getTasks() != null) {
- Task copyTask = getFirst(media.getTasks(), null);
- if (copyTask != null) {
- Checks.checkTask(copyTask);
- assertTrue(retryTaskSuccess.apply(copyTask), String.format(TASK_COMPLETE_TIMELY, "copyTask"));
- media = mediaApi.get(media.getHref());
- }
- }
-
- Checks.checkMediaFor(MEDIA, media);
- assertTrue(media.clone(oldMedia),
- String.format(OBJ_FIELD_CLONE, MEDIA, "moved media", media.toString(), oldMedia.toString()));
- }
-
- @Test(description = "PUT /media/{id}", dependsOnMethods = { "testCloneMedia" })
- public void testSetMedia() {
- String oldName = media.getName();
- String newName = "new " + oldName;
- String oldDescription = media.getDescription();
- String newDescription = "new " + oldDescription;
- media = media.toBuilder().name(newName).description(newDescription).build();
-
- Task editMedia = mediaApi.edit(media.getHref(), media);
- Checks.checkTask(editMedia);
- assertTrue(retryTaskSuccess.apply(editMedia), String.format(TASK_COMPLETE_TIMELY, "editMedia"));
- media = mediaApi.get(media.getHref());
-
- assertTrue(equal(media.getName(), newName), String.format(OBJ_FIELD_UPDATABLE, MEDIA, "name"));
- assertTrue(equal(media.getDescription(), newDescription),
- String.format(OBJ_FIELD_UPDATABLE, MEDIA, "description"));
-
- // TODO negative tests?
-
- Checks.checkMediaFor(MEDIA, media);
-
- media = media.toBuilder().name(oldName).description(oldDescription).build();
-
- editMedia = mediaApi.edit(media.getHref(), media);
- Checks.checkTask(editMedia);
- assertTrue(retryTaskSuccess.apply(editMedia), String.format(TASK_COMPLETE_TIMELY, "editMedia"));
- media = mediaApi.get(media.getHref());
- }
-
- @Test(description = "GET /media/{id}/metadata", dependsOnMethods = { "testSetMetadataValue" })
- public void testGetMetadata() {
- metadata = context.getApi().getMetadataApi(media.getHref()).get();
- // required for testing
- assertFalse(isEmpty(metadata.getMetadataEntries()), String.format(OBJ_FIELD_REQ_LIVE, MEDIA, "metadata.entries"));
-
- Checks.checkMetadataFor(MEDIA, metadata);
- }
-
- @Test(description = "POST /media/{id}/metadata", dependsOnMethods = { "testGetMedia" })
- public void testMergeMetadata() {
- // test new
- Task mergeMetadata = context.getApi().getMetadataApi(media.getHref()).putAll(ImmutableMap.of("testKey", "testValue"));
- Checks.checkTask(mergeMetadata);
- assertTrue(retryTaskSuccess.apply(mergeMetadata), String.format(TASK_COMPLETE_TIMELY, "mergeMetadata(new)"));
- metadata = context.getApi().getMetadataApi(media.getHref()).get();
- Checks.checkMetadataFor(MEDIA, metadata);
- assertEquals(metadata.get("testKey"), "testValue");
-
- media = mediaApi.get(media.getHref());
- Checks.checkMediaFor(MEDIA, media);
-
- // test edit
- mergeMetadata = context.getApi().getMetadataApi(media.getHref()).put("testKey", "new testValue");
- Checks.checkTask(mergeMetadata);
- assertTrue(retryTaskSuccess.apply(mergeMetadata), String.format(TASK_COMPLETE_TIMELY, "mergeMetadata(edit)"));
- metadata = context.getApi().getMetadataApi(media.getHref()).get();
- Checks.checkMetadataFor(MEDIA, metadata);
- assertEquals(metadata.get("testKey"), "new testValue");
-
- media = mediaApi.get(media.getHref());
- Checks.checkMediaFor(MEDIA, media);
- }
-
- @Test(description = "GET /media/{id}/metadata/{key}", dependsOnMethods = { "testSetMetadataValue" })
- public void testGetMetadataValue() {
- metadataValue = context.getApi().getMetadataApi(media.getHref()).get("key");
- assertNotNull(metadataValue);
- }
-
- @Test(description = "PUT /media/{id}/metadata/{key}", dependsOnMethods = { "testMergeMetadata" })
- public void testSetMetadataValue() {
- metadataEntryValue = "value";
-
- Task setMetadataEntry = context.getApi().getMetadataApi(media.getHref()).put("key", metadataEntryValue);
- Checks.checkTask(setMetadataEntry);
- assertTrue(retryTaskSuccess.apply(setMetadataEntry), String.format(TASK_COMPLETE_TIMELY, "setMetadataEntry"));
- metadataValue = context.getApi().getMetadataApi(media.getHref()).get("key");
- assertNotNull(metadataValue);
- }
-
- @Test(description = "DELETE /media/{id}/metadata/{key}", dependsOnMethods = { "testGetMetadata",
- "testGetMetadataValue" })
- public void testRemoveMetadata() {
- Task remove = context.getApi().getMetadataApi(media.getHref()).remove("testKey");
- Checks.checkTask(remove);
- assertTrue(retryTaskSuccess.apply(remove), String.format(TASK_COMPLETE_TIMELY, "remove"));
-
- metadataValue = context.getApi().getMetadataApi(media.getHref()).get("testKey");
- assertNull(metadataValue, String.format(OBJ_FIELD_ATTRB_DEL, MEDIA, "Metadata",
- metadataValue != null ? metadataValue.toString() : "", "MetadataEntry",
- metadataValue != null ? metadataValue.toString() : ""));
-
- metadataValue = context.getApi().getMetadataApi(media.getHref()).get("key");
- assertNotNull(metadataValue);
-
- media = mediaApi.get(media.getHref());
- Checks.checkMediaFor(MEDIA, media);
- }
-
- @Test(description = "DELETE /media/{id}", dependsOnMethods = { "testRemoveMetadata" })
- public void testRemoveMedia() {
- Task removeMedia = mediaApi.remove(media.getHref());
- Checks.checkTask(removeMedia);
- assertTrue(retryTaskSuccess.apply(removeMedia), String.format(TASK_COMPLETE_TIMELY, "removeMedia"));
-
- media = mediaApi.get(media.getHref());
- assertNull(media, String.format(OBJ_DEL, MEDIA, media != null ? media.toString() : ""));
-
- removeMedia = mediaApi.remove(oldMedia.getHref());
- Checks.checkTask(removeMedia);
- assertTrue(retryTaskSuccess.apply(removeMedia), String.format(TASK_COMPLETE_TIMELY, "removeMedia"));
- oldMedia = null;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MetadataApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MetadataApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MetadataApiExpectTest.java
deleted file mode 100644
index 3f328b8..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MetadataApiExpectTest.java
+++ /dev/null
@@ -1,159 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ANY;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ERROR;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA_ENTRY;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
-import java.net.URI;
-import java.util.TimeZone;
-
-import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-@Test(groups = { "unit", "user" }, testName = "MetadataApiExpectTest")
-public class MetadataApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- public MetadataApiExpectTest() {
- TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
- }
-
- public void testVappTemplateMetadata() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- MetadataApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/metadata").acceptMedia(ANY).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/metadata.xml", METADATA).httpResponseBuilder().build(),
- new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/metadata").xmlFilePayload("/vapptemplate/metadata.xml", METADATA).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/task/task.xml", TASK).httpResponseBuilder().build()
- ).getMetadataApi(uri);
-
- assertNotNull(api);
- Metadata metadata = api.get();
-
- assertEquals(metadata, exampleMetadata());
-
- Task task = api.putAll(exampleMetadata());
- assertNotNull(task);
- }
-
- @Test(expectedExceptions = VCloudDirectorException.class)
- public void testErrorGetMetadata() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- MetadataApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/metadata").acceptMedia(ANY).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getMetadataApi(uri);
-
- api.get();
- }
-
- @Test(expectedExceptions = VCloudDirectorException.class)
- public void testErrorEditMetadata() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- MetadataApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/metadata").xmlFilePayload("/vapptemplate/metadata.xml", METADATA).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getMetadataApi(uri);
-
- api.putAll(exampleMetadata());
- }
-
- public void testVappTemplateMetadataValue() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- MetadataApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/metadata/12345").acceptMedia(METADATA_ENTRY).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/metadataValue.xml", METADATA_ENTRY).httpResponseBuilder().build(),
- new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/metadata/12345").xmlFilePayload("/vapptemplate/metadataValue.xml", METADATA_ENTRY).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/task/task.xml", TASK).httpResponseBuilder().build(),
- new VcloudHttpRequestPrimer().apiCommand("DELETE", templateId + "/metadata/12345").acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/task/task.xml", TASK).httpResponseBuilder().build()
- ).getMetadataApi(uri);
-
- assertNotNull(api);
- String metadata = api.get("12345");
-
- assertEquals(metadata, "some value");
-
- Task task = api.put("12345", "some value");
- assertNotNull(task);
-
- task = api.remove("12345");
- assertNotNull(task);
- }
-
- public void testErrorGetMetadataValue() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- MetadataApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/metadata/12345").acceptMedia(METADATA_ENTRY).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getMetadataApi(uri);
-
- assertNull(api.get("12345"));
- }
-
- @Test(expectedExceptions = VCloudDirectorException.class)
- public void testErrorEditMetadataValue() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- MetadataApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/metadata/12345").xmlFilePayload("/vapptemplate/metadataValue.xml", METADATA_ENTRY).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getMetadataApi(uri);
-
- api.put("12345", "some value");
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testRemoveMissingMetadataValue() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- MetadataApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("DELETE", templateId + "/metadata/12345").acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getMetadataApi(uri);
-
- api.remove("12345");
- }
- private Metadata exampleMetadata() {
- return Metadata.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/metadata"))
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .link(Link.builder().href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"))
- .type("application/vnd.vmware.vcloud.vAppTemplate+xml").rel("up").build())
- .entry(MetadataEntry.builder().key("key").value("value").build()).build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiExpectTest.java
deleted file mode 100644
index 98d4700..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiExpectTest.java
+++ /dev/null
@@ -1,230 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ERROR;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA_VALUE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry;
-import org.jclouds.vcloud.director.v1_5.domain.network.DhcpService;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRange;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpScope;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures;
-import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "NetworkApiExpectTest")
-public class NetworkApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- static String network = "55a677cf-ab3f-48ae-b880-fab90421980c";
- static URI networkHref = URI.create(endpoint + "/network/" + network);
-
- HttpRequest get = HttpRequest.builder()
- .method("GET")
- .endpoint(networkHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/network/network.xml", ORG + ";version=1.5"))
- .build();
-
- @Test
- public void testGetNetworkHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, get, getResponse);
- assertEquals(api.getNetworkApi().get(networkHref), network());
- }
-
- @Test
- public void testGetNetworkHrefInvalidId() {
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- get.toBuilder().endpoint(endpoint + "/network/NOTAUUID").build(),
- HttpResponse.builder()
- .statusCode(400)
- .payload(payloadFromResourceWithContentType("/network/error400.xml", ERROR + ";version=1.5"))
- .build());
-
- Error expected = Error.builder()
- .message("validation error : EntityRef has incorrect type, expected type is com.vmware.vcloud.entity.network.")
- .majorErrorCode(400)
- .minorErrorCode("BAD_REQUEST")
- .build();
-
- try {
- api.getNetworkApi().get(URI.create(endpoint + "/network/NOTAUUID"));
- fail("Should give HTTP 400 error");
- } catch (VCloudDirectorException vde) {
- assertEquals(vde.getError(), expected);
- } catch (Exception e) {
- fail("Should have thrown a VCloudDirectorException");
- }
- }
-
- @Test
- public void testGetNetworkHrefCatalogId() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- get.toBuilder().endpoint(endpoint + "/network/9e08c2f6-077a-42ce-bece-d5332e2ebb5c").build(),
- HttpResponse.builder()
- .statusCode(403)
- .payload(payloadFromResourceWithContentType("/network/error403-catalog.xml", ERROR + ";version=1.5"))
- .build());
-
- assertNull(api.getNetworkApi().get(URI.create(endpoint + "/network/9e08c2f6-077a-42ce-bece-d5332e2ebb5c")));
- }
-
- @Test
- public void testGetNetworkHrefFakeId() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- get.toBuilder().endpoint(endpoint + "/network/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee").build(),
- HttpResponse.builder()
- .statusCode(403)
- .payload(payloadFromResourceWithContentType("/network/error403-fake.xml", ERROR + ";version=1.5"))
- .build());
-
- assertNull(api.getNetworkApi().get(URI.create(endpoint + "/network/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")));
- }
-
- HttpRequest getMetadata = HttpRequest.builder()
- .method("GET")
- .endpoint(networkHref + "/metadata")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getMetadataResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/network/metadata.xml", METADATA))
- .build();
-
- @Test
- public void testGetNetworkMetadataHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getMetadata, getMetadataResponse);
- assertEquals(api.getMetadataApi(networkHref).get(), metadata());
- }
-
- static Metadata metadata() {
- return Metadata.builder()
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/network/" + network + "/metadata"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.network+xml")
- .href(networkHref)
- .build())
- .entries(ImmutableSet.of(metadataEntry()))
- .build();
- }
-
- private static MetadataEntry metadataEntry() {
- return MetadataEntry.builder().entry("key", "value").build();
- }
-
- HttpRequest getMetadataValue = HttpRequest.builder()
- .method("GET")
- .endpoint(networkHref + "/metadata/KEY")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getMetadataValueResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/network/metadataValue.xml", METADATA_VALUE))
- .build();
-
- @Test
- public void testGetNetworkMetadataEntryHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getMetadataValue, getMetadataValueResponse);
- assertEquals(api.getMetadataApi(networkHref).get("KEY"), "value");
- }
-
- public static OrgNetwork network() {
- return OrgNetwork.builder()
- .name("ilsolation01-Jclouds")
- .id("urn:vcloud:network:f3ba8256-6f48-4512-aad6-600e85b4dc38")
- .type("application/vnd.vmware.vcloud.orgNetwork+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.org+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38/metadata"))
- .build())
- .description("")
- .configuration(NetworkConfiguration.builder()
- .ipScope(IpScope.builder()
- .isInherited(false)
- .gateway("192.168.1.1")
- .netmask("255.255.255.0")
- .dns1("173.240.111.52")
- .dns2("173.240.111.53")
- .ipRanges(IpRanges.builder()
- .ipRange(IpRange.builder()
- .startAddress("192.168.1.100")
- .endAddress("192.168.1.199")
- .build())
- .build())
- .build())
- .fenceMode(FenceMode.ISOLATED)
- .retainNetInfoAcrossDeployments(false)
- .features(NetworkFeatures.builder()
- .service(DhcpService.builder()
- .enabled(false)
- .defaultLeaseTime(3600)
- .maxLeaseTime(7200)
- .ipRange(IpRange.builder()
- .startAddress("192.168.1.2")
- .endAddress("192.168.1.99")
- .build())
- .build())
- .build())
- .syslogServerSettings(SyslogServerSettings.builder().build())
- .build())
- .allowedExternalIpAddresses(IpAddresses.builder().build())
- .build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiLiveTest.java
deleted file mode 100644
index a37fe8f..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkApiLiveTest.java
+++ /dev/null
@@ -1,128 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_ATTRB_REQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REQUIRED_VALUE_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.URN_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkResource;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "NetworkApiLiveTest")
-public class NetworkApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String NETWORK = "network";
-
- /*
- * Convenience reference to API api.
- */
- protected NetworkApi networkApi;
-
- private boolean metadataSet = false;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- networkApi = context.getApi().getNetworkApi();
- }
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() {
- if (metadataSet) {
- try {
- Task remove = adminContext.getApi().getMetadataApi(context.resolveIdToAdminHref(networkId)).remove("key");
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error when deleting metadata");
- }
- }
- }
-
- @Test(description = "GET /network/{id}")
- public void testGetNetwork() {
- // required for testing
- assertNotNull(networkId, String.format(URN_REQ_LIVE, NETWORK));
-
- Network abstractNetwork = networkApi.get(context.resolveIdToHref(networkId));
- assertTrue(abstractNetwork instanceof OrgNetwork,
- String.format(REQUIRED_VALUE_OBJECT_FMT, ".class", NETWORK, abstractNetwork.getClass(), "OrgNetwork"));
- OrgNetwork network = Network.toSubType(abstractNetwork);
- assertNotNull(network, String.format(OBJ_REQ_LIVE, NETWORK));
- assertNotEquals("DO NOT USE", network.getDescription(), "Network isn't to be used for testing");
-
- Checks.checkOrgNetwork(network);
- }
-
- private void setupMetadata() {
- //TODO: block until complete
- adminContext.getApi().getMetadataApi(context.resolveIdToHref(networkId)).put("key", "value");
- metadataSet = true;
- }
-
- @Test(description = "GET /network/{id}/metadata", dependsOnMethods = { "testGetNetwork" })
- public void testGetMetadata() {
- if (adminContext != null) {
- setupMetadata();
- }
-
- Metadata metadata = context.getApi().getMetadataApi(context.resolveIdToHref(networkId)).get();
- // required for testing
- assertFalse(Iterables.isEmpty(metadata.getMetadataEntries()),
- String.format(OBJ_FIELD_REQ_LIVE, NETWORK, "metadata.entries"));
-
- // parent type
- checkResource(metadata);
-
- for (MetadataEntry entry : metadata.getMetadataEntries()) {
- // required elements and attributes
- assertNotNull(entry.getKey(),
- String.format(OBJ_FIELD_ATTRB_REQ, networkApi, "MetadataEntry", entry.getKey(), "key"));
- assertNotNull(entry.getValue(),
- String.format(OBJ_FIELD_ATTRB_REQ, networkApi, "MetadataEntry", entry.getValue(), "value"));
-
- // parent type
- checkResource(entry);
- }
- }
-
- @Test(description = "GET /network/{id}/metadata/{key}", dependsOnMethods = { "testGetMetadata" })
- public void testGetMetadataValue() {
- String metadataValue = context.getApi().getMetadataApi(context.resolveIdToHref(networkId)).get("key");
-
- assertEquals(metadataValue, "value", String.format(OBJ_FIELD_EQ, NETWORK, "metadataEntry.value", "value", metadataValue));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiExpectTest.java
deleted file mode 100644
index b72215d..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiExpectTest.java
+++ /dev/null
@@ -1,206 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA_VALUE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_LIST;
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgList;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "OrgApiExpectTest")
-public class OrgApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- @Test
- public void testGetOrgList() {
- HttpRequest list = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/org/")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse listResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/org/orglist.xml", ORG_LIST + ";version=1.5"))
- .build();
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, list, listResponse);
-
-
- OrgList expected = OrgList.builder()
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
-
- assertEquals(api.getOrgApi().list(), expected);
- }
-
- static String org = "6f312e42-cd2b-488d-a2bb-97519cd57ed0";
- static URI orgHref = URI.create(endpoint + "/org/" + org);
-
- HttpRequest get = HttpRequest.builder()
- .method("GET")
- .endpoint(orgHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/org/org.xml", ORG + ";version=1.5"))
- .build();
-
- @Test
- public void testGetOrgHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, get, getResponse);
- assertEquals(api.getOrgApi().get(orgHref), org());
- }
-
- HttpRequest getMetadata = HttpRequest.builder()
- .method("GET")
- .endpoint(orgHref + "/metadata")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getMetadataResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/org/orgMetadata.xml", METADATA))
- .build();
-
- @Test
- public void testGetOrgMetadataHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getMetadata, getMetadataResponse);
- assertEquals(api.getMetadataApi(orgHref).get(), metadata());
- }
-
- static Metadata metadata() {
- return Metadata.builder()
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/org/" + org + "/metadata"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.org+xml")
- .href(orgHref)
- .build())
- .entries(ImmutableSet.of(metadataEntry()))
- .build();
- }
-
- HttpRequest getMetadataValue = HttpRequest.builder()
- .method("GET")
- .endpoint(orgHref + "/metadata/KEY")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getMetadataValueResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/org/orgMetadataValue.xml", METADATA_VALUE))
- .build();
-
- @Test
- public void testGetOrgMetadataEntryHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getMetadataValue, getMetadataValueResponse);
- assertEquals(api.getMetadataApi(orgHref).get("KEY"), "VALUE");
- }
-
- public static Org org() {
- return Org.builder()
- .name("JClouds")
- .description("")
- .fullName("JClouds")
- .id("urn:vcloud:org:6f312e42-cd2b-488d-a2bb-97519cd57ed0")
- .type("application/vnd.vmware.vcloud.org+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .name("Cluster01-JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/vdc/d16d333b-e3c0-4176-845d-a5ee6392df07"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.tasksList+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/tasksList/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .name("Public")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.controlAccess+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c/controlAccess/"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.orgNetwork+xml")
- .name("ilsolation01-Jclouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.orgNetwork+xml")
- .name("internet01-Jclouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/network/55a677cf-ab3f-48ae-b880-fab90421980c"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata"))
- .build())
- .build();
- }
-
- public static MetadataEntry metadataEntry() {
- return MetadataEntry.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata/KEY"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata"))
- .build())
- .entry("KEY", "VALUE")
- .build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiLiveTest.java
deleted file mode 100644
index 4da8449..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgApiLiveTest.java
+++ /dev/null
@@ -1,166 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CONDITION_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CORRECT_VALUE_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_EMPTY_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOrg;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkReferenceType;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgList;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "OrgApiLiveTest")
-public class OrgApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- /*
- * Convenience references to API apis.
- */
-
- private OrgApi orgApi;
- private URI orgHref;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- orgApi = context.getApi().getOrgApi();
- orgHref = context.resolveIdToHref(orgId);
- }
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() throws Exception {
- if (adminMembersSet) {
- try {
- Task remove = adminContext.getApi().getMetadataApi(context.resolveIdToAdminHref(orgId)).remove("KEY");
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error when deleting metadata entry");
- }
- try {
- adminContext.getApi().getCatalogApi().remove(context.resolveIdToAdminHref(catalogId));
- } catch (Exception e) {
- logger.warn(e, "Error when deleting catalog'%s': %s", catalogId);
- }
- }
- }
-
- /*
- * Shared state between dependent tests.
- */
-
- private OrgList orgList;
- private boolean adminMembersSet = false; // track if test entities have been addd
-
- @Test(description = "GET /org")
- public void testGetOrgList() {
- // Call the method being tested
- orgList = orgApi.list();
-
- // NOTE The environment MUST have at least one organisation configured
-
- // Check test requirements
- assertFalse(Iterables.isEmpty(orgList), String.format(NOT_EMPTY_OBJECT_FMT, "Org", "OrgList"));
-
- for (Reference orgRef : orgList) {
- assertEquals(orgRef.getType(), VCloudDirectorMediaType.ORG,
- String.format(CONDITION_FMT, "Reference.Type", VCloudDirectorMediaType.ORG, orgRef.getType()));
- checkReferenceType(orgRef);
- }
- }
-
- @Test(description = "GET /org/{id}", dependsOnMethods = { "testGetOrgList" })
- public void testGetOrg() {
- Reference orgRef = Iterables.getFirst(orgList, null);
- assertNotNull(orgRef);
-
- // Call the method being tested
- org = orgApi.get(orgHref);
-
- assertEquals(orgApi.get(org.getHref()), org);
-
- checkOrg(org);
-
- if (adminContext != null) {
- setupAdminMembers();
- }
- }
-
- /**
- * If we're running in an admin context, it's cleaner to make temporary entities, plus eliminates
- * the need for configuration
- */
- private void setupAdminMembers() {
- URI orgAdminHref = context.resolveIdToAdminHref(orgId);
-
- //TODO: block until complete
- adminContext.getApi().getMetadataApi(orgAdminHref).put("KEY", "VALUE");
-
- AdminCatalog newCatalog = AdminCatalog.builder().name("Test Catalog " + getTestDateTimeStamp())
- .description("created by testOrg()").build();
- newCatalog = adminContext.getApi().getCatalogApi().addCatalogToOrg(newCatalog, orgAdminHref);
-
- catalogId = newCatalog.getId();
-
- adminMembersSet = true;
- }
-
- @Test(description = "GET /org/{id}/metadata", dependsOnMethods = { "testGetOrg" })
- public void testGetOrgMetadata() {
-
- // Call the method being tested
- Metadata metadata = context.getApi().getMetadataApi(orgHref).get();
-
- // NOTE The environment MUST have at one metadata entry for the first organisation configured
-
- checkMetadata(metadata);
-
- // Check requirements for this test
- assertFalse(Iterables.isEmpty(metadata.getMetadataEntries()),
- String.format(NOT_EMPTY_OBJECT_FMT, "MetadataEntry", "Org"));
- }
-
- @Test(description = "GET /org/{id}/metadata/{key}", dependsOnMethods = { "testGetOrgMetadata" })
- public void testGetOrgMetadataValue() {
- // Call the method being tested
- String value = context.getApi().getMetadataApi(orgHref).get("KEY");
-
- // NOTE The environment MUST have configured the metadata entry as '{ key="KEY", value="VALUE"
- // )'
-
- String expected = "VALUE";
-
- assertEquals(value, expected, String.format(CORRECT_VALUE_OBJECT_FMT, "Value", "MetadataValue", expected, value));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java
deleted file mode 100644
index 64d0e5e..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiExpectTest.java
+++ /dev/null
@@ -1,174 +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.vcloud.director.v1_5.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.CatalogReference;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultCatalogRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.Test;
-
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "QueryApiExpectTest")
-public class QueryApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- @Test
- public void testQueryAllCatalogs() {
- HttpRequest queryRequest = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/catalogs/query")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse queryResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/query/allCatalogs.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5"))
- .build();
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse);
-
- QueryResultRecords expected = QueryResultRecords.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=records"))
- .type("application/vnd.vmware.vcloud.query.records+xml")
- .name("catalog")
- .page(1)
- .pageSize(25)
- .total(3L)
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.references+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=references"))
- .build())
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.idrecords+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=idrecords"))
- .build())
- .record(QueryResultCatalogRecord.builder()
- .ownerName("qunying.huang@enstratus.com")
- .owner(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"))
- .orgName("JClouds")
- .numberOfVAppTemplates(0)
- .numberOfMedia(0)
- .name("QunyingTestCatalog")
- .shared()
- .notPublished()
- .creationDate(dateService.iso8601DateParse("2012-02-07T00:16:28.323-05:00"))
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .record(QueryResultCatalogRecord.builder()
- .ownerName("system")
- .owner(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/0ebf2453-5e95-48ab-b223-02671965ee91"))
- .orgName("Bluelock")
- .numberOfVAppTemplates(0)
- .numberOfMedia(0)
- .name("Public")
- .notShared()
- .published()
- .creationDate(dateService.iso8601DateParse("2011-09-28T13:45:44.207-04:00"))
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"))
- .build())
- .record(QueryResultCatalogRecord.builder()
- .ownerName("adk@cloudsoftcorp.com")
- .owner(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .orgName("JClouds")
- .numberOfVAppTemplates(0)
- .numberOfMedia(0)
- .name("test")
- .shared()
- .notPublished()
- .creationDate(dateService.iso8601DateParse("2012-02-09T12:32:17.723-05:00"))
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/b7289d54-4ca4-497f-9a93-2d4afc97e3da"))
- .build())
- .build();
-
- assertEquals(api.getQueryApi().catalogsQueryAll(), expected);
- }
-
- @Test
- public void testQueryAllCatalogReferences() {
- HttpRequest queryRequest = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/catalogs/query?format=references")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse queryResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/query/allCatalogReferences.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5"))
- .build();
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse);
-
- CatalogReferences expected = CatalogReferences.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=references"))
- .type("application/vnd.vmware.vcloud.query.references+xml")
- .name("catalog")
- .page(1)
- .pageSize(25)
- .total(4L)
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.records+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=records"))
- .build())
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.idrecords+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalogs/query?page=1&pageSize=25&format=idrecords"))
- .build())
- .reference(CatalogReference.builder()
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .name("QunyingTestCatalog")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .reference(CatalogReference.builder()
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .name("Public")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"))
- .build())
- .reference(CatalogReference.builder()
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .name("dantest")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/b542aff4-9f97-4f51-a126-4330fbf62f02"))
- .build())
- .reference(CatalogReference.builder()
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .name("test")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/catalog/b7289d54-4ca4-497f-9a93-2d4afc97e3da"))
- .build())
- .build();
-
- assertEquals(api.getQueryApi().catalogReferencesQueryAll(), expected);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiLiveTest.java
deleted file mode 100644
index 2fd7a97..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryApiLiveTest.java
+++ /dev/null
@@ -1,241 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_EMPTY_OBJECT_FMT;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultMediaRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultVAppRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultVAppTemplateRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultVMRecord;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "QueryApiLiveTest")
-public class QueryApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- /*
- * Convenience references to API apis.
- */
-
- private QueryApi queryApi;
- private VAppApi vAppApi;
-
- private VApp vApp;
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() throws Exception {
- if (vApp != null)
- cleanUpVApp(vApp);
- }
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- queryApi = context.getApi().getQueryApi();
- vAppApi = context.getApi().getVAppApi();
-
- cleanUpVAppTemplateInOrg();
- }
-
- @Test(description = "GET /query")
- public void testQuery() {
- VAppTemplate vAppTemplate = lazyGetVAppTemplate();
- QueryResultRecords queryResult = queryApi
- .query("vAppTemplate", String.format("name==%s", vAppTemplate.getName()));
- Set<URI> hrefs = toHrefs(queryResult);
-
- assertRecordTypes(queryResult, Arrays.asList(VCloudDirectorMediaType.VAPP_TEMPLATE, null),
- QueryResultVAppTemplateRecord.class);
- assertTrue(hrefs.contains(vAppTemplate.getHref()), "VAppTemplates query result should include vAppTemplate "
- + vAppTemplate.getHref() + "; but only has " + hrefs);
- }
-
- @Test(description = "GET /catalogs/query")
- public void testQueryAllCatalogs() {
- QueryResultRecords catalogRecords = queryApi.catalogsQueryAll();
- assertFalse(catalogRecords.getRecords().isEmpty(),
- String.format(NOT_EMPTY_OBJECT_FMT, "CatalogRecord", "QueryResultRecords"));
- }
-
- @Test(description = "GET /catalogs/query?format=references", dependsOnMethods = { "testQueryAllCatalogs" })
- public void testQueryAllCatalogReferences() {
- CatalogReferences catalogReferences = queryApi.catalogReferencesQueryAll();
- assertFalse(catalogReferences.getReferences().isEmpty(),
- String.format(NOT_EMPTY_OBJECT_FMT, "CatalogReference", "CatalogReferences"));
- }
-
- @Test(description = "GET /vAppTemplates/query")
- public void testQueryAllVAppTemplates() {
- QueryResultRecords queryResult = queryApi.vAppTemplatesQueryAll();
- Set<URI> hrefs = toHrefs(queryResult);
-
- assertRecordTypes(queryResult, Arrays.asList(VCloudDirectorMediaType.VAPP_TEMPLATE, null),
- QueryResultVAppTemplateRecord.class);
- assertTrue(hrefs.contains(lazyGetVAppTemplate().getHref()), "VAppTemplates query result should include vAppTemplate "
- + lazyGetVAppTemplate().getHref() + "; but only has " + hrefs);
- }
-
- @Test(description = "GET /vAppTemplates/query?filter")
- public void testQueryVAppTemplatesWithFilter() {
- VAppTemplate vAppTemplate = lazyGetVAppTemplate();
- QueryResultRecords queryResult = queryApi.vAppTemplatesQuery(String.format("name==%s", vAppTemplate.getName()));
- Set<URI> hrefs = toHrefs(queryResult);
-
- assertRecordTypes(queryResult, Arrays.asList(VCloudDirectorMediaType.VAPP_TEMPLATE, null),
- QueryResultVAppTemplateRecord.class);
- assertTrue(hrefs.contains(vAppTemplate.getHref()), "VAppTemplates query result should have found vAppTemplate "
- + vAppTemplate.getHref());
- }
-
- @Test(description = "GET /vApps/query")
- public void testQueryAllVApps() {
- vApp = instantiateVApp();
- QueryResultRecords queryResult = queryApi.vAppsQueryAll();
- Set<URI> hrefs = toHrefs(queryResult);
-
- assertRecordTypes(queryResult, Arrays.asList(VCloudDirectorMediaType.VAPP, null), QueryResultVAppRecord.class);
- assertTrue(hrefs.contains(vApp.getHref()), "VApp query result should include vapp " + vApp.getHref()
- + "; but only has " + hrefs);
- }
-
- @Test(description = "GET /vApps/query?filter", dependsOnMethods = { "testQueryAllVApps" })
- public void testQueryVAppsWithFilter() {
- QueryResultRecords queryResult = queryApi.vAppsQuery(String.format(
- "name==%s", vApp.getName()));
- Set<URI> hrefs = toHrefs(queryResult);
-
- assertRecordTypes(queryResult,
- Arrays.asList(VCloudDirectorMediaType.VAPP, null),
- QueryResultVAppRecord.class);
- String message = "VApps query result should have found vApp "
- + vApp.getHref();
- assertTrue(
- ImmutableSet.copyOf(hrefs).equals(
- ImmutableSet.of(vApp.getHref())), message);
- }
-
- @Test(description = "GET /vms/query", dependsOnMethods = { "testQueryAllVApps" })
- public void testQueryAllVms() {
- // Wait for vApp to have been entirely instantiated
- Task instantiateTask = Iterables.getFirst(vApp.getTasks(), null);
- if (instantiateTask != null) {
- assertTaskSucceedsLong(instantiateTask);
- }
-
- // Start the vApp so that it has VMs
- Task task = vAppApi.powerOn(vApp.getHref());
- assertTaskSucceedsLong(task);
-
- vApp = vAppApi.get(vApp.getHref()); // reload, so it has the VMs
- List<Vm> vms = vApp.getChildren().getVms();
- Set<URI> vmHrefs = toHrefs(vms);
-
- // Method under test: do the query
- QueryResultRecords queryResult = queryApi.vmsQueryAll();
- Set<URI> hrefs = toHrefs(queryResult);
-
- assertRecordTypes(queryResult, Arrays.asList(VCloudDirectorMediaType.VM, null), QueryResultVMRecord.class);
- assertTrue(hrefs.containsAll(vmHrefs), "VMs query result should include vms " + vmHrefs + "; but only has "
- + hrefs);
- }
-
- @Test(description = "GET /vms/query?filter", dependsOnMethods = { "testQueryAllVms" })
- public void testQueryAllVmsWithFilter() {
- List<Vm> vms = vApp.getChildren().getVms();
- Set<URI> vmHrefs = toHrefs(vms);
-
- QueryResultRecords queryResult = queryApi.vmsQuery(String.format(
- "containerName==%s", vApp.getName()));
- Set<URI> hrefs = toHrefs(queryResult);
-
- assertRecordTypes(queryResult,
- Arrays.asList(VCloudDirectorMediaType.VM, null),
- QueryResultVMRecord.class);
- String message = "VMs query result should equal vms of vApp "
- + vApp.getName() + " (" + vmHrefs + "); but only has " + hrefs;
- assertTrue(
- ImmutableSet.copyOf(hrefs).equals(ImmutableSet.copyOf(vmHrefs)),
- message);
- }
-
- @Test(description = "GET /mediaList/query")
- public void testQueryAllMedia() {
- QueryResultRecords queryResult = queryApi.mediaListQueryAll();
-
- assertRecordTypes(queryResult, Arrays.asList(VCloudDirectorMediaType.VAPP, null), QueryResultMediaRecord.class);
- }
-
- @Test(description = "GET /mediaList/query?filter")
- public void testQueryMediaWithFilter() {
- String mediaName = "abc";
- QueryResultRecords queryResult = queryApi.mediaListQuery(String.format("name==%s", mediaName));
-
- assertRecordTypes(queryResult, Arrays.asList(VCloudDirectorMediaType.VAPP, null), QueryResultMediaRecord.class);
- }
-
- private static void assertRecordTypes(QueryResultRecords queryResult, Collection<String> validTypes,
- Class<?> validClazz) {
- for (QueryResultRecord record : queryResult.getRecords()) {
- assertTrue(validTypes.contains(record.getType()), "invalid type for query result record, " + record.getType()
- + "; valid types are " + validTypes);
- assertEquals(record.getClass(), validClazz, "invalid type for query result record, " + record.getClass()
- + "; expected " + validClazz);
- }
- }
-
- private Set<URI> toHrefs(QueryResultRecords queryResult) {
- Set<URI> hrefs = Sets.newLinkedHashSet();
- for (QueryResultRecord record : queryResult.getRecords()) {
- hrefs.add(record.getHref());
- }
- return hrefs;
- }
-
- private Set<URI> toHrefs(Iterable<? extends Resource> resources) {
- Set<URI> hrefs = Sets.newLinkedHashSet();
- for (Resource resource : resources) {
- hrefs.add(resource.getHref());
- }
- return hrefs;
- }
-
-}
[32/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
JCLOUDS-780 Remove vcloud-director.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/775b89fd
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/775b89fd
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/775b89fd
Branch: refs/heads/master
Commit: 775b89fdb3472d8a2bc81097962e9a203c602c20
Parents: db7a37c
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Nov 16 21:39:15 2014 -0800
Committer: Adrian Cole <ad...@apache.org>
Committed: Mon Nov 17 08:20:46 2014 -0800
----------------------------------------------------------------------
pom.xml | 1 -
vcloud-director/pom.xml | 142 --
.../java/org/jclouds/dmtf/CIMPredicates.java | 53 -
.../java/org/jclouds/dmtf/DMTFConstants.java | 37 -
.../org/jclouds/dmtf/cim/CimAnySimpleType.java | 69 -
.../dmtf/cim/CimAnySimpleTypeAdapter.java | 36 -
.../java/org/jclouds/dmtf/cim/CimBoolean.java | 79 -
.../java/org/jclouds/dmtf/cim/CimReference.java | 95 --
.../java/org/jclouds/dmtf/cim/CimString.java | 94 --
.../org/jclouds/dmtf/cim/CimUnsignedInt.java | 79 -
.../org/jclouds/dmtf/cim/CimUnsignedLong.java | 88 --
.../org/jclouds/dmtf/cim/CimUnsignedShort.java | 95 --
.../main/java/org/jclouds/dmtf/cim/OSType.java | 198 ---
.../dmtf/cim/ResourceAllocationCaption.java | 28 -
.../cim/ResourceAllocationChangeableType.java | 28 -
.../dmtf/cim/ResourceAllocationSettingData.java | 902 -----------
.../jclouds/dmtf/cim/VirtualSystemCaption.java | 28 -
.../dmtf/cim/VirtualSystemChangeableType.java | 28 -
.../dmtf/cim/VirtualSystemSettingData.java | 719 ---------
.../HardwareBuilderFromResourceAllocations.java | 70 -
.../java/org/jclouds/dmtf/cim/package-info.java | 39 -
.../org/jclouds/dmtf/ovf/Configuration.java | 146 --
.../dmtf/ovf/DeploymentOptionSection.java | 121 --
.../main/java/org/jclouds/dmtf/ovf/Disk.java | 237 ---
.../java/org/jclouds/dmtf/ovf/DiskSection.java | 126 --
.../main/java/org/jclouds/dmtf/ovf/Item.java | 192 ---
.../main/java/org/jclouds/dmtf/ovf/MsgType.java | 141 --
.../main/java/org/jclouds/dmtf/ovf/Network.java | 111 --
.../org/jclouds/dmtf/ovf/NetworkSection.java | 123 --
.../dmtf/ovf/OperatingSystemSection.java | 155 --
.../org/jclouds/dmtf/ovf/ProductSection.java | 299 ----
.../dmtf/ovf/ProductSectionProperty.java | 34 -
.../java/org/jclouds/dmtf/ovf/Property.java | 301 ----
.../ovf/PropertyConfigurationValueType.java | 54 -
.../java/org/jclouds/dmtf/ovf/SectionType.java | 141 --
.../org/jclouds/dmtf/ovf/StartupSection.java | 123 --
.../jclouds/dmtf/ovf/StartupSectionItem.java | 62 -
.../dmtf/ovf/VirtualHardwareSection.java | 198 ---
.../dmtf/ovf/environment/EntityType.java | 91 --
.../dmtf/ovf/environment/EnvironmentType.java | 114 --
.../ovf/environment/PlatformSectionType.java | 140 --
.../jclouds/dmtf/ovf/environment/Property.java | 78 -
.../ovf/environment/PropertySectionType.java | 103 --
.../dmtf/ovf/environment/SectionType.java | 90 --
.../dmtf/ovf/environment/package-info.java | 37 -
.../jclouds/dmtf/ovf/internal/BaseEnvelope.java | 176 ---
.../dmtf/ovf/internal/BaseVirtualSystem.java | 170 --
.../jclouds/dmtf/ovf/internal/package-info.java | 35 -
.../java/org/jclouds/dmtf/ovf/package-info.java | 35 -
.../v1_5/VCloudDirectorApiMetadata.java | 90 --
.../director/v1_5/VCloudDirectorConstants.java | 43 -
.../director/v1_5/VCloudDirectorContext.java | 46 -
.../director/v1_5/VCloudDirectorException.java | 79 -
.../director/v1_5/VCloudDirectorMediaType.java | 228 ---
.../v1_5/admin/VCloudDirectorAdminApi.java | 87 -
.../vcloud/director/v1_5/annotations/Login.java | 34 -
.../director/v1_5/annotations/Session.java | 34 -
.../v1_5/binders/BindMapAsMetadata.java | 47 -
.../v1_5/binders/BindStringAsMetadataValue.java | 64 -
...rgAndPasswordAsBasicAuthorizationHeader.java | 55 -
.../director/v1_5/binders/package-info.java | 33 -
.../functions/FindLocationForResource.java | 66 -
.../functions/HardwareForVAppTemplate.java | 85 -
.../v1_5/compute/functions/HardwareForVm.java | 73 -
.../compute/functions/ImageForVAppTemplate.java | 84 -
...dHardwareBuilderFromResourceAllocations.java | 38 -
...EnvelopeOrThrowIllegalArgumentException.java | 79 -
.../compute/functions/VmToNodeMetadata.java | 93 --
.../util/VCloudDirectorComputeUtils.java | 144 --
.../config/VCloudDirectorHttpApiModule.java | 158 --
.../director/v1_5/domain/AbstractVApp.java | 227 ---
.../director/v1_5/domain/AccessSetting.java | 120 --
.../director/v1_5/domain/AdminCatalog.java | 63 -
.../vcloud/director/v1_5/domain/AdminVdc.java | 298 ----
.../director/v1_5/domain/Capabilities.java | 120 --
.../vcloud/director/v1_5/domain/Capacity.java | 163 --
.../director/v1_5/domain/CapacityWithUsage.java | 172 --
.../vcloud/director/v1_5/domain/Catalog.java | 176 ---
.../director/v1_5/domain/CatalogItem.java | 121 --
.../director/v1_5/domain/CatalogReference.java | 73 -
.../director/v1_5/domain/ComputeCapacity.java | 133 --
.../vcloud/director/v1_5/domain/Entity.java | 208 ---
.../vcloud/director/v1_5/domain/Error.java | 251 ---
.../vcloud/director/v1_5/domain/File.java | 173 --
.../vcloud/director/v1_5/domain/Group.java | 177 ---
.../vcloud/director/v1_5/domain/Link.java | 238 ---
.../vcloud/director/v1_5/domain/Media.java | 202 ---
.../vcloud/director/v1_5/domain/Metadata.java | 198 ---
.../director/v1_5/domain/MetadataEntry.java | 177 ---
.../vcloud/director/v1_5/domain/Owner.java | 108 --
.../v1_5/domain/ProductSectionList.java | 201 ---
.../vcloud/director/v1_5/domain/Property.java | 108 --
.../director/v1_5/domain/RasdItemsList.java | 197 ---
.../vcloud/director/v1_5/domain/Reference.java | 198 ---
.../vcloud/director/v1_5/domain/References.java | 132 --
.../vcloud/director/v1_5/domain/Resource.java | 199 ---
.../director/v1_5/domain/ResourceEntity.java | 224 ---
.../vcloud/director/v1_5/domain/Role.java | 69 -
.../director/v1_5/domain/RoleReference.java | 73 -
.../director/v1_5/domain/RoleReferences.java | 70 -
.../director/v1_5/domain/ScreenTicket.java | 106 --
.../vcloud/director/v1_5/domain/Session.java | 174 --
.../director/v1_5/domain/SessionWithToken.java | 117 --
.../vcloud/director/v1_5/domain/Task.java | 412 -----
.../vcloud/director/v1_5/domain/TasksList.java | 207 ---
.../vcloud/director/v1_5/domain/User.java | 591 -------
.../vcloud/director/v1_5/domain/VApp.java | 239 ---
.../director/v1_5/domain/VAppChildren.java | 137 --
.../director/v1_5/domain/VAppReference.java | 73 -
.../director/v1_5/domain/VAppTemplate.java | 310 ----
.../director/v1_5/domain/VMWareTools.java | 99 --
.../vcloud/director/v1_5/domain/Vdc.java | 358 -----
.../jclouds/vcloud/director/v1_5/domain/Vm.java | 172 --
.../director/v1_5/domain/VmPendingQuestion.java | 149 --
.../director/v1_5/domain/VmQuestionAnswer.java | 126 --
.../v1_5/domain/VmQuestionAnswerChoice.java | 126 --
.../director/v1_5/domain/dmtf/Envelope.java | 59 -
.../director/v1_5/domain/dmtf/RasdItem.java | 186 ---
.../v1_5/domain/dmtf/VirtualSystem.java | 145 --
.../director/v1_5/domain/dmtf/package-info.java | 33 -
.../v1_5/domain/network/DhcpService.java | 146 --
.../v1_5/domain/network/ExternalNetwork.java | 115 --
.../v1_5/domain/network/FirewallRule.java | 341 ----
.../domain/network/FirewallRuleProtocols.java | 163 --
.../v1_5/domain/network/FirewallService.java | 176 ---
.../v1_5/domain/network/IpAddresses.java | 105 --
.../director/v1_5/domain/network/IpRange.java | 119 --
.../director/v1_5/domain/network/IpRanges.java | 105 --
.../director/v1_5/domain/network/IpScope.java | 254 ---
.../v1_5/domain/network/IpsecVpnLocalPeer.java | 67 -
.../domain/network/IpsecVpnManagedPeer.java | 108 --
.../v1_5/domain/network/IpsecVpnPeer.java | 27 -
.../v1_5/domain/network/IpsecVpnRemotePeer.java | 178 ---
.../v1_5/domain/network/IpsecVpnService.java | 179 ---
.../domain/network/IpsecVpnThirdPartyPeer.java | 44 -
.../v1_5/domain/network/IpsecVpnTunnel.java | 365 -----
.../domain/network/IpsecVpnUnmanagedPeer.java | 25 -
.../domain/network/NatOneToOneBasicRule.java | 162 --
.../v1_5/domain/network/NatOneToOneVmRule.java | 185 ---
.../domain/network/NatPortForwardingRule.java | 209 ---
.../director/v1_5/domain/network/NatRule.java | 211 ---
.../v1_5/domain/network/NatService.java | 152 --
.../director/v1_5/domain/network/NatVmRule.java | 236 ---
.../director/v1_5/domain/network/Network.java | 136 --
.../v1_5/domain/network/NetworkAssignment.java | 133 --
.../domain/network/NetworkConfiguration.java | 237 ---
.../v1_5/domain/network/NetworkConnection.java | 342 ----
.../v1_5/domain/network/NetworkFeatures.java | 109 --
.../v1_5/domain/network/NetworkService.java | 96 --
.../v1_5/domain/network/RouterInfo.java | 96 --
.../v1_5/domain/network/SmtpServerSettings.java | 199 ---
.../v1_5/domain/network/StaticRoute.java | 183 ---
.../domain/network/StaticRoutingService.java | 124 --
.../domain/network/SyslogServerSettings.java | 117 --
.../v1_5/domain/network/VAppNetwork.java | 119 --
.../network/VAppNetworkConfiguration.java | 176 ---
.../v1_5/domain/network/package-info.java | 33 -
.../director/v1_5/domain/org/AdminOrg.java | 289 ----
.../v1_5/domain/org/CustomOrgLdapSettings.java | 576 -------
.../vcloud/director/v1_5/domain/org/Org.java | 133 --
.../v1_5/domain/org/OrgEmailSettings.java | 307 ----
.../v1_5/domain/org/OrgGeneralSettings.java | 234 ---
.../v1_5/domain/org/OrgLdapGroupAttributes.java | 261 ---
.../v1_5/domain/org/OrgLdapSettings.java | 230 ---
.../v1_5/domain/org/OrgLdapUserAttributes.java | 378 -----
.../v1_5/domain/org/OrgLeaseSettings.java | 178 ---
.../director/v1_5/domain/org/OrgList.java | 92 --
.../director/v1_5/domain/org/OrgNetwork.java | 133 --
.../domain/org/OrgPasswordPolicySettings.java | 163 --
.../director/v1_5/domain/org/OrgSettings.java | 268 ----
.../org/OrgVAppTemplateLeaseSettings.java | 150 --
.../director/v1_5/domain/org/package-info.java | 33 -
.../director/v1_5/domain/package-info.java | 33 -
.../v1_5/domain/params/CaptureVAppParams.java | 220 ---
.../v1_5/domain/params/CloneMediaParams.java | 145 --
.../v1_5/domain/params/CloneVAppParams.java | 66 -
.../domain/params/CloneVAppTemplateParams.java | 158 --
.../v1_5/domain/params/ComposeVAppParams.java | 184 ---
.../v1_5/domain/params/ControlAccessParams.java | 183 ---
.../v1_5/domain/params/DeployVAppParams.java | 180 ---
.../domain/params/InstantiateVAppParams.java | 207 ---
.../params/InstantiateVAppTemplateParams.java | 107 --
.../v1_5/domain/params/InstantiationParams.java | 166 --
.../domain/params/MediaInsertOrEjectParams.java | 100 --
.../director/v1_5/domain/params/ParamsType.java | 133 --
.../domain/params/PublishCatalogParams.java | 104 --
.../v1_5/domain/params/RecomposeVAppParams.java | 137 --
.../v1_5/domain/params/RelocateParams.java | 93 --
.../params/SourcedCompositionItemParam.java | 217 ---
.../v1_5/domain/params/UndeployVAppParams.java | 165 --
.../domain/params/UploadVAppTemplateParams.java | 136 --
.../v1_5/domain/params/VAppCreationParams.java | 201 ---
.../v1_5/domain/params/package-info.java | 33 -
.../v1_5/domain/query/CatalogReferences.java | 67 -
.../director/v1_5/domain/query/Container.java | 165 --
.../director/v1_5/domain/query/QueryList.java | 84 -
.../query/QueryResultAdminGroupRecord.java | 167 --
.../query/QueryResultAdminUserRecord.java | 314 ----
.../domain/query/QueryResultAdminVdcRecord.java | 545 -------
.../domain/query/QueryResultCatalogRecord.java | 307 ----
.../query/QueryResultDatastoreRecord.java | 507 ------
.../domain/query/QueryResultMediaRecord.java | 372 -----
.../domain/query/QueryResultNetworkRecord.java | 260 ---
.../v1_5/domain/query/QueryResultRecord.java | 217 ---
.../v1_5/domain/query/QueryResultRecords.java | 120 --
.../domain/query/QueryResultReferences.java | 120 --
.../domain/query/QueryResultRightRecord.java | 122 --
.../domain/query/QueryResultRoleRecord.java | 126 --
.../query/QueryResultStrandedUserRecord.java | 189 ---
.../domain/query/QueryResultVAppRecord.java | 332 ----
.../query/QueryResultVAppTemplateRecord.java | 357 -----
.../v1_5/domain/query/QueryResultVMRecord.java | 406 -----
.../v1_5/domain/query/VAppReferences.java | 67 -
.../v1_5/domain/query/package-info.java | 33 -
.../domain/section/CustomizationSection.java | 188 ---
.../section/GuestCustomizationSection.java | 553 -------
.../domain/section/LeaseSettingsSection.java | 260 ---
.../domain/section/NetworkConfigSection.java | 179 ---
.../section/NetworkConnectionSection.java | 224 ---
.../domain/section/OperatingSystemSection.java | 204 ---
.../v1_5/domain/section/RuntimeInfoSection.java | 135 --
.../domain/section/VirtualHardwareSection.java | 187 ---
.../v1_5/domain/section/package-info.java | 33 -
.../vcloud/director/v1_5/endpoints/Catalog.java | 31 -
.../vcloud/director/v1_5/endpoints/Network.java | 31 -
.../vcloud/director/v1_5/endpoints/Org.java | 31 -
.../vcloud/director/v1_5/endpoints/OrgList.java | 31 -
.../director/v1_5/endpoints/TasksList.java | 31 -
.../director/v1_5/endpoints/VCloudLogin.java | 31 -
.../vcloud/director/v1_5/endpoints/Vdc.java | 31 -
.../director/v1_5/features/CatalogApi.java | 79 -
.../vcloud/director/v1_5/features/MediaApi.java | 94 --
.../director/v1_5/features/MetadataApi.java | 90 --
.../director/v1_5/features/NetworkApi.java | 44 -
.../vcloud/director/v1_5/features/OrgApi.java | 52 -
.../vcloud/director/v1_5/features/QueryApi.java | 156 --
.../vcloud/director/v1_5/features/TaskApi.java | 67 -
.../director/v1_5/features/UploadApi.java | 32 -
.../vcloud/director/v1_5/features/VAppApi.java | 339 ----
.../director/v1_5/features/VAppTemplateApi.java | 171 --
.../vcloud/director/v1_5/features/VdcApi.java | 155 --
.../vcloud/director/v1_5/features/VmApi.java | 404 -----
.../v1_5/features/admin/AdminCatalogApi.java | 128 --
.../v1_5/features/admin/AdminNetworkApi.java | 76 -
.../v1_5/features/admin/AdminOrgApi.java | 159 --
.../v1_5/features/admin/AdminQueryApi.java | 143 --
.../v1_5/features/admin/AdminVdcApi.java | 92 --
.../director/v1_5/features/admin/GroupApi.java | 69 -
.../director/v1_5/features/admin/UserApi.java | 84 -
...ddVCloudAuthorizationAndCookieToRequest.java | 51 -
.../director/v1_5/functions/IdToAdminHref.java | 63 -
.../director/v1_5/functions/IdToHref.java | 51 -
.../v1_5/functions/RegexValueParser.java | 52 -
.../v1_5/functions/ReturnPayloadBytes.java | 40 -
.../director/v1_5/functions/SectionForVApp.java | 42 -
.../v1_5/functions/SectionForVAppTemplate.java | 47 -
...ateSessionAndRetryOn401AndLogoutOnClose.java | 87 -
.../handlers/VCloudDirectorErrorHandler.java | 74 -
.../internal/VCloudDirectorContextImpl.java | 71 -
.../loaders/LoginUserInOrgWithPassword.java | 55 -
.../director/v1_5/loaders/ResolveEntity.java | 47 -
.../vcloud/director/v1_5/login/SessionApi.java | 58 -
.../SessionWithTokenFromXMLAndHeader.java | 48 -
.../v1_5/predicates/EntityPredicates.java | 174 --
.../v1_5/predicates/LinkPredicates.java | 102 --
.../v1_5/predicates/ReferencePredicates.java | 151 --
.../v1_5/predicates/TaskStatusEquals.java | 85 -
.../director/v1_5/predicates/TaskSuccess.java | 72 -
.../director/v1_5/user/VCloudDirectorApi.java | 143 --
.../services/org.jclouds.apis.ApiMetadata | 1 -
.../testng/FormatApiResultsListener.java | 99 --
.../director/v1_5/AbstractVAppApiLiveTest.java | 415 -----
.../v1_5/VCloudDirectorApiExpectTest.java | 37 -
.../VCloudDirectorApiExperimentLiveTest.java | 43 -
.../v1_5/VCloudDirectorApiLiveTest.java | 47 -
.../v1_5/VCloudDirectorApiMetadataTest.java | 33 -
.../v1_5/VCloudDirectorLiveTestConstants.java | 106 --
.../v1_5/binders/BindMapAsMetadataTest.java | 54 -
.../binders/BindStringAsMetadataValueTest.java | 49 -
.../vcloud/director/v1_5/domain/Checks.java | 1493 ------------------
.../v1_5/features/CatalogApiExpectTest.java | 535 -------
.../v1_5/features/CatalogApiLiveTest.java | 259 ---
.../v1_5/features/KeyPairsApiLiveTest.java | 210 ---
.../v1_5/features/MediaApiExpectTest.java | 723 ---------
.../v1_5/features/MediaApiLiveTest.java | 351 ----
.../v1_5/features/MetadataApiExpectTest.java | 159 --
.../v1_5/features/NetworkApiExpectTest.java | 230 ---
.../v1_5/features/NetworkApiLiveTest.java | 128 --
.../v1_5/features/OrgApiExpectTest.java | 206 ---
.../director/v1_5/features/OrgApiLiveTest.java | 166 --
.../v1_5/features/QueryApiExpectTest.java | 174 --
.../v1_5/features/QueryApiLiveTest.java | 241 ---
.../v1_5/features/TaskApiExpectTest.java | 192 ---
.../director/v1_5/features/TaskApiLiveTest.java | 128 --
.../v1_5/features/UploadApiLiveTest.java | 42 -
.../v1_5/features/VAppApiExpectTest.java | 1012 ------------
.../director/v1_5/features/VAppApiLiveTest.java | 861 ----------
.../v1_5/features/VAppNetworksLiveTest.java | 330 ----
.../features/VAppTemplateApiExpectTest.java | 317 ----
.../v1_5/features/VAppTemplateApiLiveTest.java | 332 ----
.../v1_5/features/VdcApiExpectTest.java | 575 -------
.../director/v1_5/features/VdcApiLiveTest.java | 329 ----
.../director/v1_5/features/VmApiExpectTest.java | 1303 ---------------
.../director/v1_5/features/VmApiLiveTest.java | 947 -----------
.../admin/AdminCatalogApiExpectTest.java | 378 -----
.../features/admin/AdminCatalogApiLiveTest.java | 221 ---
.../admin/AdminNetworkApiExpectTest.java | 232 ---
.../features/admin/AdminNetworkApiLiveTest.java | 209 ---
.../features/admin/AdminOrgApiExpectTest.java | 610 -------
.../features/admin/AdminOrgApiLiveTest.java | 345 ----
.../features/admin/AdminQueryApiExpectTest.java | 133 --
.../features/admin/AdminQueryApiLiveTest.java | 130 --
.../features/admin/AdminVdcApiExpectTest.java | 60 -
.../features/admin/AdminVdcApiLiveTest.java | 205 ---
.../v1_5/features/admin/GroupApiExpectTest.java | 94 --
.../v1_5/features/admin/GroupApiLiveTest.java | 132 --
.../v1_5/features/admin/UserApiExpectTest.java | 225 ---
.../v1_5/features/admin/UserApiLiveTest.java | 215 ---
.../SystemAdminVAppApiExpectTest.java | 517 ------
.../systemadmin/SystemAdminVAppApiLiveTest.java | 109 --
.../systemadmin/SystemAdminVmApiExpectTest.java | 515 ------
.../systemadmin/SystemAdminVmApiLiveTest.java | 125 --
...essionAndRetryOn401AndLogoutOnCloseTest.java | 85 -
.../VCloudDirectorErrorHandlerTest.java | 96 --
.../internal/BaseVCloudDirectorApiLiveTest.java | 741 ---------
.../internal/BaseVCloudDirectorExpectTest.java | 176 ---
.../VCloudDirectorAdminApiExpectTest.java | 47 -
.../v1_5/login/SessionApiExpectTest.java | 125 --
.../director/v1_5/login/SessionApiLiveTest.java | 103 --
.../v1_5/predicates/LinkPredicatesTest.java | 58 -
.../predicates/ReferencePredicatesTest.java | 74 -
.../test/resources/catalog/adddCatalogItem.xml | 9 -
.../test/resources/catalog/admin/addCatalog.xml | 21 -
.../catalog/admin/addCatalogSource.xml | 4 -
.../test/resources/catalog/admin/catalog.xml | 21 -
.../resources/catalog/admin/editCatalog.xml | 21 -
.../catalog/admin/editCatalogSource.xml | 21 -
.../resources/catalog/admin/editOwnerSource.xml | 4 -
.../src/test/resources/catalog/admin/owner.xml | 6 -
.../catalog/admin/publishCatalogParams.xml | 4 -
.../src/test/resources/catalog/catalog.xml | 12 -
.../src/test/resources/catalog/catalogItem.xml | 9 -
.../resources/catalog/catalogItemMetadata.xml | 9 -
.../catalog/catalogItemMetadataValue.xml | 5 -
.../test/resources/catalog/catalogMetadata.xml | 9 -
.../resources/catalog/catalogMetadataValue.xml | 5 -
.../test/resources/catalog/editCatalogItem.xml | 9 -
.../catalog/mergeCatalogItemMetadata.xml | 7 -
.../resources/catalog/mergeMetadataTask.xml | 7 -
.../test/resources/catalog/newCatalogItem.xml | 5 -
.../catalog/removeMetadataEntryTask.xml | 7 -
.../catalog/setCatalogItemMetadataValue.xml | 4 -
.../resources/catalog/setMetadataValueTask.xml | 7 -
.../src/test/resources/group/editGroup.xml | 0
.../test/resources/group/editGroupSource.xml | 0
.../src/test/resources/group/group.xml | 0
vcloud-director/src/test/resources/logback.xml | 84 -
.../src/test/resources/media/addMedia.xml | 14 -
.../src/test/resources/media/addMediaSource.xml | 4 -
.../src/test/resources/media/cloneMedia.xml | 17 -
.../test/resources/media/cloneMediaParams.xml | 6 -
.../src/test/resources/media/editMedia.xml | 13 -
.../src/test/resources/media/editMediaTask.xml | 7 -
.../src/test/resources/media/error400.xml | 2 -
.../test/resources/media/error403-catalog.xml | 2 -
.../src/test/resources/media/error403-fake.xml | 2 -
.../src/test/resources/media/media.xml | 13 -
.../src/test/resources/media/mergeMetadata.xml | 12 -
.../test/resources/media/mergeMetadataTask.xml | 7 -
.../src/test/resources/media/metadata.xml | 12 -
.../src/test/resources/media/metadataValue.xml | 7 -
.../src/test/resources/media/owner.xml | 5 -
.../test/resources/media/removeMediaTask.xml | 7 -
.../resources/media/removeMetadataEntryTask.xml | 7 -
.../test/resources/media/setMetadataValue.xml | 4 -
.../resources/media/setMetadataValueTask.xml | 7 -
.../src/test/resources/media/test.iso | 0
.../network/admin/editNetworkSource.xml | 36 -
.../resources/network/admin/editNetworkTask.xml | 7 -
.../test/resources/network/admin/orgNetwork.xml | 40 -
.../network/admin/resetNetworkTask.xml | 7 -
.../src/test/resources/network/error400.xml | 2 -
.../test/resources/network/error403-catalog.xml | 2 -
.../test/resources/network/error403-fake.xml | 2 -
.../src/test/resources/network/metadata.xml | 8 -
.../test/resources/network/metadataValue.xml | 5 -
.../src/test/resources/network/network.xml | 36 -
.../resources/org/admin/editEmailSettings.xml | 14 -
.../org/admin/editEmailSettingsSource.xml | 14 -
.../resources/org/admin/editPasswordPolicy.xml | 7 -
.../org/admin/editPasswordPolicySource.xml | 7 -
.../org/admin/editVAppLeaseSettings.xml | 0
.../org/admin/editVAppLeaseSettingsSource.xml | 0
.../test/resources/org/admin/emailSettings.xml | 14 -
.../test/resources/org/admin/ldapSettings.xml | 4 -
.../src/test/resources/org/admin/org.xml | 86 -
.../test/resources/org/admin/passwordPolicy.xml | 7 -
.../resources/org/admin/vAppLeaseSettings.xml | 0
.../src/test/resources/org/error400.xml | 2 -
.../src/test/resources/org/error403-catalog.xml | 2 -
.../src/test/resources/org/error403-fake.xml | 2 -
vcloud-director/src/test/resources/org/org.xml | 12 -
.../src/test/resources/org/orgMetadata.xml | 9 -
.../src/test/resources/org/orgMetadataValue.xml | 5 -
.../src/test/resources/org/orglist.xml | 4 -
.../test/resources/query/admin/allGroups.xml | 5 -
.../src/test/resources/query/admin/allRoles.xml | 6 -
.../resources/query/allCatalogReferences.xml | 9 -
.../src/test/resources/query/allCatalogs.xml | 8 -
.../src/test/resources/query/queryList.xml | 58 -
vcloud-director/src/test/resources/session.xml | 7 -
.../src/test/resources/task/error400.xml | 2 -
.../src/test/resources/task/error403.xml | 2 -
.../src/test/resources/task/task.xml | 6 -
.../src/test/resources/task/tasksList.xml | 51 -
.../src/test/resources/user/addUser.xml | 21 -
.../src/test/resources/user/addUserSource.xml | 16 -
.../src/test/resources/user/editUser.xml | 21 -
.../src/test/resources/user/editUserSource.xml | 23 -
.../src/test/resources/user/user.xml | 22 -
.../src/test/resources/vapp/vApp.xml | 348 ----
.../src/test/resources/vapp/vAppRebootTask.xml | 15 -
.../vapptemplate/customizationSection.xml | 11 -
.../test/resources/vapptemplate/error400.xml | 5 -
.../test/resources/vapptemplate/error403.xml | 4 -
.../vapptemplate/guestCustomizationSection.xml | 19 -
.../vapptemplate/leaseSettingsSection.xml | 8 -
.../test/resources/vapptemplate/metadata.xml | 8 -
.../resources/vapptemplate/metadataValue.xml | 3 -
.../vapptemplate/networkConfigSection.xml | 64 -
.../resources/vapptemplate/relocateParams.xml | 6 -
.../resources/vapptemplate/vAppTemplate.xml | 33 -
.../src/test/resources/vdc/admin/vdc.xml | 0
.../src/test/resources/vdc/error400.xml | 2 -
.../src/test/resources/vdc/error403-fake.xml | 2 -
.../src/test/resources/vdc/instantiateVApp.xml | 22 -
.../resources/vdc/instantiateVAppTemplate.xml | 23 -
.../src/test/resources/vdc/metadata.xml | 8 -
vcloud-director/src/test/resources/vdc/vdc.xml | 59 -
vcloud-director/src/test/resources/vm/vm.xml | 241 ---
.../src/test/resources/vm/vmRebootTask.xml | 9 -
441 files changed, 60064 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bc521f8..5035366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,6 @@
<modules>
<module>azurecompute</module>
<module>docker</module>
- <module>vcloud-director</module>
<module>cdmi</module>
<module>cloudsigma2</module>
<module>cloudsigma2-hnl</module>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/pom.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/pom.xml b/vcloud-director/pom.xml
deleted file mode 100644
index f84723d..0000000
--- a/vcloud-director/pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>jclouds-labs</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.api -->
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>vcloud-director</artifactId>
- <name>jclouds vcloud-director api</name>
- <description>jclouds components to access an implementation of VMware vCloud Director 1.5+</description>
- <packaging>bundle</packaging>
-
- <properties>
- <test.vcloud-director.endpoint>https://vcloudbeta.bluelock.com/api</test.vcloud-director.endpoint>
- <test.vcloud-director.api-version>1.5</test.vcloud-director.api-version>
- <test.vcloud-director.build-version>1.5.0.464915</test.vcloud-director.build-version>
- <test.vcloud-director.identity>FIXME_USERNAME_WHICH_MIGHT_BE_EMAIL@JClouds</test.vcloud-director.identity>
- <test.vcloud-director.credential>FIXME_PASSWORD</test.vcloud-director.credential>
- <test.vcloud-director.template />
- <!-- URN format: ex. urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
- <test.vcloud-director.catalog-id />
- <!-- URN format: ex. urn:vcloud:media:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
- <test.vcloud-director.media-id />
- <!-- URN format: ex. urn:vcloud:vapptemplate:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
- <test.vcloud-director.vapptemplate-id />
- <!-- URN format: ex. urn:vcloud:network:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
- <test.vcloud-director.network-id />
- <!-- URN format: ex. urn:vcloud:vdc:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
- <test.vcloud-director.vdc-id />
- <!-- URN format: ex. urn:vcloud:user:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
- <test.vcloud-director.user-id />
-
- <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}",org.jclouds.dmtf*;version="${jclouds.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.jamesmurty.utils</groupId>
- <artifactId>java-xmlbuilder</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.vcloud-director.endpoint>${test.vcloud-director.endpoint}</test.vcloud-director.endpoint>
- <test.vcloud-director.api-version>${test.vcloud-director.api-version}</test.vcloud-director.api-version>
- <test.vcloud-director.build-version>${test.vcloud-director.build-version}</test.vcloud-director.build-version>
- <test.vcloud-director.identity>${test.vcloud-director.identity}</test.vcloud-director.identity>
- <test.vcloud-director.credential>${test.vcloud-director.credential}</test.vcloud-director.credential>
- <test.vcloud-director.template>${test.vcloud-director.template}</test.vcloud-director.template>
- <test.vcloud-director.catalog-id>${test.vcloud-director.catalog-id}</test.vcloud-director.catalog-id>
- <test.vcloud-director.media-id>${test.vcloud-director.media-id}</test.vcloud-director.media-id>
- <test.vcloud-director.vapptemplate-id>${test.vcloud-director.vapptemplate-id}</test.vcloud-director.vapptemplate-id>
- <test.vcloud-director.network-id>${test.vcloud-director.network-id}</test.vcloud-director.network-id>
- <test.vcloud-director.vdc-id>${test.vcloud-director.vdc-id}</test.vcloud-director.vdc-id>
- <test.vcloud-director.user-id>${test.vcloud-director.user-id}</test.vcloud-director.user-id>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java b/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java
deleted file mode 100644
index 8fc0671..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java
+++ /dev/null
@@ -1,53 +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.dmtf;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData.ResourceType;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-
-public class CIMPredicates {
-
- /**
- * Return resource allocations of the specific type.
- *
- * @param type
- * type to match the items
- * @return predicate
- */
- public static Predicate<ResourceAllocationSettingData> resourceTypeIn(final ResourceType... types) {
- checkNotNull(types, "resourceTypes");
- final Set<ResourceType> resourceTypes = ImmutableSet.copyOf(types);
- return new Predicate<ResourceAllocationSettingData>() {
- @Override
- public boolean apply(ResourceAllocationSettingData in) {
- return resourceTypes.contains(in.getResourceType());
- }
-
- @Override
- public String toString() {
- return "resourceTypeIn(" + resourceTypes + ")";
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java b/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java
deleted file mode 100644
index 47eced7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java
+++ /dev/null
@@ -1,37 +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.dmtf;
-
-/**
- * Constants used by DMTF.
- */
-public final class DMTFConstants {
-
- public static final String OVF_NS = "http://schemas.dmtf.org/ovf/envelope/1";
-
- public static final String OVF_ENV_NS = "http://schemas.dmtf.org/ovf/environment/1";
-
- public static final String CIM_NS = "http://schemas.dmtf.org/wbem/wscim/1/common";
-
- public static final String CIM_VSSD_NS = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData";
-
- public static final String CIM_RASD_NS = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData";
-
- private DMTFConstants() {
- throw new AssertionError("intentionally unimplemented");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
deleted file mode 100644
index 80c0459..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
+++ /dev/null
@@ -1,69 +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.dmtf.cim;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * <p>Java class for cimAnySimpleType complex type.
- *
- * <pre>
- * <complexType name="cimAnySimpleType" />
- * </pre>
- */
-@XmlType(name = "cimAnySimpleType", namespace = CIM_NS)
-public class CimAnySimpleType {
-
- @XmlValue
- @XmlJavaTypeAdapter(CimAnySimpleTypeAdapter.class)
- @XmlSchemaType(name = "anySimpleType")
- protected String value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
deleted file mode 100644
index b788df9..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
+++ /dev/null
@@ -1,36 +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.dmtf.cim;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class CimAnySimpleTypeAdapter extends XmlAdapter<String, String> {
-
- @Override
- public String unmarshal(String value) {
- return javax.xml.bind.DatatypeConverter.parseAnySimpleType(value);
- }
-
- @Override
- public String marshal(String value) {
- if (value == null) {
- return null;
- }
- return javax.xml.bind.DatatypeConverter.printAnySimpleType(value);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
deleted file mode 100644
index 61d7211..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
+++ /dev/null
@@ -1,79 +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.dmtf.cim;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimBoolean complex type.
- *
- * <pre>
- * <complexType name="cimBoolean" />
- * </pre>
- */
-@XmlType(name = "cimBoolean", namespace = CIM_NS)
-public class CimBoolean {
-
- @XmlValue
- protected boolean value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the value property.
- *
- */
- public boolean isValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- */
- public void setValue(boolean value) {
- this.value = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java
deleted file mode 100644
index 517e35b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java
+++ /dev/null
@@ -1,95 +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.dmtf.cim;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimReference complex type.
- *
- * <pre>
- * <complexType name="cimReference" />
- * </pre>
- */
-@XmlType(name = "cimReference", namespace = CIM_NS)
-public class CimReference {
-
- @XmlAnyElement(lax = true)
- protected List<Object> any;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the any property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the any property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAny().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Object }
- * {@link Element }
- *
- *
- */
- public List<Object> getAny() {
- if (any == null) {
- any = Lists.newArrayList();
- }
- return this.any;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
deleted file mode 100644
index 676dc22..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
+++ /dev/null
@@ -1,94 +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.dmtf.cim;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimString complex type.
- *
- * <pre>
- * <complexType name="cimString" />
- * </pre>
- */
-@XmlType(name = "cimString")
-public class CimString {
-
- public CimString() {
- // JAXB
- }
-
- public CimString(String value) {
- this.value = value;
- }
-
- @XmlValue
- protected String value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(value);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- CimString that = CimString.class.cast(obj);
- return equal(this.value, that.value);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("value", value).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
deleted file mode 100644
index 2fd5406..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
+++ /dev/null
@@ -1,79 +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.dmtf.cim;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimUnsignedInt complex type.
- *
- * <pre>
- * <complexType name="cimUnsignedInt" />
- * </pre>
- */
-@XmlType(name = "cimUnsignedInt", namespace = "http://schemas.dmtf.org/wbem/wscim/1/common")
-public class CimUnsignedInt {
-
- @XmlValue
- @XmlSchemaType(name = "unsignedInt")
- protected long value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the value property.
- *
- */
- public long getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- */
- public void setValue(long value) {
- this.value = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
deleted file mode 100644
index cbf7b3e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
+++ /dev/null
@@ -1,88 +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.dmtf.cim;
-
-import java.math.BigInteger;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimUnsignedLong complex type.
- *
- * <pre>
- * <complexType name="cimUnsignedLong" />
- * </pre>
- */
-@XmlType(name = "cimUnsignedLong", namespace = "http://schemas.dmtf.org/wbem/wscim/1/common")
-public class CimUnsignedLong {
-
- @XmlValue
- @XmlSchemaType(name = "unsignedLong")
- protected BigInteger value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link BigInteger }
- *
- */
- public BigInteger getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link BigInteger }
- *
- */
- public void setValue(BigInteger value) {
- this.value = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
deleted file mode 100644
index 5f888e5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
+++ /dev/null
@@ -1,95 +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.
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2012.02.08 at 02:47:44 PM GMT
-//
-
-
-package org.jclouds.dmtf.cim;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * <p>Java class for cimUnsignedShort complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="cimUnsignedShort">
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>unsignedShort">
- * <anyAttribute processContents='lax'/>
- * </extension>
- * </simpleContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "cimUnsignedShort", namespace = "http://schemas.dmtf.org/wbem/wscim/1/common")
-public class CimUnsignedShort {
-
- @XmlValue
- @XmlSchemaType(name = "unsignedShort")
- protected int value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the value property.
- *
- */
- public int getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- */
- public void setValue(int value) {
- this.value = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- *
- * <p>
- * the map is keyed by the name of the attribute and
- * the value is the string value of the attribute.
- *
- * the map returned by this method is live, and you can add new attribute
- * by updating the map directly. Because of this design, there's no setter.
- *
- *
- * @return
- * always non-null
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java
deleted file mode 100644
index 004c7d1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java
+++ /dev/null
@@ -1,198 +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.dmtf.cim;
-
-import org.jclouds.compute.domain.OsFamily;
-
-/**
- * Operating system based on DMTF CIM model.
- *
- * @see <a
- * href="http://dmtf.org/sites/default/files/cim/cim_schema_v2280/cim_schema_2.28.0Final-Doc.zip"
- * />
- */
-public enum OSType {
-
- /** Other */
- OTHER(1, "Other", OsFamily.UNRECOGNIZED, false),
-
- /** MACOS */
- MACOS(2, "MACOS", OsFamily.DARWIN, false),
-
- /** Solaris */
- SOLARIS(29, "Solaris", OsFamily.SOLARIS, false),
-
- /** LINUX */
- LINUX(36, "LINUX", OsFamily.LINUX, false),
-
- /** FreeBSD */
- FREEBSD(42, "FreeBSD", OsFamily.FREEBSD, false),
-
- /** NetBSD */
- NETBSD(43, "NetBSD", OsFamily.NETBSD, false),
-
- /** OpenBSD */
- OPENBSD(65, "OpenBSD", OsFamily.OPENBSD, false),
-
- /** Not Applicable */
- NOT_APPLICABLE(66, "Not Applicable", OsFamily.UNRECOGNIZED, false),
-
- /** Microsoft Windows Server 2003 */
- WINDOWS_SERVER_2003(69, "Microsoft Windows Server 2003", OsFamily.WINDOWS, false),
-
- /** Microsoft Windows Server 2003 64-Bit */
- WINDOWS_SERVER_2003_64(70, "Microsoft Windows Server 2003 64-Bit", OsFamily.WINDOWS, true),
-
- /** Microsoft Windows Server 2008 */
- WINDOWS_SERVER_2008(76, "Microsoft Windows Server 2008", OsFamily.WINDOWS, false),
-
- /** Microsoft Windows Server 2008 64-Bit */
- WINDOWS_SERVER_2008_64(77, "Microsoft Windows Server 2008 64-Bit", OsFamily.WINDOWS, true),
-
- /** FreeBSD 64-Bit */
- FREEBSD_64(78, "FreeBSD 64-Bit", OsFamily.FREEBSD, true),
-
- /** RedHat Enterprise Linux */
- RHEL(79, "RedHat Enterprise Linux", OsFamily.RHEL, false),
-
- /** RedHat Enterprise Linux 64-Bit */
- RHEL_64(80, "RedHat Enterprise Linux 64-Bit", OsFamily.RHEL, true),
-
- /** Solaris 64-Bit */
- SOLARIS_64(81, "Solaris 64-Bit", OsFamily.SOLARIS, true),
-
- /** SUSE */
- SUSE(82, "SUSE", OsFamily.SUSE, false),
-
- /** SUSE 64-Bit */
- SUSE_64(83, "SUSE 64-Bit", OsFamily.SUSE, true),
-
- /** SLES */
- SLES(84, "SLES", OsFamily.SUSE, false),
-
- /** SLES 64-Bit */
- SLES_64(85, "SLES 64-Bit", OsFamily.SUSE, true),
-
- /** Novell OES */
- NOVELL_OES(86, "Novell OES", OsFamily.SUSE, true),
-
- /** Mandriva */
- MANDRIVA(89, "Mandriva", OsFamily.MANDRIVA, false),
-
- /** Mandriva 64-Bit */
- MANDRIVA_64(90, "Mandriva 64-Bit", OsFamily.MANDRIVA, true),
-
- /** TurboLinux */
- TURBOLINUX(91, "TurboLinux", OsFamily.TURBOLINUX, false),
-
- /** TurboLinux 64-Bit */
- TURBOLINUX_64(92, "TurboLinux 64-Bit", OsFamily.TURBOLINUX, true),
-
- /** Ubuntu */
- UBUNTU(93, "Ubuntu", OsFamily.UBUNTU, false),
-
- /** Ubuntu 64-Bit */
- UBUNTU_64(94, "Ubuntu 64-Bit", OsFamily.UBUNTU, true),
-
- /** Debian */
- DEBIAN(95, "Debian", OsFamily.DEBIAN, false),
-
- /** Debian 64-Bit */
- DEBIAN_64(96, "Debian 64-Bit", OsFamily.DEBIAN, false),
-
- /** Linux 2.4.x */
- LINUX_2_4(97, "Linux 2.4.x", OsFamily.LINUX, false),
-
- /** Linux 2.4.x 64-Bi */
- LINUX_2_4_64(98, "Linux 2.4.x 64-Bit", OsFamily.LINUX, true),
-
- /** Linux 2.6.x */
- LINUX_2_6(99, "Linux 2.6.x", OsFamily.LINUX, false),
-
- /** Linux 2.6.x 64-Bit */
- LINUX_2_6_64(100, "Linux 2.6.x 64-Bit", OsFamily.LINUX, true),
-
- /** Linux 64-Bit */
- LINUX_64(101, "Linux 64-Bit", OsFamily.LINUX, true),
-
- /** Other 64-Bit */
- OTHER_64(102, "Other 64-Bit", OsFamily.UNRECOGNIZED, true),
-
- /** Microsoft Windows Server 2008 R2 */
- WINDOWS_SERVER_2008_R2(103, "Microsoft Windows Server 2008 R2", OsFamily.WINDOWS, true),
-
- /** VMware ESXi */
- ESXI(104, "VMware ESXi", OsFamily.ESX, true),
-
- /** Microsoft Windows 7 */
- WINDOWS_7(105, "Microsoft Windows 7", OsFamily.WINDOWS, false),
-
- /** CentOS 32-bit */
- CENTOS(106, "CentOS 32-bit", OsFamily.CENTOS, false),
-
- /** CentOS 64-bit */
- CENTOS_64(107, "CentOS 64-bit", OsFamily.CENTOS, true),
-
- /** Oracle Enterprise Linux 32-bit */
- ORACLE_ENTERPRISE_LINUX(108, "Oracle Enterprise Linux 32-bit", OsFamily.OEL, false),
-
- /** Oracle Enterprise Linux 64-bit */
- ORACLE_ENTERPRISE_LINUX_64(109, "Oracle Enterprise Linux 64-bit", OsFamily.OEL, true),
-
- /** eComStation 32-bitx */
- ECOMSTATION_32(109, "eComStation 32-bitx", OsFamily.UNRECOGNIZED, false),
-
- UNRECOGNIZED(Integer.MAX_VALUE, "UNRECOGNIZED", null, true);
-
- private final int code;
-
- public int getCode() {
- return code;
- }
-
- public String getValue() {
- return value;
- }
-
- public OsFamily getFamily() {
- return family;
- }
-
- public boolean is64Bit() {
- return is64Bit;
- }
-
- private final String value;
- private final OsFamily family;
- private final boolean is64Bit;
-
- OSType(int code, String value, OsFamily family, boolean is64Bit) {
- this.code = code;
- this.value = value;
- this.family = family;
- this.is64Bit = is64Bit;
- }
-
- public static OSType fromValue(int code) {
- for (OSType type : values()) {
- if (type.code == code)
- return type;
- }
- return UNRECOGNIZED;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
deleted file mode 100644
index 1b3305a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
+++ /dev/null
@@ -1,28 +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.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class ResourceAllocationCaption extends CimString {
-
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
deleted file mode 100644
index 14fda0d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
+++ /dev/null
@@ -1,28 +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.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class ResourceAllocationChangeableType extends CimUnsignedShort {
-
-
-}
[28/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VmToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VmToNodeMetadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VmToNodeMetadata.java
deleted file mode 100644
index 2a25539..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VmToNodeMetadata.java
+++ /dev/null
@@ -1,93 +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.vcloud.director.v1_5.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.not;
-import static com.google.common.collect.Iterables.filter;
-import static org.jclouds.vcloud.director.v1_5.compute.util.VCloudDirectorComputeUtils.getCredentialsFrom;
-import static org.jclouds.vcloud.director.v1_5.compute.util.VCloudDirectorComputeUtils.getIpsFromVm;
-import static org.jclouds.vcloud.director.v1_5.compute.util.VCloudDirectorComputeUtils.toComputeOs;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeMetadataBuilder;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.domain.Credentials;
-import org.jclouds.logging.Logger;
-import org.jclouds.util.InetAddresses2.IsPrivateIPAddress;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-@Singleton
-public class VmToNodeMetadata implements Function<Vm, NodeMetadata> {
- @Resource
- protected static Logger logger = Logger.NULL;
-
- protected final FindLocationForResource findLocationForResourceInVDC;
- protected final Function<Vm, Hardware> hardwareForVm;
- protected final Map<Status, NodeMetadata.Status> vAppStatusToNodeStatus;
- protected final Map<String, Credentials> credentialStore;
- protected final GroupNamingConvention nodeNamingConvention;
-
- @Inject
- protected VmToNodeMetadata(Map<Status, NodeMetadata.Status> vAppStatusToNodeStatus, Map<String, Credentials> credentialStore,
- FindLocationForResource findLocationForResourceInVDC, Function<Vm, Hardware> hardwareForVm,
- GroupNamingConvention.Factory namingConvention) {
- this.nodeNamingConvention = checkNotNull(namingConvention, "namingConvention").createWithoutPrefix();
- this.hardwareForVm = checkNotNull(hardwareForVm, "hardwareForVm");
- this.findLocationForResourceInVDC = checkNotNull(findLocationForResourceInVDC, "findLocationForResourceInVDC");
- this.credentialStore = checkNotNull(credentialStore, "credentialStore");
- this.vAppStatusToNodeStatus = checkNotNull(vAppStatusToNodeStatus, "vAppStatusToNodeStatus");
- }
-
- public NodeMetadata apply(Vm from) {
- NodeMetadataBuilder builder = new NodeMetadataBuilder();
- builder.ids(from.getHref().toASCIIString());
- builder.uri(from.getHref());
- builder.name(from.getName());
- builder.hostname(from.getName());
- builder.location(findLocationForResourceInVDC.apply(
- Iterables.find(from.getLinks(), LinkPredicates.typeEquals(VCloudDirectorMediaType.VDC))));
- builder.group(nodeNamingConvention.groupInUniqueNameOrNull(from.getName()));
- builder.operatingSystem(toComputeOs(from));
- builder.hardware(hardwareForVm.apply(from));
- builder.status(vAppStatusToNodeStatus.get(from.getStatus()));
- Set<String> addresses = getIpsFromVm(from);
- builder.publicAddresses(filter(addresses, not(IsPrivateIPAddress.INSTANCE)));
- builder.privateAddresses(filter(addresses, IsPrivateIPAddress.INSTANCE));
-
- // normally, we don't affect the credential store when reading vApps.
- // However, login user, etc, is actually in the metadata, so lets see
- Credentials fromApi = getCredentialsFrom(from);
- if (fromApi != null && !credentialStore.containsKey("node#" + from.getHref().toASCIIString()))
- credentialStore.put("node#" + from.getHref().toASCIIString(), fromApi);
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/util/VCloudDirectorComputeUtils.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/util/VCloudDirectorComputeUtils.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/util/VCloudDirectorComputeUtils.java
deleted file mode 100644
index 25a13af..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/util/VCloudDirectorComputeUtils.java
+++ /dev/null
@@ -1,144 +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.vcloud.director.v1_5.compute.util;
-
-import static com.google.common.collect.Iterables.filter;
-
-import java.util.Set;
-
-import org.jclouds.cim.OSType;
-import org.jclouds.compute.domain.CIMOperatingSystem;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.dmtf.CIMPredicates;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData.ResourceType;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.jclouds.vcloud.director.v1_5.functions.SectionForVApp;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
-
-public class VCloudDirectorComputeUtils {
-
- public static OperatingSystem toComputeOs(VApp vApp, OperatingSystem defaultOs) {
- CIMOperatingSystem cimOs = toComputeOs(vApp);
- return cimOs != null ? cimOs : defaultOs;
- }
-
- public static CIMOperatingSystem toComputeOs(VApp vApp) {
- // TODO we need to change the design so that it doesn't assume single-vms
- return vApp.getChildren().getVms().size() > 0 ? toComputeOs(Iterables.get(vApp.getChildren().getVms(), 0)) : null;
- }
-
- private static SectionForVApp<OperatingSystemSection> findOperatingSystemSectionForVApp =
- new SectionForVApp<OperatingSystemSection>(OperatingSystemSection.class);
-
- public static CIMOperatingSystem toComputeOs(Vm vm) {
- return toComputeOs(findOperatingSystemSectionForVApp.apply(vm));
- }
-
- public static CIMOperatingSystem toComputeOs(OperatingSystemSection os) {
- return new CIMOperatingSystem(OSType.fromValue(os.getId()), "", null, os.getDescription());
- }
-
- public static String getVirtualSystemIdentifierOfFirstVMIn(VApp vApp) {
- return vApp.getChildren().getVms().size() > 0 ?
- getVirtualSystemIdentifierOf(Iterables.get(vApp.getChildren().getVms(), 0)) : null;
- }
-
- @Inject private static SectionForVApp<VirtualHardwareSection> findVirtualHardwareSectionForVApp =
- new SectionForVApp<VirtualHardwareSection>(VirtualHardwareSection.class);
-
- public static String getVirtualSystemIdentifierOf(Vm vm) {
- VirtualHardwareSection virtualHardwareSection = findVirtualHardwareSectionForVApp.apply(vm);
- if (virtualHardwareSection != null && virtualHardwareSection.getSystem() != null)
- return virtualHardwareSection.getSystem().getVirtualSystemIdentifier();
- return null;
- }
-
- public static LoginCredentials getCredentialsFrom(VApp vApp) {
- return vApp.getChildren().getVms().size() > 0 ?
- getCredentialsFrom(Iterables.get(vApp.getChildren().getVms(), 0)) : null;
- }
-
- public static LoginCredentials getCredentialsFrom(VAppTemplate vApp) {
- return vApp.getChildren().size() > 0 ? getCredentialsFrom(Iterables.get(vApp.getChildren(), 0)) : null;
- }
-
- @Inject private static SectionForVApp<GuestCustomizationSection> findGuestCustomizationSectionForVApp =
- new SectionForVApp<GuestCustomizationSection>(GuestCustomizationSection.class);
-
- public static LoginCredentials getCredentialsFrom(Vm vm) {
- LoginCredentials.Builder builder = LoginCredentials.builder();
- GuestCustomizationSection guestCustomizationSection = findGuestCustomizationSectionForVApp.apply(vm);
- if (guestCustomizationSection != null)
- builder.password(guestCustomizationSection.getAdminPassword());
- return builder.build();
- }
-
- @Inject private static SectionForVApp<NetworkConnectionSection> findNetworkConnectionSectionForVApp =
- new SectionForVApp<NetworkConnectionSection>(NetworkConnectionSection.class);
-
- public static Set<String> getIpsFromVApp(VApp vApp) {
- // TODO make this work with composite vApps
- if (vApp.getChildren().getVms().size() == 0)
- return ImmutableSet.of();
- return getIpsFromVm(Iterables.get(vApp.getChildren().getVms(), 0));
- }
-
- public static Set<String> getIpsFromVm(Vm vm) {
- Builder<String> ips = ImmutableSet.builder();
- // TODO: figure out how to differentiate public from private ip addresses
- // assumption is that we'll do this from the network object, which may
- // have
- // enough data to tell whether or not it is a public network without
- // string
- // parsing. At worst, we could have properties set per cloud provider to
- // declare the networks which are public, then check against these in
- // networkconnection.getNetwork
- NetworkConnectionSection networkConnectionSection = findNetworkConnectionSectionForVApp.apply(vm);
- if (networkConnectionSection != null) {
- for (NetworkConnection connection : networkConnectionSection.getNetworkConnections()) {
- if (connection.getIpAddress() != null)
- ips.add(connection.getIpAddress());
- if (connection.getExternalIpAddress() != null)
- ips.add(connection.getExternalIpAddress());
- }
- } else {
- for (ResourceAllocationSettingData net : filter(findVirtualHardwareSectionForVApp.apply(vm).getItems(),
- CIMPredicates.resourceTypeIn(ResourceType.ETHERNET_ADAPTER))) {
- // FIXME: not yet implemented
-// if (net instanceof VCloudNetworkAdapter) {
-// VCloudNetworkAdapter vNet = VCloudNetworkAdapter.class.cast(net);
-// if (vNet.getIpAddress() != null)
-// ips.add(vNet.getIpAddress());
-// }
- }
- }
- return ips.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorHttpApiModule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorHttpApiModule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorHttpApiModule.java
deleted file mode 100644
index c78d68e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorHttpApiModule.java
+++ /dev/null
@@ -1,158 +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.vcloud.director.v1_5.config;
-
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.rest.config.BinderUtils.bindHttpApi;
-
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-
-import org.jclouds.domain.Credentials;
-import org.jclouds.http.HttpErrorHandler;
-import org.jclouds.http.HttpRetryHandler;
-import org.jclouds.http.annotation.ClientError;
-import org.jclouds.http.annotation.Redirection;
-import org.jclouds.http.annotation.ServerError;
-import org.jclouds.location.Provider;
-import org.jclouds.rest.ApiContext;
-import org.jclouds.rest.ConfiguresHttpApi;
-import org.jclouds.rest.config.HttpApiModule;
-import org.jclouds.rest.internal.ApiContextImpl;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.annotations.Login;
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-import org.jclouds.vcloud.director.v1_5.domain.Session;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.jclouds.vcloud.director.v1_5.features.OrgApi;
-import org.jclouds.vcloud.director.v1_5.features.TaskApi;
-import org.jclouds.vcloud.director.v1_5.features.VAppApi;
-import org.jclouds.vcloud.director.v1_5.features.VmApi;
-import org.jclouds.vcloud.director.v1_5.handlers.InvalidateSessionAndRetryOn401AndLogoutOnClose;
-import org.jclouds.vcloud.director.v1_5.handlers.VCloudDirectorErrorHandler;
-import org.jclouds.vcloud.director.v1_5.loaders.LoginUserInOrgWithPassword;
-import org.jclouds.vcloud.director.v1_5.loaders.ResolveEntity;
-import org.jclouds.vcloud.director.v1_5.login.SessionApi;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.LoadingCache;
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
-import com.google.inject.TypeLiteral;
-import com.google.inject.name.Named;
-
-@ConfiguresHttpApi
-public class VCloudDirectorHttpApiModule extends HttpApiModule<VCloudDirectorApi> {
- @Override
- protected void configure() {
- bind(new TypeLiteral<ApiContext<VCloudDirectorAdminApi>>() {
- }).to(new TypeLiteral<ApiContextImpl<VCloudDirectorAdminApi>>() {
- });
-
- // Bind apis that are used directly in Functions, Predicates and other circumstances
- bindHttpApi(binder(), OrgApi.class);
- bindHttpApi(binder(), SessionApi.class);
- bindHttpApi(binder(), TaskApi.class);
- bindHttpApi(binder(), VAppApi.class);
- bindHttpApi(binder(), VmApi.class);
-
- bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(InvalidateSessionAndRetryOn401AndLogoutOnClose.class);
-
- super.configure();
- bindHttpApi(binder(), VCloudDirectorAdminApi.class);
- }
-
- @Override
- protected void bindErrorHandlers() {
- bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(VCloudDirectorErrorHandler.class);
- bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(VCloudDirectorErrorHandler.class);
- bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(VCloudDirectorErrorHandler.class);
- }
-
- @Provides
- @Login
- protected Supplier<URI> loginUrl(@Provider Supplier<URI> provider) {
- // TODO: technically, we should implement version api, but this will work
- return Suppliers.compose(new Function<URI, URI>() {
-
- @Override
- public URI apply(URI arg0) {
- return URI.create(arg0.toASCIIString() + "/sessions");
- }
-
- }, provider);
- }
-
- @Provides
- protected Supplier<Session> currentSession(Supplier<SessionWithToken> in) {
- return Suppliers.compose(new Function<SessionWithToken, Session>() {
-
- @Override
- public Session apply(SessionWithToken arg0) {
- return arg0.getSession();
- }
-
- }, in);
-
- }
-
- @Provides
- @Singleton
- @org.jclouds.vcloud.director.v1_5.annotations.Session
- protected Supplier<String> sessionToken(Supplier<SessionWithToken> in) {
- return Suppliers.compose(new Function<SessionWithToken, String>() {
-
- @Override
- public String apply(SessionWithToken arg0) {
- return arg0.getToken();
- }
-
- }, in);
-
- }
-
- @Provides
- @Singleton
- LoadingCache<String, Entity> resolveEntityCache(ResolveEntity loader, @Named(PROPERTY_SESSION_INTERVAL) int seconds) {
- return CacheBuilder.newBuilder().expireAfterWrite(seconds, TimeUnit.SECONDS).build(loader);
- }
-
- @Provides
- @Singleton
- LoadingCache<Credentials, SessionWithToken> provideSessionWithTokenCache(LoginUserInOrgWithPassword loader,
- @Named(PROPERTY_SESSION_INTERVAL) int seconds) {
- return CacheBuilder.newBuilder().expireAfterWrite(seconds, TimeUnit.SECONDS).build(loader);
- }
-
- // Temporary conversion of a cache to a supplier until there is a single-element cache
- // http://code.google.com/p/guava-libraries/issues/detail?id=872
- @Provides
- @Singleton
- protected Supplier<SessionWithToken> provideSessionWithTokenSupplier(
- final LoadingCache<Credentials, SessionWithToken> cache, @Provider final Supplier<Credentials> creds) {
- return new Supplier<SessionWithToken>() {
- @Override
- public SessionWithToken get() {
- return cache.getUnchecked(creds.get());
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
deleted file mode 100644
index 6b6af2a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
+++ /dev/null
@@ -1,227 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.DeploymentOptionSection;
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlType(name = "AbstractVAppType")
-public abstract class AbstractVApp extends ResourceEntity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromResourceEntityType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ResourceEntity.Builder<B> {
-
- private Boolean deployed;
- private Reference vAppParent;
- private Set<SectionType> sections = Sets.newLinkedHashSet();
-
- /**
- * @see AbstractVApp#isDeployed()
- */
- public B isDeployed(Boolean deployed) {
- this.deployed = deployed;
- return self();
- }
-
- /**
- * @see AbstractVApp#isDeployed()
- */
- public B deployed() {
- this.deployed = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see AbstractVApp#isDeployed()
- */
- public B notDeployed() {
- this.deployed = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see AbstractVApp#getVAppParent()
- */
- public B parent(Reference vAppParent) {
- this.vAppParent = vAppParent;
- return self();
- }
-
- /**
- * @see AbstractVApp#getSections()
- */
- public B sections(Iterable<? extends SectionType> sections) {
- this.sections = Sets.newLinkedHashSet(checkNotNull(sections, "sections"));
- return self();
- }
-
- /**
- * @see AbstractVApp#getSections()
- */
- public B section(SectionType section) {
- this.sections.add(checkNotNull(section, "section"));
- return self();
- }
-
- public B fromAbstractVAppType(AbstractVApp in) {
- return fromResourceEntityType(in).parent(vAppParent).sections(sections).isDeployed(deployed);
- }
- }
-
- @XmlElement(name = "VAppParent")
- private Reference vAppParent;
- @XmlElementRefs({
- @XmlElementRef(type = VirtualHardwareSection.class),
- @XmlElementRef(type = LeaseSettingsSection.class),
-// @XmlElementRef(type = EulaSection.class),
- @XmlElementRef(type = RuntimeInfoSection.class),
-// @XmlElementRef(type = AnnotationSection.class),
- @XmlElementRef(type = DeploymentOptionSection.class),
- @XmlElementRef(type = StartupSection.class),
-// @XmlElementRef(type = ResourceAllocationSection.class),
- @XmlElementRef(type = NetworkConnectionSection.class),
- @XmlElementRef(type = CustomizationSection.class),
- @XmlElementRef(type = ProductSection.class),
- @XmlElementRef(type = GuestCustomizationSection.class),
- @XmlElementRef(type = OperatingSystemSection.class),
- @XmlElementRef(type = NetworkConfigSection.class),
- @XmlElementRef(type = NetworkSection.class),
-// @XmlElementRef(type = InstallSection.class),
- @XmlElementRef(type = DiskSection.class)
- })
- private Set<SectionType> sections = Sets.newLinkedHashSet();
- @XmlAttribute
- private Boolean deployed;
-
- protected AbstractVApp() {
- // for JAXB and Builders
- }
-
- protected AbstractVApp(Builder<?> builder) {
- super(builder);
- this.vAppParent = builder.vAppParent;
- this.sections = builder.sections.isEmpty() ? null : ImmutableSet.copyOf(builder.sections);
- this.deployed = builder.deployed;
- }
-
- /**
- * Gets the value of the vAppParent property.
- */
- public Reference getVAppParent() {
- return vAppParent;
- }
-
- /**
- * Specific {@code ovf:Section} with additional information for the vApp.
- *
- * Objects of the following type(s) are allowed in the list:
- * <ul>
- * <li>{@link VirtualHardwareSectionType}
- * <li>{@link LeaseSettingsSectionType}
- * <li>{@link EulaSectionType}
- * <li>{@link RuntimeInfoSectionType}
- * <li>{@link AnnotationSectionType}
- * <li>{@link DeploymentOptionSectionType}
- * <li>{@link StartupSectionType}
- * <li>{@link ResourceAllocationSectionType}
- * <li>{@link NetworkConnectionSectionType}
- * <li>{@link CustomizationSectionType}
- * <li>{@link ProductSectionType}
- * <li>{@link GuestCustomizationSectionType}
- * <li>{@link OperatingSystemSectionType}
- * <li>{@link NetworkConfigSectionType}
- * <li>{@link NetworkSectionType}
- * <li>{@link DiskSectionType}
- * <li>{@link InstallSectionType}
- * </ul>
- */
- public Set<SectionType> getSections() {
- return sections != null ? ImmutableSet.copyOf(sections) : ImmutableSet.<SectionType>of();
- }
-
- /**
- * Gets the value of the deployed property.
- */
- public Boolean isDeployed() {
- return deployed;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- AbstractVApp that = AbstractVApp.class.cast(o);
- return super.equals(that)
- && equal(this.vAppParent, that.vAppParent)
- && equal(this.sections, that.sections)
- && equal(this.deployed, that.deployed);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), vAppParent, sections, deployed);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("vAppParent", vAppParent)
- .add("sections", sections)
- .add("deployed", deployed);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
deleted file mode 100644
index bdb19b4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
+++ /dev/null
@@ -1,120 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Specifies who can access a resource.
- */
-@XmlRootElement(name = "AccessSetting")
-@XmlType(name = "AccessSettingType")
-public class AccessSetting {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromAccessSetting(this);
- }
-
- public static class Builder {
-
- private Reference subject;
- private String accessLevel;
-
- /**
- * @see AccessSetting#getSubject()
- */
- public Builder subject(Reference subject) {
- this.subject = subject;
- return this;
- }
-
- /**
- * @see AccessSetting#getAccessLevel()
- */
- public Builder accessLevel(String accessLevel) {
- this.accessLevel = accessLevel;
- return this;
- }
-
- public AccessSetting build() {
- AccessSetting accessSetting = new AccessSetting(subject, accessLevel);
- return accessSetting;
- }
-
- public Builder fromAccessSetting(AccessSetting in) {
- return subject(in.getSubject()).accessLevel(in.getAccessLevel());
- }
- }
-
- protected AccessSetting() {
- // For JAXB and builder use
- }
-
- public AccessSetting(Reference subject, String accessLevel) {
- this.subject = subject;
- this.accessLevel = accessLevel;
- }
-
- @XmlElement(name = "Subject", required = true)
- protected Reference subject;
- @XmlElement(name = "AccessLevel", required = true)
- protected String accessLevel;
-
- /**
- * Gets the value of the subject property.
- */
- public Reference getSubject() {
- return subject;
- }
-
- /**
- * Gets the value of the accessLevel property.
- */
- public String getAccessLevel() {
- return accessLevel;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- AccessSetting that = AccessSetting.class.cast(o);
- return equal(this.subject, that.subject) && equal(this.accessLevel, that.accessLevel);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(subject, accessLevel);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("subject", subject).add("accessLevel", accessLevel).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java
deleted file mode 100644
index 78e562a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java
+++ /dev/null
@@ -1,63 +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.vcloud.director.v1_5.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Admin representation of the container for meta data (key-value pair) associated to different
- * entities in the system.
- */
-@XmlRootElement(name = "AdminCatalog")
-@XmlType(name = "AdminCatalogType")
-public class AdminCatalog extends Catalog {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromAdminCatalog(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Catalog.Builder<B> {
-
- @Override
- public AdminCatalog build() {
- return new AdminCatalog(this);
- }
-
- public B fromAdminCatalog(AdminCatalog in) {
- return fromCatalogType(in);
- }
- }
-
- @SuppressWarnings("unused")
- private AdminCatalog() {
- // For JAXB
- }
-
- protected AdminCatalog(Builder<?> builder) {
- super(builder);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
deleted file mode 100644
index a317d64..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
+++ /dev/null
@@ -1,298 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Provides an administrative view of a vDC. Includes all members
- * of the Vdc element, and adds several elements that can be
- * viewed and modified only by administrators.
- *
- * <p/> The redwood admin can disable an
- * organization vDC. This will prevent any further allocation to be used by the organization.
- * Changing the state will not affect allocations already used. For example, if an organization
- * vDC is disabled, an organization user cannot deploy or add a new virtual machine in the
- * vDC (deploy uses memory and cpu allocations, and add uses storage allocation).
- */
-@XmlRootElement(name = "AdminVdc")
-@XmlType(name = "AdminVdcType", propOrder = {
- "resourceGuaranteedMemory",
- "resourceGuaranteedCpu",
- "vCpuInMhz",
- "isThinProvision",
- "networkPoolReference",
- "providerVdcReference",
- "usesFastProvisioning"
-})
-public class AdminVdc extends Vdc {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public abstract static class Builder<T extends Builder<T>> extends Vdc.Builder<T> {
- private Double resourceGuaranteedMemory;
- private Double resourceGuaranteedCpu;
- private Long vCpuInMhz;
- private Boolean isThinProvision;
- private Reference networkPoolReference;
- private Reference providerVdcReference;
- private Boolean usesFastProvisioning;
-
- /**
- * @see AdminVdc#getResourceGuaranteedMemory()
- */
- public T resourceGuaranteedMemory(Double resourceGuaranteedMemory) {
- this.resourceGuaranteedMemory = resourceGuaranteedMemory;
- return self();
- }
-
- /**
- * @see AdminVdc#getResourceGuaranteedCpu()
- */
- public T resourceGuaranteedCpu(Double resourceGuaranteedCpu) {
- this.resourceGuaranteedCpu = resourceGuaranteedCpu;
- return self();
- }
-
- /**
- * @see AdminVdc#getVCpuInMhz()
- */
- public T vCpuInMhz(Long vCpuInMhz) {
- this.vCpuInMhz = vCpuInMhz;
- return self();
- }
-
- /**
- * @see AdminVdc#getIsThinProvision()
- */
- public T isThinProvision(Boolean isThinProvision) {
- this.isThinProvision = isThinProvision;
- return self();
- }
-
- /**
- * @see AdminVdc#getNetworkPoolReference()
- */
- public T networkPoolReference(Reference networkPoolReference) {
- this.networkPoolReference = networkPoolReference;
- return self();
- }
-
- /**
- * @see AdminVdc#getProviderVdcReference()
- */
- public T providerVdcReference(Reference providerVdcReference) {
- this.providerVdcReference = providerVdcReference;
- return self();
- }
-
- /**
- * @see AdminVdc#getUsesFastProvisioning()
- */
- public T usesFastProvisioning(Boolean usesFastProvisioning) {
- this.usesFastProvisioning = usesFastProvisioning;
- return self();
- }
-
- @Override
- public AdminVdc build() {
- return new AdminVdc(this);
- }
-
- public T fromAdminVdc(AdminVdc in) {
- return fromVdc(in)
- .resourceGuaranteedMemory(in.getResourceGuaranteedMemory())
- .resourceGuaranteedCpu(in.getResourceGuaranteedCpu())
- .vCpuInMhz(in.getVCpuInMhz())
- .isThinProvision(in.isThinProvision())
- .networkPoolReference(in.getNetworkPoolReference())
- .providerVdcReference(in.getProviderVdcReference())
- .usesFastProvisioning(in.usesFastProvisioning());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override protected ConcreteBuilder self() {
- return this;
- }
- }
-
- @SuppressWarnings("unused")
- private AdminVdc() {
- // For JAXB
- }
-
- public AdminVdc(Builder<?> b) {
- super(b);
- resourceGuaranteedMemory = b.resourceGuaranteedMemory;
- resourceGuaranteedCpu = b.resourceGuaranteedCpu;
- vCpuInMhz = b.vCpuInMhz;
- isThinProvision = b.isThinProvision;
- networkPoolReference = b.networkPoolReference;
- providerVdcReference = b.providerVdcReference;
- usesFastProvisioning = b.usesFastProvisioning;
- }
-
- @XmlElement(name = "ResourceGuaranteedMemory")
- protected Double resourceGuaranteedMemory;
- @XmlElement(name = "ResourceGuaranteedCpu")
- protected Double resourceGuaranteedCpu;
- @XmlElement(name = "VCpuInMhz")
- protected Long vCpuInMhz;
- @XmlElement(name = "IsThinProvision")
- protected Boolean isThinProvision;
- @XmlElement(name = "NetworkPoolReference")
- protected Reference networkPoolReference;
- @XmlElement(name = "ProviderVdcReference")
- protected Reference providerVdcReference;
- @XmlElement(name = "UsesFastProvisioning")
- protected Boolean usesFastProvisioning;
-
- /**
- * Gets the value of the resourceGuaranteedMemory property.
- *
- * @return
- * possible object is
- * {@link Double }
- *
- */
- public Double getResourceGuaranteedMemory() {
- return resourceGuaranteedMemory;
- }
-
- /**
- * Gets the value of the resourceGuaranteedCpu property.
- *
- * @return
- * possible object is
- * {@link Double }
- *
- */
- public Double getResourceGuaranteedCpu() {
- return resourceGuaranteedCpu;
- }
-
- /**
- * Gets the value of the vCpuInMhz property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVCpuInMhz() {
- return vCpuInMhz;
- }
-
- /**
- * Gets the value of the isThinProvision property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isThinProvision() {
- return isThinProvision;
- }
-
- /**
- * Gets the value of the networkPoolReference property.
- *
- * @return
- * possible object is
- * {@link Reference }
- *
- */
- public Reference getNetworkPoolReference() {
- return networkPoolReference;
- }
-
- /**
- * Gets the value of the providerVdcReference property.
- *
- * @return
- * possible object is
- * {@link Reference }
- *
- */
- public Reference getProviderVdcReference() {
- return providerVdcReference;
- }
-
- /**
- * Gets the value of the usesFastProvisioning property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean usesFastProvisioning() {
- return usesFastProvisioning;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- AdminVdc that = AdminVdc.class.cast(o);
- return super.equals(that) &&
- equal(resourceGuaranteedMemory, that.resourceGuaranteedMemory) &&
- equal(resourceGuaranteedCpu, that.resourceGuaranteedCpu) &&
- equal(vCpuInMhz, that.vCpuInMhz) &&
- equal(isThinProvision, that.isThinProvision) &&
- equal(networkPoolReference, that.networkPoolReference) &&
- equal(providerVdcReference, that.providerVdcReference) &&
- equal(usesFastProvisioning, that.usesFastProvisioning);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- resourceGuaranteedMemory,
- resourceGuaranteedCpu,
- vCpuInMhz,
- isThinProvision,
- networkPoolReference,
- providerVdcReference,
- usesFastProvisioning);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("resourceGuaranteedMemory", resourceGuaranteedMemory)
- .add("resourceGuaranteedCpu", resourceGuaranteedCpu)
- .add("vCpuInMhz", vCpuInMhz)
- .add("isThinProvision", isThinProvision)
- .add("networkPoolReference", networkPoolReference)
- .add("providerVdcReference", providerVdcReference)
- .add("usesFastProvisioning", usesFastProvisioning);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
deleted file mode 100644
index 543c4d0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
+++ /dev/null
@@ -1,120 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-
-/**
- * Collection of supported hardware capabilities.
- */
-@XmlType(name = "Capabilities", propOrder = {
- "supportedHardwareVersions"
-})
-public class Capabilities {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromCapabilities(this);
- }
-
- public static class Builder {
-
- private Set<String> supportedHardwareVersions = Sets.newLinkedHashSet();
-
- /**
- * @see Capabilities#getSupportedHardwareVersions()
- */
- public Builder supportedHardwareVersions(Set<String> supportedHardwareVersions) {
- this.supportedHardwareVersions = Sets.newLinkedHashSet(checkNotNull(supportedHardwareVersions, "supportedHardwareVersions"));
- return this;
- }
-
- /**
- * @see Capabilities#getSupportedHardwareVersions()
- */
- public Builder supportedHardwareVersion(String supportedHardwareVersion) {
- this.supportedHardwareVersions.add(checkNotNull(supportedHardwareVersion, "supportedHardwareVersion"));
- return this;
- }
-
-
- public Capabilities build() {
- return new Capabilities(supportedHardwareVersions);
- }
-
-
- public Builder fromCapabilities(Capabilities in) {
- return supportedHardwareVersions(Sets.newLinkedHashSet(in.getSupportedHardwareVersions()));
- }
- }
-
- private Capabilities(Set<String> supportedHardwareVersions) {
- this.supportedHardwareVersions = supportedHardwareVersions == null ? Sets.<String>newLinkedHashSet() : ImmutableSet.copyOf(supportedHardwareVersions);
- }
-
- private Capabilities() {
- // For JAXB
- }
-
-
- @XmlElementWrapper(name = "SupportedHardwareVersions")
- @XmlElement(name = "SupportedHardwareVersion")
- protected Set<String> supportedHardwareVersions = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the supportedHardwareVersions property.
- */
- public Set<String> getSupportedHardwareVersions() {
- return supportedHardwareVersions;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Capabilities that = Capabilities.class.cast(o);
- return equal(supportedHardwareVersions, that.supportedHardwareVersions);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(supportedHardwareVersions);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("supportedHardwareVersions", supportedHardwareVersions).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
deleted file mode 100644
index b466f7b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
+++ /dev/null
@@ -1,163 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents a capacity of a given resource.
- */
-@XmlType(name = "Capacity", propOrder = {
- "units",
- "allocated",
- "limit"
-})
-@XmlSeeAlso({
- CapacityWithUsage.class
-})
-public class Capacity<T extends Capacity<T>> {
-
- public static <T extends Capacity<T>> Builder<T> builder() {
- return new Builder<T>();
- }
-
- public Builder<T> toBuilder() {
- return new Builder<T>().fromCapacityType(this);
- }
-
- public static class Builder<T extends Capacity<T>> {
-
- protected String units;
- protected Long allocated;
- protected Long limit;
-
- /**
- * @see Capacity#getUnits()
- */
- public Builder<T> units(String units) {
- this.units = units;
- return this;
- }
-
- /**
- * @see Capacity#getAllocated()
- */
- public Builder<T> allocated(Long allocated) {
- this.allocated = allocated;
- return this;
- }
-
- /**
- * @see Capacity#getLimit()
- */
- public Builder<T> limit(Long limit) {
- this.limit = limit;
- return this;
- }
-
-
- public Capacity<T> build() {
- return new Capacity<T>(units, allocated, limit);
- }
-
-
- public Builder<T> fromCapacityType(Capacity<T> in) {
- return units(in.getUnits())
- .allocated(in.getAllocated())
- .limit(in.getLimit());
- }
- }
-
- protected Capacity(String units, Long allocated, Long limit) {
- this.units = units;
- this.allocated = allocated;
- this.limit = limit;
- }
-
- protected Capacity() {
- // for JAXB
- }
-
- @XmlElement(name = "Units", required = true)
- protected String units;
- @XmlElement(name = "Allocated")
- protected Long allocated;
- @XmlElement(name = "Limit")
- protected Long limit;
-
- /**
- * Gets the value of the units property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getUnits() {
- return units;
- }
-
- /**
- * Gets the value of the allocated property.
- *
- * @return possible object is
- * {@link Long }
- */
- public Long getAllocated() {
- return allocated;
- }
-
- /**
- * Gets the value of the limit property.
- */
- public Long getLimit() {
- return limit;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Capacity<?> that = Capacity.class.cast(o);
- return equal(units, that.units) &&
- equal(allocated, that.allocated) &&
- equal(limit, that.limit);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(units,
- allocated,
- limit);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("units", units)
- .add("allocated", allocated)
- .add("limit", limit).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
deleted file mode 100644
index ea29b1d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
+++ /dev/null
@@ -1,172 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents a capacity and usage of a given resource.
- */
-@XmlType(name = "CapacityWithUsage", propOrder = {
- "used",
- "overhead"
-})
-public class CapacityWithUsage extends Capacity<CapacityWithUsage> {
-
- @SuppressWarnings("unchecked")
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromCapacityWithUsage(this);
- }
-
- public static class Builder extends Capacity.Builder<CapacityWithUsage> {
-
- private Long used;
- private Long overhead;
-
- /**
- * @see CapacityWithUsage#getUsed()
- */
- public Builder used(Long used) {
- this.used = used;
- return this;
- }
-
- /**
- * @see CapacityWithUsage#getOverhead()
- */
- public Builder overhead(Long overhead) {
- this.overhead = overhead;
- return this;
- }
-
-
- @Override
- public CapacityWithUsage build() {
- return new CapacityWithUsage(units, allocated, limit, used, overhead);
- }
-
- /**
- * @see Capacity#getUnits()
- */
- @Override
- public Builder units(String units) {
- this.units = units;
- return this;
- }
-
- /**
- * @see Capacity#getAllocated()
- */
- @Override
- public Builder allocated(Long allocated) {
- this.allocated = allocated;
- return this;
- }
-
- /**
- * @see Capacity#getLimit()
- */
- @Override
- public Builder limit(Long limit) {
- this.limit = limit;
- return this;
- }
-
-
- @Override
- public Builder fromCapacityType(Capacity<CapacityWithUsage> in) {
- return Builder.class.cast(super.fromCapacityType(in));
- }
-
- public Builder fromCapacityWithUsage(CapacityWithUsage in) {
- return fromCapacityType(in)
- .used(in.getUsed())
- .overhead(in.getOverhead());
- }
- }
-
- private CapacityWithUsage(String units, Long allocated, Long limit, Long used, Long overhead) {
- super(units, allocated, limit);
- this.used = used;
- this.overhead = overhead;
- }
-
- private CapacityWithUsage() {
- // for JAXB
- }
-
- @XmlElement(name = "Used")
- protected Long used;
- @XmlElement(name = "Overhead")
- protected Long overhead;
-
- /**
- * Gets the value of the used property.
- *
- * @return possible object is
- * {@link Long }
- */
- public Long getUsed() {
- return used;
- }
-
- /**
- * Gets the value of the overhead property.
- *
- * @return possible object is
- * {@link Long }
- */
- public Long getOverhead() {
- return overhead;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CapacityWithUsage that = CapacityWithUsage.class.cast(o);
- return equal(used, that.used) &&
- equal(overhead, that.overhead);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(used,
- overhead);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("used", used)
- .add("overhead", overhead).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
deleted file mode 100644
index d5c2ab9..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
+++ /dev/null
@@ -1,176 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Container for references to {@link VAppTemplate} and {@link Media} objects.
- */
-@XmlSeeAlso({ AdminCatalog.class })
-@XmlRootElement(name = "Catalog")
-@XmlType(name = "CatalogType")
-public class Catalog extends Entity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCatalogType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private Owner owner;
- private Set<Reference> catalogItems = Sets.newLinkedHashSet();
- private Boolean isPublished;
-
- /**
- * @see CatalogType#getOwner()
- */
- public B owner(Owner owner) {
- this.owner = owner;
- return self();
- }
-
- /**
- * @see CatalogItems#getCatalogItems()
- */
- public B items(Iterable<Reference> catalogItems) {
- this.catalogItems = Sets.newLinkedHashSet(checkNotNull(catalogItems, "catalogItems"));
- return self();
- }
-
- /**
- * @see CatalogItems#getCatalogItems()
- */
- public B item(Reference catalogItem) {
- this.catalogItems.add(checkNotNull(catalogItem, "catalogItem"));
- return self();
- }
-
- /**
- * @see CatalogType#isPublished()
- */
- public B isPublished(Boolean isPublished) {
- this.isPublished = isPublished;
- return self();
- }
-
- /**
- * @see CatalogType#isPublished()
- */
- public B published() {
- this.isPublished = Boolean.TRUE;
- return self();
- }
-
- @Override
- public Catalog build() {
- return new Catalog(this);
- }
-
- public B fromCatalogType(Catalog in) {
- return fromEntityType(in).owner(in.getOwner()).items(in.getCatalogItems()).isPublished(in.isPublished());
- }
- }
-
- protected Catalog(Builder<?> builder) {
- super(builder);
- this.owner = builder.owner;
- this.catalogItems = builder.catalogItems == null || builder.catalogItems.isEmpty() ? null : ImmutableSet.copyOf(builder.catalogItems);
- this.isPublished = builder.isPublished;
- }
-
- protected Catalog() {
- // For JAXB
- }
-
- @XmlElement(name = "Owner")
- private Owner owner;
- @XmlElementWrapper(name = "CatalogItems")
- @XmlElement(name = "CatalogItem")
- private Set<Reference> catalogItems;
- @XmlElement(name = "IsPublished")
- private Boolean isPublished;
-
- /**
- * Gets the value of the owner property.
- */
- public Owner getOwner() {
- return owner;
- }
-
- /**
- * Gets the value of the catalogItems property.
- */
- public Set<Reference> getCatalogItems() {
- return catalogItems == null ? ImmutableSet.<Reference>of() : ImmutableSet.copyOf(catalogItems);
- }
-
- /**
- * Gets the value of the isPublished property.
- */
- public Boolean isPublished() {
- return isPublished;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Catalog that = Catalog.class.cast(o);
- return super.equals(that) &&
- equal(this.owner, that.owner) &&
- equal(this.getCatalogItems(), that.getCatalogItems()) &&
- equal(this.isPublished, that.isPublished);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), owner, getCatalogItems(), catalogItems);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("owner", owner)
- .add("catalogItems", getCatalogItems())
- .add("isPublished", isPublished);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
deleted file mode 100644
index e1d422f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
+++ /dev/null
@@ -1,121 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Contains a reference to a VappTemplate or Media object and related metadata.
- */
-@XmlRootElement(name = "CatalogItem")
-public class CatalogItem extends Entity {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.CATALOG_ITEM;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCatalogItem(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private Reference entity;
- private Set<Property> properties = Sets.newLinkedHashSet();
-
- /**
- * @see CatalogItem#getEntity()
- */
- public B entity(Reference entity) {
- this.entity = entity;
- return self();
- }
-
- /**
- * @see CatalogItem#getProperties()
- */
- public B properties(Set<Property> properties) {
- this.properties = Sets.newLinkedHashSet(checkNotNull(properties, "properties"));
- return self();
- }
-
- /**
- * @see CatalogItem#getProperties()
- */
- public B property(Property property) {
- this.properties.add(checkNotNull(property, "property"));
- return self();
- }
-
- @Override
- public CatalogItem build() {
- return new CatalogItem(this);
- }
-
- public B fromCatalogItem(CatalogItem in) {
- return fromEntityType(in).entity(in.getEntity()).properties(in.getProperties());
- }
- }
-
- protected CatalogItem(Builder<?> builder) {
- super(builder);
- this.entity = builder.entity;
- this.properties = ImmutableSet.copyOf(builder.properties);
- }
-
- protected CatalogItem() {
- // for JAXB
- }
-
- @XmlElement(name = "Entity", required = true)
- private Reference entity;
- @XmlElement(name = "Property")
- private Set<Property> properties = Sets.newLinkedHashSet();
-
- /**
- * A reference to a VappTemplate or Media object.
- */
- public Reference getEntity() {
- return entity;
- }
-
- /**
- * User-specified key/value pair.
- * <p/>
- * This element has been superseded by the {@link Metadata} element, which is the preferred way to specify key/value pairs for objects.
- */
- public Set<Property> getProperties() {
- return Collections.unmodifiableSet(this.properties);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogReference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogReference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogReference.java
deleted file mode 100644
index 84d6d53..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogReference.java
+++ /dev/null
@@ -1,73 +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.vcloud.director.v1_5.domain;
-
-import java.net.URI;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "CatalogReference")
-public class CatalogReference extends Reference {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCatalogReference(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Reference.Builder<B> {
-
- @Override
- public CatalogReference build() {
- return new CatalogReference(this);
- }
-
- protected B fromCatalogReference(CatalogReference in) {
- return fromReference(in);
- }
- }
-
- public CatalogReference(Builder<?> builder) {
- super(builder);
- }
-
- public CatalogReference(URI href, String name, String type) {
- super(href, name, type);
- }
-
- protected CatalogReference() {
- // For JAXB
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CatalogReference that = CatalogReference.class.cast(o);
- return super.equals(that);
- }
-
- // NOTE hashcode inherited from Reference
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
deleted file mode 100644
index 9b85e77..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
+++ /dev/null
@@ -1,133 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents a compute capacity with usage.
- */
-@XmlType(name = "ComputeCapacity", propOrder = {
- "cpu",
- "memory"
-})
-public class ComputeCapacity {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromComputeCapacity(this);
- }
-
- public static class Builder {
-
- private CapacityWithUsage cpu;
- private CapacityWithUsage memory;
-
- /**
- * @see ComputeCapacity#getCpu()
- */
- public Builder cpu(CapacityWithUsage cpu) {
- this.cpu = cpu;
- return this;
- }
-
- /**
- * @see ComputeCapacity#getMemory()
- */
- public Builder memory(CapacityWithUsage memory) {
- this.memory = memory;
- return this;
- }
-
- public ComputeCapacity build() {
- return new ComputeCapacity(cpu, memory);
- }
-
- public Builder fromComputeCapacity(ComputeCapacity in) {
- return cpu(in.getCpu())
- .memory(in.getMemory());
- }
- }
-
- private ComputeCapacity(CapacityWithUsage cpu, CapacityWithUsage memory) {
- this.cpu = cpu;
- this.memory = memory;
- }
-
- private ComputeCapacity() {
- // for JAXB
- }
-
-
- @XmlElement(name = "Cpu", required = true)
- protected CapacityWithUsage cpu;
- @XmlElement(name = "Memory", required = true)
- protected CapacityWithUsage memory;
-
- /**
- * Gets the value of the cpu property.
- *
- * @return possible object is
- * {@link CapacityWithUsage }
- */
- public CapacityWithUsage getCpu() {
- return cpu;
- }
-
- /**
- * Gets the value of the memory property.
- *
- * @return possible object is
- * {@link CapacityWithUsage }
- */
- public CapacityWithUsage getMemory() {
- return memory;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ComputeCapacity that = ComputeCapacity.class.cast(o);
- return equal(cpu, that.cpu) &&
- equal(memory, that.memory);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(cpu,
- memory);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("cpu", cpu)
- .add("memory", memory).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
deleted file mode 100644
index 956dcb2..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
+++ /dev/null
@@ -1,208 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-/**
- * Basic entity type in the vCloud object model.
- *
- * Includes the entity name and an optional id, description, and set of running {@link Task}s.
- */
-@XmlRootElement(name = "Entity")
-@XmlType(name = "EntityType")
-public class Entity extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromEntityType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private String description;
- private List<Task> tasks = Lists.newArrayList();
- private String name;
- private String id;
-
- /**
- * @see EntityType#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see EntityType#getDescription()
- */
- public B description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see EntityType#getId()
- */
- public B id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see EntityType#getTasks()
- */
- public B tasks(Iterable<Task> tasks) {
- this.tasks = Lists.newArrayList(checkNotNull(tasks, "tasks"));
- return self();
- }
-
- /**
- * @see EntityType#getTasks()
- */
- public B task(Task task) {
- this.tasks.add(checkNotNull(task, "task"));
- return self();
- }
-
- @Override
- public Entity build() {
- return new Entity(this);
- }
-
- public B fromEntityType(Entity in) {
- return fromResource(in)
- .description(in.getDescription())
- .tasks(in.getTasks())
- .id(in.getId()).name(in.getName());
- }
- }
-
- @XmlElement(name = "Description")
- private String description;
- @XmlElementWrapper(name = "Tasks")
- @XmlElement(name = "Task")
- private List<Task> tasks;
- @XmlAttribute
- private String id;
- @XmlAttribute(required = true)
- private String name;
-
- protected Entity(Builder<?> builder) {
- super(builder);
- this.description = builder.description;
- this.tasks = builder.tasks == null || builder.tasks.isEmpty() ? null : ImmutableList.copyOf(builder.tasks);
- this.id = builder.id;
- this.name = builder.name;
- }
-
- protected Entity() {
- // For JAXB
- }
-
- /**
- * Optional description.
- */
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * A list of queued, running, or recently completed tasks associated with this entity.
- */
- public List<Task> getTasks() {
- return tasks == null ? ImmutableList.<Task>of() : ImmutableList.copyOf(tasks);
- }
-
- /**
- * The resource identifier, expressed in URN format.
- *
- * The value of this attribute uniquely identifies the resource, persists for the life of the
- * resource, and is never reused.
- */
- public String getId() {
- return id;
- }
-
- /**
- * Contains the name of the the entity.
- */
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Entity that = Entity.class.cast(o);
- return super.equals(that) &&
- equal(this.id, that.id) && equal(this.description, that.description) &&
- equal(this.tasks, that.tasks) && equal(this.name, that.name);
- }
-
- @Override
- public boolean clone(Object o) {
- if (this == o)
- return false;
- if (o == null || getClass() != o.getClass())
- return false;
- Entity that = Entity.class.cast(o);
- return super.clone(that);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), description, tasks, id, name);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("description", description).add("tasks", tasks).add("id", id).add("name", name);
- }
-}
[04/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java
deleted file mode 100644
index e4f0bbe..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java
+++ /dev/null
@@ -1,741 +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.vcloud.director.v1_5.internal;
-
-import static com.google.common.base.Predicates.and;
-import static com.google.common.base.Strings.emptyToNull;
-import static com.google.common.collect.Iterables.any;
-import static com.google.common.collect.Iterables.contains;
-import static com.google.common.collect.Iterables.find;
-import static com.google.common.collect.Iterables.getFirst;
-import static com.google.common.collect.Iterables.tryFind;
-import static org.jclouds.util.Predicates2.retry;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.ENTITY_NON_NULL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.URN_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CATALOG;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.MEDIA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ORG_NETWORK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.USER;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP_TEMPLATE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VDC;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VM;
-import static org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams.PowerAction.SHUTDOWN;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.relEquals;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.typeEquals;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Random;
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-
-import org.jclouds.apis.BaseContextLiveTest;
-import org.jclouds.date.DateService;
-import org.jclouds.io.Payloads;
-import org.jclouds.logging.Logger;
-import org.jclouds.rest.ApiContext;
-import org.jclouds.vcloud.director.testng.FormatApiResultsListener;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorContext;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.Catalog;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Link.Rel;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status;
-import org.jclouds.vcloud.director.v1_5.domain.Role.DefaultRoles;
-import org.jclouds.vcloud.director.v1_5.domain.RoleReferences;
-import org.jclouds.vcloud.director.v1_5.domain.Session;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.User;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiationParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.features.TaskApi;
-import org.jclouds.vcloud.director.v1_5.features.VAppApi;
-import org.jclouds.vcloud.director.v1_5.features.VAppTemplateApi;
-import org.jclouds.vcloud.director.v1_5.features.VdcApi;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-import org.jclouds.vcloud.director.v1_5.predicates.ReferencePredicates;
-import org.jclouds.vcloud.director.v1_5.predicates.TaskStatusEquals;
-import org.jclouds.vcloud.director.v1_5.predicates.TaskSuccess;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.reflect.TypeToken;
-import com.google.inject.Guice;
-
-@Listeners(FormatApiResultsListener.class)
-@Test(groups = "live")
-public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<VCloudDirectorContext> {
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- protected static final long TASK_TIMEOUT_SECONDS = 100L;
- protected static final long LONG_TASK_TIMEOUT_SECONDS = 300L;
-
- public static final int REQUIRED_ADMIN_VM_QUOTA = 0;
- public static final int REQUIRED_USER_VM_QUOTA = 0;
-
- public Predicate<Task> retryTaskSuccess;
- public Predicate<Task> retryTaskSuccessLong;
-
- protected ApiContext<VCloudDirectorAdminApi> adminContext;
-
- protected Session adminSession;
- protected Session session;
-
- protected String orgId;
- protected Org org;
- protected String catalogId;
- private Catalog catalog;
- protected String vAppTemplateId;
- private VAppTemplate vAppTemplate;
- protected String mediaId;
- private Media media;
- protected String networkId;
- private Network network;
- protected String vdcId;
- private Vdc vdc;
- protected String userId;
- private User user;
-
- protected final Set<String> vAppNames = Sets.newLinkedHashSet();
- protected static final Random random = new Random();
-
- protected BaseVCloudDirectorApiLiveTest() {
- provider = "vcloud-director";
- }
-
- protected DateService dateService;
-
- protected static String testStamp;
-
- @BeforeClass(alwaysRun = true)
- protected void setupDateService() {
- dateService = Guice.createInjector().getInstance(DateService.class);
- assertNotNull(dateService);
- }
-
- /** Implement as required to populate xxxApi fields, or NOP */
- protected abstract void setupRequiredApis();
-
- @Inject
- protected void initTaskSuccess(TaskSuccess taskSuccess) {
- retryTaskSuccess = retry(taskSuccess, TASK_TIMEOUT_SECONDS * 1000L);
- }
-
- @Inject
- protected void initTaskSuccessLong(TaskSuccess taskSuccess) {
- retryTaskSuccessLong = retry(taskSuccess, LONG_TASK_TIMEOUT_SECONDS * 1000L);
- }
-
- @BeforeClass(groups = { "integration", "live" })
- public void setupContext() {
- super.setupContext();
- adminContext = context.getAdminContext();
-
- adminSession = adminContext.getApi().getCurrentSession();
- adminContext.utils().injector().injectMembers(this);
-
- session = context.getApi().getCurrentSession();
- context.utils().injector().injectMembers(this);
-
- initTestParametersFromPropertiesOrLazyDiscover();
- setupRequiredApis();
- }
-
- public static String getTestDateTimeStamp() {
- if (testStamp == null) {
- testStamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
- }
-
- return testStamp;
- }
-
- public Reference getRoleReferenceFor(String name) {
- return getRoleReferenceFor(name, adminContext);
- }
-
- public static Reference getRoleReferenceFor(String name, ApiContext<VCloudDirectorAdminApi> adminContext) {
- RoleReferences roles = adminContext.getApi().getQueryApi().roleReferencesQueryAll();
- // backend in a builder to strip out unwanted xml cruft that the api chokes on
- return Reference.builder().fromReference(find(roles.getReferences(), ReferencePredicates.nameEquals(name)))
- .build();
- }
-
- public User randomTestUser(String prefix) {
- return randomTestUser(prefix, getRoleReferenceFor(DefaultRoles.USER.value()));
- }
-
- public User randomTestUser(String prefix, Reference role) {
- return User.builder().name(name(prefix) + getTestDateTimeStamp()).fullName("testFullName")
- .emailAddress("test@test.com").telephone("555-1234").isEnabled(false).im("testIM").isAlertEnabled(false)
- .alertEmailPrefix("testPrefix").alertEmail("testAlert@test.com").isExternal(false).isGroupRole(false)
- .role(role).password("password").build();
- }
-
- protected void initTestParametersFromPropertiesOrLazyDiscover() {
- catalogId = emptyToNull(System.getProperty("test." + provider + ".catalog-id"));
-
- vAppTemplateId = emptyToNull(System.getProperty("test." + provider + ".vapptemplate-id"));
-
- vdcId = emptyToNull(System.getProperty("test." + provider + ".vdc-id"));
-
- mediaId = emptyToNull(System.getProperty("test." + provider + ".media-id"));
-
- networkId = emptyToNull(System.getProperty("test." + provider + ".network-id"));
-
- userId = emptyToNull(System.getProperty("test." + provider + ".user-id"));
-
- org = context
- .getApi()
- .getOrgApi()
- .get(find(context.getApi().getOrgApi().list(), ReferencePredicates.<Reference> nameEquals(session.get()))
- .getHref());
- orgId = org.getId();
-
- if (any(Lists.newArrayList(vAppTemplateId, networkId, vdcId), Predicates.isNull())) {
-
- if (vdcId == null) {
- vdc = context.getApi().getVdcApi()
- .get(find(org.getLinks(), ReferencePredicates.<Link> typeEquals(VDC)).getHref());
- vdcId = vdc.getId();
-
- if (vAppTemplateId == null) {
- Optional<VAppTemplate> optionalvAppTemplate = tryFindVAppTemplateInOrg();
- if (optionalvAppTemplate.isPresent()) {
- vAppTemplate = optionalvAppTemplate.get();
- vAppTemplateId = vAppTemplate.getId();
- }
- }
- }
-
- if (networkId == null) {
- Optional<Network> optionalNetwork = tryFindBridgedNetworkInOrg();
- if (optionalNetwork.isPresent()) {
- network = optionalNetwork.get();
- networkId = network.getId();
- }
- }
-
- if (catalogId == null) {
- Optional<Catalog> optionalCatalog = tryFindWritableCatalogInOrg();
- if (optionalCatalog.isPresent()) {
- catalog = optionalCatalog.get();
- catalogId = catalog.getId();
- }
- }
- }
- }
-
- Function<VAppTemplate, String> prettyVAppTemplate = new Function<VAppTemplate, String>() {
-
- @Override
- public String apply(VAppTemplate input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
- .add("owner", input.getOwner()).toString();
- }
-
- };
-
- public Optional<VAppTemplate> tryFindVAppTemplateInOrg() {
- FluentIterable<VAppTemplate> vAppTemplates = FluentIterable.from(vdc.getResourceEntities())
- .filter(ReferencePredicates.<Reference> typeEquals(VAPP_TEMPLATE))
- .transform(new Function<Reference, VAppTemplate>() {
-
- @Override
- public VAppTemplate apply(Reference in) {
- return context.getApi().getVAppTemplateApi().get(in.getHref());
- }})
- .filter(Predicates.notNull());
-
- Optional<VAppTemplate> optionalVAppTemplate = tryFind(vAppTemplates, new Predicate<VAppTemplate>() {
-
- @Override
- public boolean apply(VAppTemplate input) {
- return input.getOwner().getUser().getName().equals(session.getUser());
- }
-
- });
-
- if (optionalVAppTemplate.isPresent()) {
- Logger.CONSOLE.info("found vAppTemplate: %s", prettyVAppTemplate.apply(optionalVAppTemplate.get()));
- } else {
- Logger.CONSOLE.warn("%s doesn't own any vApp Template in org %s; vApp templates: %s", context.getApi()
- .getCurrentSession().getUser(), org.getName(), Iterables.transform(vAppTemplates, prettyVAppTemplate));
- }
-
- return optionalVAppTemplate;
- }
-
- Function<Vm, String> prettyVm = new Function<Vm, String>() {
-
- @Override
- public String apply(Vm input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId()).toString();
- }
-
- };
-
- public Optional<Vm> tryFindVmInOrg() {
- FluentIterable<Vm> vms = FluentIterable.from(vdc.getResourceEntities())
- .filter(ReferencePredicates.<Reference> typeEquals(VM))
- .transform(new Function<Reference, Vm>() {
-
- @Override
- public Vm apply(Reference in) {
- return context.getApi().getVmApi().get(in.getHref());
- }})
- .filter(Predicates.notNull());
-
- Optional<Vm> optionalVm = tryFind(vms, new Predicate<Vm>() {
-
- @Override
- public boolean apply(Vm input) {
- return input.getId() != null;
- }
- });
-
- if (optionalVm.isPresent()) {
- Logger.CONSOLE.info("found vm: %s", prettyVm.apply(optionalVm.get()));
- } else {
- Logger.CONSOLE.warn("%s doesn't have any vm in org %s; vms: %s", context.getApi()
- .getCurrentSession().getUser(), org.getName(), Iterables.transform(vms, prettyVm));
- }
-
- return optionalVm;
- }
-
- Function<Catalog, String> prettyCatalog = new Function<Catalog, String>() {
-
- @Override
- public String apply(Catalog input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
- .add("owner", input.getOwner()).add("isPublished", input.isPublished()).toString();
- }
-
- };
-
- /**
- * If I can add to a catalog, I can write to it
- */
- public Optional<Catalog> tryFindWritableCatalogInOrg() {
- FluentIterable<Catalog> catalogs = FluentIterable.from(org.getLinks())
- .filter(ReferencePredicates.<Link> typeEquals(CATALOG)).transform(new Function<Link, Catalog>() {
- @Override
- public Catalog apply(Link in) {
- return context.getApi().getCatalogApi().get(in.getHref());
- }
- });
-
- Optional<Catalog> optionalCatalog = tryFind(catalogs, new Predicate<Catalog>() {
-
- @Override
- public boolean apply(Catalog input) {
- return Iterables.any(input.getLinks(), LinkPredicates.relEquals(Rel.ADD));
- }
-
- });
- if (optionalCatalog.isPresent()) {
- Logger.CONSOLE.info("found catalog: %s", prettyCatalog.apply(optionalCatalog.get()));
- } else {
- Logger.CONSOLE.warn("%s doesn't own any catalogs in org %s; catalogs: %s", context.getApi()
- .getCurrentSession().getUser(), org.getName(), Iterables.transform(catalogs, prettyCatalog));
- }
- return optionalCatalog;
- }
-
- Function<Network, String> prettyNetwork = new Function<Network, String>() {
-
- @Override
- public String apply(Network input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
- .add("fenceMode", input.getConfiguration().getFenceMode())
- .add("taskCount", input.getTasks().size() > 0 ? input.getTasks().size() : null).toString();
- }
-
- };
-
- public Optional<Network> tryFindBridgedNetworkInOrg() {
- FluentIterable<Network> networks = FluentIterable.from(org.getLinks())
- .filter(ReferencePredicates.<Link> typeEquals(ORG_NETWORK)).transform(new Function<Link, Network>() {
- @Override
- public Network apply(Link in) {
- return context.getApi().getNetworkApi().get(in.getHref());
- }
- });
-
- Optional<Network> optionalNetwork = tryFind(networks, new Predicate<Network>() {
-
- @Override
- public boolean apply(Network input) {
- if (input.getConfiguration().getFenceMode().equals(Network.FenceMode.BRIDGED)) {
- if (input.getTasks().size() == 0) {
- return true;
- }
- }
- return false;
- }
-
- });
- if (optionalNetwork.isPresent()) {
- Logger.CONSOLE.info("found network: %s", prettyNetwork.apply(optionalNetwork.get()));
- } else {
- Logger.CONSOLE.warn("no ready bridged networks present in org %s; networks: %s", org.getName(),
- Iterables.transform(networks, prettyNetwork));
- }
- return optionalNetwork;
- }
-
- public FluentIterable<Media> findAllEmptyMediaInOrg() {
- vdc = context.getApi().getVdcApi().get(vdc.getHref());
- return FluentIterable
- .from(vdc.getResourceEntities())
- .filter(ReferencePredicates.<Reference> typeEquals(MEDIA))
- .transform(new Function<Reference, Media>() {
-
- @Override
- public Media apply(Reference in) {
- return context.getApi().getMediaApi()
- .get(in.getHref());
- }
- }).filter(new Predicate<Media>() {
-
- @Override
- public boolean apply(Media input) {
- return input.getSize() == 0;
- }
- });
- }
-
- public void cleanUpVAppTemplateInOrg() {
- FluentIterable<VAppTemplate> vAppTemplates = FluentIterable
- .from(vdc.getResourceEntities())
- .filter(ReferencePredicates
- .<Reference> typeEquals(VAPP_TEMPLATE))
- .transform(new Function<Reference, VAppTemplate>() {
-
- @Override
- public VAppTemplate apply(Reference in) {
- return context.getApi().getVAppTemplateApi()
- .get(in.getHref());
- }
- }).filter(Predicates.notNull());
-
- Iterables.removeIf(vAppTemplates, new Predicate<VAppTemplate>() {
-
- @Override
- public boolean apply(VAppTemplate input) {
- if (input.getName().startsWith("captured-") || input.getName().startsWith("uploaded-") || input.getName().startsWith("vappTemplateClone-"))
- context.getApi().getVAppTemplateApi().remove(input.getHref());
- return false;
- }});
- }
-
- protected Vdc lazyGetVdc() {
- if (vdc == null) {
- assertNotNull(vdcId, String.format(URN_REQ_LIVE, VDC));
- vdc = context.getApi().getVdcApi().get(context.resolveIdToHref(vdcId));
- assertNotNull(vdc, String.format(ENTITY_NON_NULL, VDC));
- }
- return vdc;
- }
-
- protected Network lazyGetNetwork() {
- if (network == null) {
- assertNotNull(networkId, String.format(URN_REQ_LIVE, NETWORK));
- network = context.getApi().getNetworkApi().get(context.resolveIdToHref(networkId));
- assertNotNull(network, String.format(ENTITY_NON_NULL, NETWORK));
- }
- return network;
- }
-
- protected Catalog lazyGetCatalog() {
- if (catalog == null) {
- assertNotNull(catalogId, String.format(URN_REQ_LIVE, CATALOG));
- catalog = context.getApi().getCatalogApi().get(context.resolveIdToHref(catalogId));
- assertNotNull(catalog, String.format(ENTITY_NON_NULL, CATALOG));
- }
- return catalog;
- }
-
- protected User lazyGetUser() {
- if (user == null) {
- assertNotNull(userId, String.format(URN_REQ_LIVE, USER));
- user = adminContext.getApi().getUserApi().get(context.resolveIdToHref(userId));
- assertNotNull(user, String.format(ENTITY_NON_NULL, USER));
- }
- return user;
- }
-
- protected Media lazyGetMedia(){
- if (media == null || mediaId == null) {
- Predicate<Link> addMediaLink = and(relEquals(Link.Rel.ADD), typeEquals(VCloudDirectorMediaType.MEDIA));
- if (contains(lazyGetVdc().getLinks(), addMediaLink)) {
- Link addMedia = find(lazyGetVdc().getLinks(), addMediaLink);
- byte[] iso = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
-
- Media sourceMedia = Media.builder().type(VCloudDirectorMediaType.MEDIA).name(name("media"))
- .size(iso.length).imageType(Media.ImageType.ISO)
- .description("Test media generated by VmApiLiveTest").build();
- media = context.getApi().getMediaApi().add(addMedia.getHref(), sourceMedia);
-
- Link uploadLink = getFirst(getFirst(media.getFiles(), null).getLinks(), null);
- context.getApi().getUploadApi().upload(uploadLink.getHref(), Payloads.newPayload(iso));
-
- media = context.getApi().getMediaApi().get(media.getHref());
-
- if (media.getTasks().size() == 1) {
- Task uploadTask = Iterables.getOnlyElement(media.getTasks());
- Checks.checkTask(uploadTask);
- assertEquals(uploadTask.getStatus(), Task.Status.RUNNING);
- assertTrue(retryTaskSuccess.apply(uploadTask), String.format(TASK_COMPLETE_TIMELY, "uploadTask"));
- media = context.getApi().getMediaApi().get(media.getHref());
- }
- mediaId = media.getId();
- } else {
- media = context.getApi().getMediaApi().get(context.resolveIdToHref(mediaId));
- }
- }
- return media;
- }
-
- protected VAppTemplate lazyGetVAppTemplate() {
- if (vAppTemplate == null) {
- assertNotNull(vAppTemplateId, String.format(URN_REQ_LIVE, VAPP_TEMPLATE));
- vAppTemplate = context.getApi().getVAppTemplateApi().get(context.resolveIdToHref(vAppTemplateId));
- assertNotNull(vAppTemplate, String.format(ENTITY_NON_NULL, VAPP_TEMPLATE));
- }
- return vAppTemplate;
- }
-
- protected void assertTaskSucceeds(Task task) {
- assertTrue(retryTaskSuccess.apply(task), String.format(TASK_COMPLETE_TIMELY, task));
- }
-
- protected void assertTaskSucceedsLong(Task task) {
- assertTrue(retryTaskSuccessLong.apply(task), String.format(TASK_COMPLETE_TIMELY, task));
- }
-
- protected boolean taskStatusEventually(Task task, Task.Status running, ImmutableSet<Task.Status> immutableSet) {
- TaskApi taskApi = context.getApi().getTaskApi();
- TaskStatusEquals predicate = new TaskStatusEquals(taskApi, running, immutableSet);
- return retry(predicate, TASK_TIMEOUT_SECONDS * 1000L).apply(task);
- }
-
- protected void assertTaskStatusEventually(Task task, Task.Status running, ImmutableSet<Task.Status> immutableSet) {
- assertTrue(taskStatusEventually(task, running, immutableSet),
- String.format("Task '%s' must reach status %s", task.getOperationName(), running));
- }
-
- protected boolean taskDoneEventually(Task task) {
- TaskApi taskApi = context.getApi().getTaskApi();
- TaskStatusEquals predicate = new TaskStatusEquals(taskApi, ImmutableSet.of(Task.Status.ABORTED,
- Task.Status.CANCELED, Task.Status.ERROR, Task.Status.SUCCESS), ImmutableSet.<Task.Status> of());
- return retry(predicate, TASK_TIMEOUT_SECONDS * 1000L).apply(task);
- }
-
- protected void assertTaskDoneEventually(Task task) {
- assertTrue(taskDoneEventually(task), String.format("Task '%s' must complete", task.getOperationName()));
- }
-
- /**
- * Instantiate a {@link VApp} in a {@link Vdc} using the {@link VAppTemplate} we have configured
- * for the tests.
- *
- * @return the VApp that is being instantiated
- */
- protected VApp instantiateVApp() {
- return instantiateVApp(name("test-vapp-"));
- }
-
- protected VApp instantiateVApp(String name) {
- InstantiateVAppTemplateParams instantiate = InstantiateVAppTemplateParams.builder().name(name).notDeploy()
- .notPowerOn().description("Test VApp").instantiationParams(instantiationParams())
- .source(Reference.builder().href(lazyGetVAppTemplate().getHref()).build()).build();
-
- VdcApi vdcApi = context.getApi().getVdcApi();
- VApp vAppInstantiated = vdcApi.instantiateVApp(context.resolveIdToHref(vdcId), instantiate);
- assertNotNull(vAppInstantiated, String.format(ENTITY_NON_NULL, VAPP));
-
- Task instantiationTask = getFirst(vAppInstantiated.getTasks(), null);
- if (instantiationTask != null)
- assertTaskSucceedsLong(instantiationTask);
-
- // Save VApp name for cleanUp
- vAppNames.add(name);
-
- return vAppInstantiated;
- }
-
- /** Build an {@link InstantiationParams} object. */
- protected InstantiationParams instantiationParams() {
- InstantiationParams instantiationParams = InstantiationParams.builder()
- .sections(ImmutableSet.of(networkConfigSection())).build();
-
- return instantiationParams;
- }
-
- /** Build a {@link NetworkConfigSection} object. */
- private NetworkConfigSection networkConfigSection() {
- NetworkConfigSection networkConfigSection = NetworkConfigSection
- .builder()
- .info("Configuration parameters for logical networks")
- .networkConfigs(
- ImmutableSet.of(VAppNetworkConfiguration.builder()
- .networkName("vAppNetwork")
- .configuration(networkConfiguration()).build())).build();
-
- return networkConfigSection;
- }
-
- /** Build a {@link NetworkConfiguration} object. */
- private NetworkConfiguration networkConfiguration() {
- Vdc vdc = context.getApi().getVdcApi().get(context.resolveIdToHref(vdcId));
- assertNotNull(vdc, String.format(ENTITY_NON_NULL, VDC));
-
- Set<Reference> networks = vdc.getAvailableNetworks();
- network = lazyGetNetwork();
- // Look up the network in the Vdc with the id configured for the tests
- Optional<Reference> parentNetwork = tryFind(networks, new Predicate<Reference>() {
- @Override
- public boolean apply(Reference reference) {
- return reference.getHref().equals(network.getHref());
- }
- });
-
- // Check we actually found a network reference
- if (!parentNetwork.isPresent()) {
- fail(String.format("Could not find network %s in vdc", network.getHref().toASCIIString()));
- }
-
- // Build the configuration object
- NetworkConfiguration networkConfiguration = NetworkConfiguration.builder().parentNetwork(parentNetwork.get())
- .fenceMode(Network.FenceMode.BRIDGED).build();
-
- return networkConfiguration;
- }
-
- protected void cleanUpVAppTemplate(VAppTemplate vAppTemplate) {
- VAppTemplateApi vappTemplateApi = context.getApi().getVAppTemplateApi();
- try {
- Task task = vappTemplateApi.remove(vAppTemplate.getHref());
- taskDoneEventually(task);
- } catch (Exception e) {
- logger.warn(e, "Error deleting template '%s'", vAppTemplate.getName());
- }
- }
-
- protected void cleanUpVApp(VApp vApp) {
- VAppApi vAppApi = context.getApi().getVAppApi();
-
- URI href = vApp.getHref();
- vApp = vAppApi.get(href); // Refresh
- if (vApp == null) {
- logger.info("Cannot find VApp at %s", href);
- return; // Presumably vApp has already been removed. Ignore.
- }
- logger.debug("Deleting VApp %s (%s)", vApp.getName(), href);
-
- // Wait for busy tasks to complete (don't care if it's failed or successful)
- // Otherwise, get error on remove "entity is busy completing an operation.
- if (vApp.getTasks() != null) {
- for (Task task : vApp.getTasks()) {
- if (!taskDoneEventually(task)) {
- logger.warn("Task '%s' did not complete", task.getOperationName());
- }
- }
- }
-
- // power off the VApp if necessary
- if (vApp.getStatus() == Status.POWERED_ON) {
- try {
- Task shutdownTask = vAppApi.powerOff(href);
- taskDoneEventually(shutdownTask);
- } catch (Exception e) {
- // keep going; cleanup as much as possible
- logger.warn(e, "Continuing cleanup after error shutting down VApp %s", vApp.getName());
- }
- }
-
- // Undeploy the VApp if necessary
- if (vApp.isDeployed()) {
- try {
- UndeployVAppParams params = UndeployVAppParams.builder().undeployPowerAction(SHUTDOWN).build();
- Task undeployTask = vAppApi.undeploy(href, params);
- taskDoneEventually(undeployTask);
- } catch (Exception e) {
- // keep going; cleanup as much as possible
- logger.warn(e, "Continuing cleanup after error undeploying VApp %s", vApp.getName());
- }
- }
-
- try {
- Task task = vAppApi.remove(href);
- taskDoneEventually(task);
- vAppNames.remove(vApp.getName());
- logger.info("Deleted VApp %s", vApp.getName());
- } catch (Exception e) {
- vApp = vAppApi.get(href); // Refresh
- logger.warn(e, "Deleting VApp %s failed (%s)", vApp.getName(), href);
- }
- }
-
- public static String name(String prefix) {
- return prefix + Integer.toString(random.nextInt(Integer.MAX_VALUE));
- }
-
- @Override
- protected TypeToken<VCloudDirectorContext> contextType() {
- return TypeToken.of(VCloudDirectorContext.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java
deleted file mode 100644
index be2be4e..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorExpectTest.java
+++ /dev/null
@@ -1,176 +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.vcloud.director.v1_5.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Properties;
-
-import org.jclouds.Constants;
-import org.jclouds.date.DateService;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.internal.BaseRestApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.testng.annotations.BeforeGroups;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.net.HttpHeaders;
-import com.google.inject.Guice;
-import com.jamesmurty.utils.XMLBuilder;
-
-/**
- * Base class for writing vCloud Director REST api expect tests.
- */
-public abstract class BaseVCloudDirectorExpectTest<T> extends BaseRestApiExpectTest<T> {
-
- public BaseVCloudDirectorExpectTest() {
- provider = "vcloud-director";
- identity = String.format("%s@%s", user, org);
- credential = password;
- }
-
- public static final String user = "adrian@jclouds.org";
- public static final String org = "JClouds";
- public static final String password = "password";
- public static final String token = "mIaR3/6Lna8DWImd7/JPR5rK8FcUHabt+G/UCJV5pJQ=";
- public static final String endpoint = "https://vcloudbeta.bluelock.com/api";
-
- protected static DateService dateService;
-
- @BeforeGroups("unit")
- protected static void setupDateService() {
- dateService = Guice.createInjector().getInstance(DateService.class);
- assertNotNull(dateService);
- }
-
- @Override
- public Properties setupProperties() {
- Properties props = new Properties();
- props.put(Constants.PROPERTY_MAX_RETRIES, 1);
- props.put(Constants.PROPERTY_ENDPOINT, endpoint);
- return props;
- }
-
- @Override
- public HttpRequestComparisonType compareHttpRequestAsType(HttpRequest input) {
- if (input.getPayload() == null || input.getPayload().getContentMetadata().getContentLength() == 0) {
- return HttpRequestComparisonType.DEFAULT;
- }
- return HttpRequestComparisonType.XML;
- }
-
- protected HttpRequest loginRequest = HttpRequest.builder().method("POST")
- .endpoint(endpoint + "/sessions")
- .addHeader("Accept", "*/*")
- .addHeader("Authorization", "Basic YWRyaWFuQGpjbG91ZHMub3JnQEpDbG91ZHM6cGFzc3dvcmQ=")
- .build();
-
- protected HttpResponse sessionResponse = HttpResponse.builder()
- .statusCode(200)
- .headers(ImmutableMultimap.<String, String> builder()
- .put("x-vcloud-authorization", token)
- .put("Set-Cookie", String.format("vcloud-token=%s; Secure; Path=/", token))
- .build())
- .payload(payloadFromResourceWithContentType("/session.xml", VCloudDirectorMediaType.SESSION + ";version=1.5"))
- .build();
-
- /**
- * Implicitly adds x-vcloud-authorization header with token.
- * Provides convenience methods for priming a HttpRequest.Builder for vCloud testing
- *
- */
- @Deprecated
- public class VcloudHttpRequestPrimer {
- private Multimap<String, String> headers = LinkedListMultimap.create();
- private HttpRequest.Builder<?> builder = HttpRequest.builder();
-
- public VcloudHttpRequestPrimer() {
- }
-
- public VcloudHttpRequestPrimer apiCommand(String method, String command) {
- builder.method(method).endpoint(endpoint + command);
- return this;
- }
-
- public VcloudHttpRequestPrimer xmlFilePayload(String relativeFilePath, String mediaType) {
- builder.payload(payloadFromResourceWithContentType(relativeFilePath, mediaType));
- return this;
- }
-
- public VcloudHttpRequestPrimer headers(Multimap<String, String> headers) {
- this.headers.putAll(ImmutableMultimap.copyOf(checkNotNull(headers, "headers")));
- return this;
- }
-
- public VcloudHttpRequestPrimer acceptAnyMedia() {
- return acceptMedia(VCloudDirectorMediaType.ANY);
- }
-
- public VcloudHttpRequestPrimer acceptMedia(String media) {
- return header("Accept", media);
- }
-
- public VcloudHttpRequestPrimer header(String name, String value) {
- headers.put(checkNotNull(name, "header.name"), checkNotNull(value, "header.value"));
- return this;
- }
-
- public HttpRequest.Builder<?> httpRequestBuilder() {
- header("x-vcloud-authorization", token);
- header(HttpHeaders.COOKIE, "vcloud-token=" + token);
- builder.headers(headers);
- return builder;
- }
- }
-
- @Deprecated
- protected class VcloudHttpResponsePrimer {
- private HttpResponse.Builder<?> builder = HttpResponse.builder().statusCode(200);
-
- public VcloudHttpResponsePrimer() {
- }
-
- public VcloudHttpResponsePrimer xmlFilePayload(String relativeFilePath, String mediaType) {
- builder.payload(payloadFromResourceWithContentType(relativeFilePath, mediaType));
- return this;
- }
- public HttpResponse.Builder<?> httpResponseBuilder() {
- return builder;
- }
- }
-
- protected static XMLBuilder createXMLBuilder(String root){
- try {
- return XMLBuilder.create(root);
- } catch (Exception e) {
- throw Throwables.propagate(e);
- }
- }
-
- protected static String asString(XMLBuilder in){
- try {
- return in.asString();
- } catch (Exception e) {
- throw Throwables.propagate(e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminApiExpectTest.java
deleted file mode 100644
index 2ebca57..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorAdminApiExpectTest.java
+++ /dev/null
@@ -1,47 +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.vcloud.director.v1_5.internal;
-
-import java.util.Properties;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorContext;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-
-import com.google.common.base.Function;
-import com.google.inject.Module;
-
-public abstract class VCloudDirectorAdminApiExpectTest extends
- BaseVCloudDirectorExpectTest<VCloudDirectorAdminApi> implements
- Function<VCloudDirectorContext, VCloudDirectorAdminApi> {
-
- @Override
- public VCloudDirectorAdminApi createClient(Function<HttpRequest, HttpResponse> fn, Module module, Properties props) {
- return apply(createVCloudDirectorContext(fn, module, props));
- }
-
- @Override
- public VCloudDirectorAdminApi apply(VCloudDirectorContext input) {
- return input.getAdminContext().getApi();
- }
-
- private VCloudDirectorContext createVCloudDirectorContext(Function<HttpRequest, HttpResponse> fn, Module module,
- Properties props) {
- return createInjector(fn, module, props).getInstance(VCloudDirectorContext.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiExpectTest.java
deleted file mode 100644
index 183e8cc..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiExpectTest.java
+++ /dev/null
@@ -1,125 +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.vcloud.director.v1_5.login;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.providers.AnonymousProviderMetadata;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.internal.BaseRestApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Session;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMultimap;
-
-/**
- *
- * Allows us to test a api via its side effects.
- */
-@Test(groups = "unit", testName = "SessionApiExpectTest")
-public class SessionApiExpectTest extends BaseRestApiExpectTest<SessionApi> {
- public static final String user = "adrian@jclouds.org";
- public static final String org = "JClouds";
- public static final Session SESSION = Session.builder().user(user).org(org).href(
- URI.create("https://vcloudbeta.bluelock.com/api/session/")).addLink(
- Link.builder().rel("down").type("application/vnd.vmware.vcloud.orgList+xml").href(
- URI.create("https://vcloudbeta.bluelock.com/api/org/")).build()).addLink(
- Link.builder().rel("down").type("application/vnd.vmware.admin.vcloud+xml").href(
- URI.create("https://vcloudbeta.bluelock.com/api/admin/")).build()).addLink(
- Link.builder().rel("down").type("application/vnd.vmware.vcloud.query.queryList+xml").href(
- URI.create("https://vcloudbeta.bluelock.com/api/query")).build()).addLink(
- Link.builder().rel("entityResolver").type("application/vnd.vmware.vcloud.entity+xml").href(
- URI.create("https://vcloudbeta.bluelock.com/api/entity/")).build()).build();
-
- public void testWhenResponseIs2xxLoginReturnsValidSession() {
- URI loginUrl = URI.create("https://vcloudbeta.bluelock.com/api/sessions");
-
- String token = "mIaR3/6Lna8DWImd7/JPR5rK8FcUHabt+G/UCJV5pJQ=";
-
- SessionApi api = requestSendsResponse(
-
- HttpRequest.builder().method("POST").endpoint(loginUrl).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "*/*").put("Authorization",
- "Basic YWRyaWFuQGpjbG91ZHMub3JnQEpDbG91ZHM6cGFzc3dvcmQ=").build()).build(),
-
- HttpResponse.builder().statusCode(200).headers(
- ImmutableMultimap.<String, String> builder().put("x-vcloud-authorization", token).put("Set-Cookie",
- String.format("vcloud-token=%s; Secure; Path=/", token)).build())
- .payload(
- payloadFromResourceWithContentType("/session.xml", VCloudDirectorMediaType.SESSION + ";version=1.5")).build()
-
- );
-
- assertEquals(api.loginUserInOrgWithPassword(loginUrl, user, org, "password"), SessionWithToken.builder()
- .session(SESSION)
-
- .token(token).build());
-
- }
-
- public void testWhenResponseIs2xxGetSessionReturnsValidSession() {
- URI sessionUrl = URI.create("https://vcloudbeta.bluelock.com/api/session");
-
- String token = "mIaR3/6Lna8DWImd7/JPR5rK8FcUHabt+G/UCJV5pJQ=";
-
- SessionApi api = requestSendsResponse(
-
- HttpRequest.builder().method("GET").endpoint(sessionUrl).headers(
- ImmutableMultimap.<String, String> builder().put("x-vcloud-authorization", token).put("Accept", "*/*")
- .build()).build(),
-
- HttpResponse.builder().statusCode(200)
- .payload(
- payloadFromResourceWithContentType("/session.xml", VCloudDirectorMediaType.SESSION + ";version=1.5")).build()
-
- );
-
- assertEquals(api.getSessionWithToken(sessionUrl, token), SESSION);
-
- }
-
- public void testLogoutWhenResponseIs2xx() {
- URI sessionUrl = URI.create("https://vcloudbeta.bluelock.com/api/session");
-
- String token = "mIaR3/6Lna8DWImd7/JPR5rK8FcUHabt+G/UCJV5pJQ=";
-
- SessionApi api = requestSendsResponse(
-
- HttpRequest.builder().method("DELETE").endpoint(sessionUrl).headers(
- ImmutableMultimap.<String, String> builder().put("x-vcloud-authorization", token).put("Accept", "*/*")
- .build()).build(),
-
- HttpResponse.builder().statusCode(204).build()
-
- );
-
- api.logoutSessionWithToken(sessionUrl, token);
-
- }
-
- @Override
- protected ProviderMetadata createProviderMetadata() {
- return AnonymousProviderMetadata.forApiOnEndpoint(SessionApi.class, "https://vcloudbeta.bluelock.com/api");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiLiveTest.java
deleted file mode 100644
index e59757d..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionApiLiveTest.java
+++ /dev/null
@@ -1,103 +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.vcloud.director.v1_5.login;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-
-import org.jclouds.ContextBuilder;
-import org.jclouds.apis.BaseContextLiveTest;
-import org.jclouds.providers.AnonymousProviderMetadata;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.ApiContext;
-import org.jclouds.vcloud.director.testng.FormatApiResultsListener;
-import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-
-import com.google.common.reflect.TypeToken;
-
-/**
- * Tests behavior of {@link SessionApi}. Note this class is tested completely independently of
- * {@link VCloudDirectorApi} as it is a dependency of the {@code vcloud-director} context working.
- */
-@Listeners(FormatApiResultsListener.class)
-@Test(groups = { "live", "user" }, testName = "SessionApiLiveTest")
-public class SessionApiLiveTest extends BaseContextLiveTest<ApiContext<SessionApi>> {
-
- public SessionApiLiveTest() {
- provider = "vcloud-director";
- }
-
- @Override
- @BeforeGroups(groups = { "live" })
- public void setupContext() {
- super.setupContext();
- // session api isn't typically exposed to the user, as it is implicit
- api = context.getApi();
- }
-
- private SessionApi api;
- private SessionWithToken sessionWithToken;
-
- @Test(description = "POST /sessions")
- public void testLogin() {
- String user = identity.substring(0, identity.lastIndexOf('@'));
- String org = identity.substring(identity.lastIndexOf('@') + 1);
- String password = credential;
-
- sessionWithToken = api.loginUserInOrgWithPassword(URI.create(endpoint + "/sessions"), user, org, password);
- assertEquals(sessionWithToken.getSession().getUser(), user);
- assertEquals(sessionWithToken.getSession().get(), org);
- assertTrue(sessionWithToken.getSession().getLinks().size() > 0);
- assertNotNull(sessionWithToken.getToken());
- }
-
- @Test(description = "GET /session", dependsOnMethods = "testLogin")
- public void testGetSession() {
- assertEquals(api.getSessionWithToken(sessionWithToken.getSession().getHref(), sessionWithToken.getToken()),
- sessionWithToken.getSession());
- }
-
- @Test(description = "DELETE /session", dependsOnMethods = "testGetSession")
- public void testLogout() {
- api.logoutSessionWithToken(sessionWithToken.getSession().getHref(), sessionWithToken.getToken());
- }
-
- @Override
- protected TypeToken<ApiContext<SessionApi>> contextType() {
- return new TypeToken<ApiContext<SessionApi>>() {
- };
- }
-
- @Override
- protected ProviderMetadata createProviderMetadata() {
- return AnonymousProviderMetadata.forApiOnEndpoint(SessionApi.class, endpoint);
- }
-
- @Override
- protected ContextBuilder newBuilder() {
- ProviderMetadata pm = createProviderMetadata();
- ContextBuilder builder = ContextBuilder.newBuilder(pm);
- return builder;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicatesTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicatesTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicatesTest.java
deleted file mode 100644
index ba4350c..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicatesTest.java
+++ /dev/null
@@ -1,58 +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.vcloud.director.v1_5.predicates;
-
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.relEquals;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.typeEquals;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "LinkPredicatesTest")
-public class LinkPredicatesTest {
- Link ref = Link.builder().type("application/vnd.vmware.vcloud.media+xml").rel("add").href(
- URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media"))
- .build();
-
- @Test
- public void testRelEqualsWhenEqual() {
- assert relEquals(Link.Rel.ADD).apply(ref);
- }
-
- @Test
- public void testRelEqualsWhenEqualString() {
- assert relEquals("add").apply(ref);
- }
-
- @Test
- public void testRelEqualsWhenNotEqual() {
- assert !relEquals("foo").apply(ref);
- }
-
- @Test
- public void testTypeEqualsWhenEqual() {
- assert typeEquals(VCloudDirectorMediaType.MEDIA).apply(ref);
- }
-
- @Test
- public void testTypeEqualsWhenNotEqual() {
- assert !typeEquals("foo").apply(ref);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicatesTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicatesTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicatesTest.java
deleted file mode 100644
index efe4a16..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicatesTest.java
+++ /dev/null
@@ -1,74 +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.vcloud.director.v1_5.predicates;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit", testName = "ReferencePredicatesTest")
-public class ReferencePredicatesTest {
- Reference ref = Reference.builder().type("application/vnd.vmware.vcloud.catalogItem+xml").name("image").href(
- URI.create("https://vcloudbeta.bluelock.com/api/catalogItem/67a469a1-aafe-4b5b-bb31-a6202ad8961f")).build();
-
- @Test
- public void testNameEqualsWhenEqual() {
- assertTrue(ReferencePredicates.<Reference> nameEquals("image").apply(ref));
- }
-
- @Test
- public void testNameEqualsWhenNotEqual() {
- assertFalse(ReferencePredicates.<Reference> nameEquals("foo").apply(ref));
- }
-
- @Test
- public void testNameStartsWithWhenStartsWith() {
- assertTrue(ReferencePredicates.<Reference> nameStartsWith("i").apply(ref));
- }
-
- @Test
- public void testNameStartsWithWhenNotStartsWith() {
- assertFalse(ReferencePredicates.<Reference> nameStartsWith("f").apply(ref));
- }
-
- @Test
- public void testNameInWhenIn() {
- assertTrue(ReferencePredicates.<Reference> nameIn(ImmutableSet.of("one", "two", "image")).apply(ref));
- }
-
- @Test
- public void testNameInWhenNotIn() {
- assertFalse(ReferencePredicates.<Reference> nameIn(ImmutableSet.of("one", "two", "foo")).apply(ref));
- }
-
- @Test
- public void testTypeEqualsWhenEqual() {
- assertTrue(ReferencePredicates.<Reference> typeEquals(VCloudDirectorMediaType.CATALOG_ITEM).apply(ref));
- }
-
- @Test
- public void testTypeEqualsWhenNotEqual() {
- assertFalse(ReferencePredicates.<Reference> typeEquals("foo").apply(ref));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/adddCatalogItem.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/adddCatalogItem.xml b/vcloud-director/src/test/resources/catalog/adddCatalogItem.xml
deleted file mode 100644
index 39021f9..0000000
--- a/vcloud-director/src/test/resources/catalog/adddCatalogItem.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CatalogItem xmlns="http://www.vmware.com/vcloud/v1.5" name="newCatalogItem" id="urn:vcloud:catalogitem:a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <Description>New Catalog Item</Description>
- <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"/>
-</CatalogItem>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/addCatalog.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/addCatalog.xml b/vcloud-director/src/test/resources/catalog/admin/addCatalog.xml
deleted file mode 100644
index 8c3c6d8..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/addCatalog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AdminCatalog xmlns="http://www.vmware.com/vcloud/v1.5" name="Test Catalog" id="urn:vcloud:catalog:c56d9159-7838-446f-bb35-9ee12dfbbef3" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.admin.organization+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3/owner"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3/catalogItems"/>
- <Link rel="edit" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3/metadata"/>
- <Description>created by testCreateCatalog()</Description>
- <Tasks>
- <Task status="running" startTime="2012-03-11T18:43:02.429-04:00" operationName="catalogCreateCatalog" operation="Creating Catalog Test Catalog(c56d9159-7838-446f-bb35-9ee12dfbbef3)" expiryTime="2012-06-09T18:43:02.429-04:00" name="task" id="urn:vcloud:task:20f556f9-9125-4090-9092-0da9f72bedf4" type="application/vnd.vmware.vcloud.task+xml" href="https://vcloudbeta.bluelock.com/api/task/20f556f9-9125-4090-9092-0da9f72bedf4">
- <Link rel="task:cancel" href="https://vcloudbeta.bluelock.com/api/task/20f556f9-9125-4090-9092-0da9f72bedf4/action/cancel"/>
- <Owner type="application/vnd.vmware.vcloud.catalog+xml" name="Test Catalog" href="https://vcloudbeta.bluelock.com/api/catalog/c56d9159-7838-446f-bb35-9ee12dfbbef3"/>
- <User type="application/vnd.vmware.admin.user+xml" name="dan@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"/>
- <Organization type="application/vnd.vmware.vcloud.org+xml" name="JClouds" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- </Task>
- </Tasks>
- <CatalogItems/>
- <IsPublished>false</IsPublished>
-</AdminCatalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/addCatalogSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/addCatalogSource.xml b/vcloud-director/src/test/resources/catalog/admin/addCatalogSource.xml
deleted file mode 100644
index cf9639a..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/addCatalogSource.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<AdminCatalog name="Test Catalog" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Description>created by testCreateCatalog()</Description>
-</AdminCatalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/catalog.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/catalog.xml b/vcloud-director/src/test/resources/catalog/admin/catalog.xml
deleted file mode 100644
index e116661..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/catalog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AdminCatalog xmlns="http://www.vmware.com/vcloud/v1.5" name="QunyingTestCatalog" id="urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.admin.organization+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/catalogItems"/>
- <Link rel="edit" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata"/>
- <Description>Testing</Description>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="qunying.huang@enstratus.com" href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"/>
- </Owner>
- <CatalogItems>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="image" href="https://vcloudbeta.bluelock.com/api/catalogItem/67a469a1-aafe-4b5b-bb31-a6202ad8961f"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="imageTesting" href="https://vcloudbeta.bluelock.com/api/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="TestCase" href="https://vcloudbeta.bluelock.com/api/catalogItem/f7598606-aea4-41d7-8f67-2090e28e7876"/>
- </CatalogItems>
- <IsPublished>false</IsPublished>
-</AdminCatalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/editCatalog.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/editCatalog.xml b/vcloud-director/src/test/resources/catalog/admin/editCatalog.xml
deleted file mode 100644
index 76cd19e..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/editCatalog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AdminCatalog xmlns="http://www.vmware.com/vcloud/v1.5" name="new QunyingTestCatalog" id="urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.admin.organization+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/catalogItems"/>
- <Link rel="edit" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata"/>
- <Description>new Testing</Description>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="qunying.huang@enstratus.com" href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"/>
- </Owner>
- <CatalogItems>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="image" href="https://vcloudbeta.bluelock.com/api/catalogItem/67a469a1-aafe-4b5b-bb31-a6202ad8961f"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="imageTesting" href="https://vcloudbeta.bluelock.com/api/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="TestCase" href="https://vcloudbeta.bluelock.com/api/catalogItem/f7598606-aea4-41d7-8f67-2090e28e7876"/>
- </CatalogItems>
- <IsPublished>false</IsPublished>
-</AdminCatalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/editCatalogSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/editCatalogSource.xml b/vcloud-director/src/test/resources/catalog/admin/editCatalogSource.xml
deleted file mode 100644
index 01fe2ff..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/editCatalogSource.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<AdminCatalog name="new QunyingTestCatalog" id="urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="up" type="application/vnd.vmware.admin.organization+xml" href="https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="alternate" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/catalogItems"/>
- <Link rel="edit" type="application/vnd.vmware.admin.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata"/>
- <Description>new Testing</Description>
- <Owner type="application/vnd.vmware.vcloud.owner+xml">
- <User type="application/vnd.vmware.admin.user+xml" name="qunying.huang@enstratus.com" href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"/>
- </Owner>
- <CatalogItems>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="image" href="https://vcloudbeta.bluelock.com/api/catalogItem/67a469a1-aafe-4b5b-bb31-a6202ad8961f"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="imageTesting" href="https://vcloudbeta.bluelock.com/api/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="TestCase" href="https://vcloudbeta.bluelock.com/api/catalogItem/f7598606-aea4-41d7-8f67-2090e28e7876"/>
- </CatalogItems>
- <IsPublished>false</IsPublished>
-</AdminCatalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/editOwnerSource.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/editOwnerSource.xml b/vcloud-director/src/test/resources/catalog/admin/editOwnerSource.xml
deleted file mode 100644
index 04c2b7d..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/editOwnerSource.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Owner type="application/vnd.vmware.vcloud.owner+xml" xmlns="http://www.vmware.com/vcloud/v1.5">
- <User type="application/vnd.vmware.admin.user+xml" name="adk@cloudsoftcorp.com" href="https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"/>
-</Owner>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/owner.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/owner.xml b/vcloud-director/src/test/resources/catalog/admin/owner.xml
deleted file mode 100644
index ac4a908..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/owner.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Owner xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.owner+xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.owner+xml" href="https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/owner"/>
- <User type="application/vnd.vmware.admin.user+xml" name="qunying.huang@enstratus.com" href="https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"/>
-</Owner>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/admin/publishCatalogParams.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/admin/publishCatalogParams.xml b/vcloud-director/src/test/resources/catalog/admin/publishCatalogParams.xml
deleted file mode 100644
index 3065fac..0000000
--- a/vcloud-director/src/test/resources/catalog/admin/publishCatalogParams.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PublishCatalogParams xmlns="http://www.vmware.com/vcloud/v1.5">
- <IsPublished>true</IsPublished>
-</PublishCatalogParams>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/catalog.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/catalog.xml b/vcloud-director/src/test/resources/catalog/catalog.xml
deleted file mode 100644
index f7fe4d9..0000000
--- a/vcloud-director/src/test/resources/catalog/catalog.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Catalog xmlns="http://www.vmware.com/vcloud/v1.5" name="QunyingTestCatalog" id="urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" href="https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"/>
- <Link rel="add" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/catalogItems"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata"/>
- <Description>Testing</Description>
- <CatalogItems>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <CatalogItem type="application/vnd.vmware.vcloud.catalogItem+xml" name="imageTesting" href="https://vcloudbeta.bluelock.com/api/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939"/>
- </CatalogItems>
- <IsPublished>false</IsPublished>
-</Catalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/catalogItem.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/catalogItem.xml b/vcloud-director/src/test/resources/catalog/catalogItem.xml
deleted file mode 100644
index 6157c73..0000000
--- a/vcloud-director/src/test/resources/catalog/catalogItem.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<CatalogItem name="ubuntu10" id="urn:vcloud:catalogitem:a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <Description>For testing</Description>
- <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"/>
-</CatalogItem>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/catalogItemMetadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/catalogItemMetadata.xml b/vcloud-director/src/test/resources/catalog/catalogItemMetadata.xml
deleted file mode 100644
index e642235..0000000
--- a/vcloud-director/src/test/resources/catalog/catalogItemMetadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <MetadataEntry xmlns="http://www.vmware.com/vcloud/v1.5" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata/KEY" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata"/>
- <Key>KEY</Key>
- <Value>VALUE</Value>
- </MetadataEntry>
-</Metadata>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/catalogItemMetadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/catalogItemMetadataValue.xml b/vcloud-director/src/test/resources/catalog/catalogItemMetadataValue.xml
deleted file mode 100644
index 3c623ae..0000000
--- a/vcloud-director/src/test/resources/catalog/catalogItemMetadataValue.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata/KEY" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata"/>
- <Value>VALUE</Value>
-</MetadataValue>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/catalogMetadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/catalogMetadata.xml b/vcloud-director/src/test/resources/catalog/catalogMetadata.xml
deleted file mode 100644
index 3db76a6..0000000
--- a/vcloud-director/src/test/resources/catalog/catalogMetadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <MetadataEntry xmlns="http://www.vmware.com/vcloud/v1.5" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata/KEY" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata"/>
- <Key>KEY</Key>
- <Value>VALUE</Value>
- </MetadataEntry>
-</Metadata>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/catalogMetadataValue.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/catalogMetadataValue.xml b/vcloud-director/src/test/resources/catalog/catalogMetadataValue.xml
deleted file mode 100644
index 6f7e446..0000000
--- a/vcloud-director/src/test/resources/catalog/catalogMetadataValue.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MetadataValue xmlns="http://www.vmware.com/vcloud/v1.5" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata/KEY" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
- <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4/metadata"/>
- <Value>VALUE</Value>
-</MetadataValue>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/editCatalogItem.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/editCatalogItem.xml b/vcloud-director/src/test/resources/catalog/editCatalogItem.xml
deleted file mode 100644
index 6157c73..0000000
--- a/vcloud-director/src/test/resources/catalog/editCatalogItem.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<CatalogItem name="ubuntu10" id="urn:vcloud:catalogitem:a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df" xmlns="http://www.vmware.com/vcloud/v1.5">
- <Link rel="up" type="application/vnd.vmware.vcloud.catalog+xml" href="https://vcloudbeta.bluelock.com/api/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"/>
- <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df/metadata"/>
- <Link rel="edit" type="application/vnd.vmware.vcloud.catalogItem+xml" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <Link rel="remove" href="https://vcloudbeta.bluelock.com/api/catalogItem/a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df"/>
- <Description>For testing</Description>
- <Entity type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="ubuntu10" href="https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"/>
-</CatalogItem>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/resources/catalog/mergeCatalogItemMetadata.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/resources/catalog/mergeCatalogItemMetadata.xml b/vcloud-director/src/test/resources/catalog/mergeCatalogItemMetadata.xml
deleted file mode 100644
index 5f76b5f..0000000
--- a/vcloud-director/src/test/resources/catalog/mergeCatalogItemMetadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Metadata xmlns="http://www.vmware.com/vcloud/v1.5">
- <MetadataEntry>
- <Key>KEY</Key>
- <Value>VALUE</Value>
- </MetadataEntry>
-</Metadata>
[22/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
deleted file mode 100644
index 3a6f397..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
+++ /dev/null
@@ -1,289 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The AdminOrg represents an administrative view of an organization.
- * It includes all members of the Org element, and adds several
- * elements that can be viewed and modified only by system administrators.
- * <p/> The organization might be enabled or disabled. If
- * enabled, the organization allows login and all other operations.
- */
-@XmlRootElement(name = "AdminOrg")
-@XmlType(propOrder = {
- "settings",
- "users",
- "groups",
- "catalogs",
- "vdcs",
- "networks"
-})
-public class AdminOrg extends Org {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromAdminOrg(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Org.Builder<B> {
-
- private OrgSettings settings;
- private Set<Reference> users = Sets.newLinkedHashSet();
- private Set<Reference> groups = Sets.newLinkedHashSet();
- private Set<Reference> catalogs = Sets.newLinkedHashSet();
- private Set<Reference> vdcs = Sets.newLinkedHashSet();
- private Set<Reference> networks = Sets.newLinkedHashSet();
-
- /**
- * @see AdminOrg#getSettings()
- */
- public B settings(OrgSettings settings) {
- this.settings = settings;
- return self();
- }
-
- /**
- * @see AdminOrg#getUsers()
- */
- public B users(Iterable<Reference> users) {
- this.users = Sets.newLinkedHashSet(checkNotNull(users, "users"));
- return self();
- }
-
- /**
- * @see AdminOrg#getUsers()
- */
- public B user(Reference user) {
- users.add(checkNotNull(user, "user"));
- return self();
- }
-
- /**
- * @see AdminOrg#getGroups()
- */
- public B groups(Iterable<Reference> groups) {
- this.groups = Sets.newLinkedHashSet(checkNotNull(groups, "groups"));
- return self();
- }
-
- /**
- * @see AdminOrg#getGroups()
- */
- public B group(Reference group) {
- groups.add(checkNotNull(group, "group"));
- return self();
- }
- /**
- * @see AdminOrg#getCatalogs()
- */
- public B catalogs(Iterable<Reference> catalogReferences) {
- this.catalogs = Sets.newLinkedHashSet(checkNotNull(catalogs, "catalogs"));
- return self();
- }
-
- /**
- * @see AdminOrg#getCatalogs()
- */
- public B catalog(Reference catalog) {
- this.catalogs.add(checkNotNull(catalog, "catalog"));
- return self();
- }
- /**
- * @see AdminOrg#getVdcs()
- */
- public B vdcs(Iterable<Reference> vdcs) {
- this.vdcs = Sets.newLinkedHashSet(checkNotNull(vdcs, "vdcs"));
- return self();
- }
-
- /**
- * @see AdminOrg#getVdcs()
- */
- public B vdc(Reference vdc) {
- this.vdcs.add(checkNotNull(vdc, "vdc"));
- return self();
- }
-
- /**
- * @see AdminOrg#getNetworks()
- */
- public B networks(Iterable<Reference> networks) {
- this.networks = Sets.newLinkedHashSet(checkNotNull(networks, "networks"));
- return self();
- }
-
- /**
- * @see AdminOrg#getNetworks()
- */
- public B network(Reference network) {
- this.networks.add(checkNotNull(network, "network"));
- return self();
- }
-
- @Override
- public AdminOrg build() {
- return new AdminOrg(this);
- }
-
- public B fromAdminOrg(AdminOrg in) {
- return fromOrg(in)
- .settings(in.getSettings())
- .users(in.getUsers())
- .groups(in.getGroups())
- .catalogs(in.getCatalogs())
- .vdcs(in.getVdcs())
- .networks(in.getNetworks());
- }
- }
-
- protected AdminOrg() {
- // For JAXB
- }
-
- protected AdminOrg(Builder<?> builder) {
- super(builder);
- this.settings = builder.settings;
- this.users = builder.users == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.users);
- this.groups = builder.groups == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.groups);
- this.catalogs = builder.catalogs == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.catalogs);
- this.vdcs = builder.vdcs == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.vdcs);
- this.networks = builder.networks == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.networks);
- }
-
- @XmlElement(name = "Settings", required = true)
- private OrgSettings settings;
- @XmlElementWrapper(name = "Users")
- @XmlElement(name = "UserReference")
- protected Set<Reference> users = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Groups")
- @XmlElement(name = "GroupReference")
- protected Set<Reference> groups = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Catalogs")
- @XmlElement(name = "CatalogReference")
- private Set<Reference> catalogs = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Vdcs")
- @XmlElement(name = "Vdc")
- protected Set<Reference> vdcs = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Networks")
- @XmlElement(name = "Network")
- protected Set<Reference> networks = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the settings property.
- */
- public OrgSettings getSettings() {
- return settings;
- }
-
- /**
- * Gets the value of the users property.
- */
- public Set<Reference> getUsers() {
- return users;
- }
-
- /**
- * Gets the value of the groups property.
- */
- public Set<Reference> getGroups() {
- return groups;
- }
-
- /**
- * Gets the value of the catalogs property.
- */
- public Set<Reference> getCatalogs() {
- return catalogs;
- }
-
- /**
- * Gets the value of the vdcs property.
- */
- public Set<Reference> getVdcs() {
- return vdcs;
- }
-
- /**
- * Gets the value of the networks property.
- */
- public Set<Reference> getNetworks() {
- return networks;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- AdminOrg that = AdminOrg.class.cast(o);
- return super.equals(that) &&
- equal(settings, that.settings) &&
- equal(users, that.users) &&
- equal(groups, that.groups) &&
- equal(catalogs, that.catalogs) &&
- equal(vdcs, that.vdcs) &&
- equal(networks, that.networks);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- settings,
- users,
- groups,
- catalogs,
- vdcs,
- networks);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("settings", settings)
- .add("users", users)
- .add("groups", groups)
- .add("catalogs", catalogs)
- .add("vdcs", vdcs)
- .add("networks", networks);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
deleted file mode 100644
index 39fff36..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
+++ /dev/null
@@ -1,576 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Used when OrgLdapMode=CUSTOM to define connection details for
- * the organization's LDAP service.
- */
-@XmlType(name = "CustomOrgLdapSettings", propOrder = {
- "hostName",
- "port",
- "isSsl",
- "isSslAcceptAll",
- "realm",
- "searchBase",
- "userName",
- "password",
- "authenticationMechanism",
- "groupSearchBase",
- "isGroupSearchBaseEnabled",
- "connectorType",
- "userAttributes",
- "groupAttributes"
-})
-public class CustomOrgLdapSettings {
- @XmlType
- @XmlEnum(String.class)
- public static enum AuthenticationMechanism {
- @XmlEnumValue("simple") SIMPLE("simple"),
- @XmlEnumValue("kerberos") KERBEROS("kerberos"),
- @XmlEnumValue("md5digest") MD5DIGEST("md5digest"),
- @XmlEnumValue("ntlm") NTLM("ntlm"),
- UNRECOGNIZED("unrecognized");
-
- public static final List<AuthenticationMechanism> ALL = ImmutableList.of(
- SIMPLE, KERBEROS, MD5DIGEST, NTLM);
-
- protected final String stringValue;
-
- AuthenticationMechanism(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, AuthenticationMechanism> AUTHENTICATION_MECHANISM_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(AuthenticationMechanism.values()), new Function<AuthenticationMechanism, String>() {
- @Override
- public String apply(AuthenticationMechanism input) {
- return input.stringValue;
- }
- });
-
- public static AuthenticationMechanism fromValue(String value) {
- AuthenticationMechanism authMechanism = AUTHENTICATION_MECHANISM_BY_ID.get(checkNotNull(value, "stringValue"));
- return authMechanism == null ? UNRECOGNIZED : authMechanism;
- }
- }
-
- @XmlType
- @XmlEnum(String.class)
- public static enum ConnectorType {
- @XmlEnumValue("ACTIVE_DIRECTORY") ACTIVE_DIRECTORY("ACTIVE_DIRECTORY"),
- @XmlEnumValue("OPEN_LDAP") OPEN_LDAP("OPEN_LDAP"),
- UNRECOGNIZED("unrecognized");
-
- public static final List<ConnectorType> ALL = ImmutableList.of(
- ACTIVE_DIRECTORY, OPEN_LDAP);
-
- protected final String stringValue;
-
- ConnectorType(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, ConnectorType> CONNECTOR_TYPE_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(ConnectorType.values()), new Function<ConnectorType, String>() {
- @Override
- public String apply(ConnectorType input) {
- return input.stringValue;
- }
- });
-
- public static ConnectorType fromValue(String value) {
- ConnectorType type = CONNECTOR_TYPE_BY_ID.get(checkNotNull(value, "stringValue"));
- return type == null ? UNRECOGNIZED : type;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromCustomOrgLdapSettings(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- private String hostName;
- private int port;
- private Boolean isSsl;
- private Boolean isSslAcceptAll;
- private String realm;
- private String searchBase;
- private String userName;
- private String password;
- private String authenticationMechanism;
- private String groupSearchBase;
- private boolean isGroupSearchBaseEnabled;
- private String connectorType;
- private OrgLdapUserAttributes userAttributes;
- private OrgLdapGroupAttributes groupAttributes;
-
- /**
- * @see CustomOrgLdapSettings#getHostName()
- */
- public T hostName(String hostName) {
- this.hostName = hostName;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getPort()
- */
- public T port(int port) {
- this.port = port;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getIsSsl()
- */
- public T isSsl(Boolean isSsl) {
- this.isSsl = isSsl;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getIsSslAcceptAll()
- */
- public T isSslAcceptAll(Boolean isSslAcceptAll) {
- this.isSslAcceptAll = isSslAcceptAll;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getRealm()
- */
- public T realm(String realm) {
- this.realm = realm;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getSearchBase()
- */
- public T searchBase(String searchBase) {
- this.searchBase = searchBase;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getUserName()
- */
- public T userName(String userName) {
- this.userName = userName;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getPassword()
- */
- public T password(String password) {
- this.password = password;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getAuthenticationMechanism()
- */
- public T authenticationMechanism(String authenticationMechanism) {
- this.authenticationMechanism = authenticationMechanism;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getGroupSearchBase()
- */
- public T groupSearchBase(String groupSearchBase) {
- this.groupSearchBase = groupSearchBase;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getIsGroupSearchBaseEnabled()
- */
- public T isGroupSearchBaseEnabled(boolean isGroupSearchBaseEnabled) {
- this.isGroupSearchBaseEnabled = isGroupSearchBaseEnabled;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getConnectorType()
- */
- public T connectorType(String connectorType) {
- this.connectorType = connectorType;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getUserAttributes()
- */
- public T userAttributes(OrgLdapUserAttributes userAttributes) {
- this.userAttributes = userAttributes;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getGroupAttributes()
- */
- public T groupAttributes(OrgLdapGroupAttributes groupAttributes) {
- this.groupAttributes = groupAttributes;
- return self();
- }
-
-
- public CustomOrgLdapSettings build() {
- return new CustomOrgLdapSettings(hostName, port, isSsl, isSslAcceptAll,
- realm, searchBase, userName, password, authenticationMechanism,
- groupSearchBase, isGroupSearchBaseEnabled, connectorType,
- userAttributes, groupAttributes);
- }
-
-
- public T fromCustomOrgLdapSettings(CustomOrgLdapSettings in) {
- return hostName(in.getHostName())
- .port(in.getPort())
- .isSsl(in.isSsl())
- .isSslAcceptAll(in.isSslAcceptAll())
- .realm(in.getRealm())
- .searchBase(in.getSearchBase())
- .userName(in.getUserName())
- .password(in.getPassword())
- .authenticationMechanism(in.getAuthenticationMechanism())
- .groupSearchBase(in.getGroupSearchBase())
- .isGroupSearchBaseEnabled(in.isGroupSearchBaseEnabled())
- .connectorType(in.getConnectorType())
- .userAttributes(in.getUserAttributes())
- .groupAttributes(in.getGroupAttributes());
- }
-
- }
-
- public static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- protected CustomOrgLdapSettings() {
- // For JAXB
- }
-
- private CustomOrgLdapSettings(String hostName, int port, Boolean isSsl,
- Boolean isSslAcceptAll, String realm, String searchBase, String userName,
- String password, String authenticationMechanism, String groupSearchBase,
- boolean isGroupSearchBaseEnabled, String connectorType,
- OrgLdapUserAttributes userAttributes, OrgLdapGroupAttributes groupAttributes) {
- this.hostName = hostName;
- this.port = port;
- this.isSsl = isSsl;
- this.password = password;
- this.authenticationMechanism = authenticationMechanism;
-
- }
-
-
-
- @XmlElement(name = "HostName", required = true)
- protected String hostName;
- @XmlElement(name = "Port")
- protected int port;
- @XmlElement(name = "IsSsl")
- protected Boolean isSsl;
- @XmlElement(name = "IsSslAcceptAll")
- protected Boolean isSslAcceptAll;
- @XmlElement(name = "Realm")
- protected String realm;
- @XmlElement(name = "SearchBase")
- protected String searchBase;
- @XmlElement(name = "UserName")
- protected String userName;
- @XmlElement(name = "Password")
- protected String password;
- @XmlElement(name = "AuthenticationMechanism", required = true)
- protected String authenticationMechanism;
- @XmlElement(name = "GroupSearchBase")
- protected String groupSearchBase;
- @XmlElement(name = "IsGroupSearchBaseEnabled")
- protected boolean isGroupSearchBaseEnabled;
- @XmlElement(name = "ConnectorType", required = true)
- protected String connectorType;
- @XmlElement(name = "UserAttributes", required = true)
- protected OrgLdapUserAttributes userAttributes;
- @XmlElement(name = "GroupAttributes", required = true)
- protected OrgLdapGroupAttributes groupAttributes;
-
- /**
- * Gets the value of the hostName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHostName() {
- return hostName;
- }
-
- /**
- * Gets the value of the port property.
- *
- */
- public int getPort() {
- return port;
- }
-
- /**
- * Gets the value of the isSsl property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isSsl() {
- return isSsl;
- }
-
-
- /**
- * Gets the value of the isSslAcceptAll property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isSslAcceptAll() {
- return isSslAcceptAll;
- }
-
- /**
- * Gets the value of the realm property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRealm() {
- return realm;
- }
-
- /**
- * Gets the value of the searchBase property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSearchBase() {
- return searchBase;
- }
-
- /**
- * Gets the value of the userName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUserName() {
- return userName;
- }
-
- /**
- * Gets the value of the password property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Gets the value of the authenticationMechanism property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAuthenticationMechanism() {
- return authenticationMechanism;
- }
-
- /**
- * Gets the value of the groupSearchBase property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupSearchBase() {
- return groupSearchBase;
- }
-
- /**
- * Gets the value of the isGroupSearchBaseEnabled property.
- *
- */
- public boolean isGroupSearchBaseEnabled() {
- return isGroupSearchBaseEnabled;
- }
-
- /**
- * Gets the value of the connectorType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getConnectorType() {
- return connectorType;
- }
-
- /**
- * Gets the value of the userAttributes property.
- *
- * @return
- * possible object is
- * {@link OrgLdapUserAttributes }
- *
- */
- public OrgLdapUserAttributes getUserAttributes() {
- return userAttributes;
- }
-
- /**
- * Gets the value of the groupAttributes property.
- *
- * @return
- * possible object is
- * {@link OrgLdapGroupAttributes }
- *
- */
- public OrgLdapGroupAttributes getGroupAttributes() {
- return groupAttributes;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CustomOrgLdapSettings that = CustomOrgLdapSettings.class.cast(o);
- return super.equals(that) &&
- equal(hostName, that.hostName) &&
- equal(port, that.port) &&
- equal(isSsl, that.isSsl) &&
- equal(isSslAcceptAll, that.isSslAcceptAll) &&
- equal(realm, that.realm) &&
- equal(searchBase, that.searchBase) &&
- equal(userName, that.userName) &&
- equal(password, that.password) &&
- equal(authenticationMechanism, that.authenticationMechanism) &&
- equal(groupSearchBase, that.groupSearchBase) &&
- equal(isGroupSearchBaseEnabled, that.isGroupSearchBaseEnabled) &&
- equal(connectorType, that.connectorType) &&
- equal(userAttributes, that.userAttributes) &&
- equal(groupAttributes, that.groupAttributes);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- hostName,
- port,
- isSsl,
- isSslAcceptAll,
- realm,
- searchBase,
- userName,
- password,
- authenticationMechanism,
- groupSearchBase,
- isGroupSearchBaseEnabled,
- connectorType,
- userAttributes,
- groupAttributes);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("hostName", hostName)
- .add("port", port)
- .add("isSsl", isSsl)
- .add("isSslAcceptAll", isSslAcceptAll)
- .add("realm", realm)
- .add("searchBase", searchBase)
- .add("userName", userName)
- .add("password", password)
- .add("authenticationMechanism", authenticationMechanism)
- .add("groupSearchBase", groupSearchBase)
- .add("isGroupSearchBaseEnabled", isGroupSearchBaseEnabled)
- .add("connectorType", connectorType)
- .add("userAttributes", userAttributes)
- .add("groupAttributes", groupAttributes);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
deleted file mode 100644
index 2932495..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
+++ /dev/null
@@ -1,133 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents an organization.
- *
- * <p/>Unit of multi-tenancy and a top-level container. Contain vDCs, TasksList, Catalogs and Shared Network entities.
- */
-@XmlRootElement(name = "Org")
-@XmlSeeAlso({ AdminOrg.class })
-public class Org extends Entity {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrg(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private String fullName;
- private Boolean isEnabled;
-
- /**
- * @see Org#getFullName()
- */
- public B fullName(String fullName) {
- this.fullName = fullName;
- return self();
- }
-
- /**
- * @see Org#isEnabled()
- */
- public B isEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled;
- return self();
- }
-
- @Override
- public Org build() {
- return new Org(this);
- }
-
- public B fromOrg(Org in) {
- return fromEntityType(in).fullName(in.getFullName()).isEnabled(in.isEnabled());
- }
- }
-
- protected Org() {
- // for JAXB
- }
-
- public Org(Builder<?> builder) {
- super(builder);
- this.fullName = builder.fullName;
- this.isEnabled = builder.isEnabled;
- }
-
- @XmlElement(name = "FullName", required = true)
- private String fullName;
- @XmlElement(name = "IsEnabled")
- private Boolean isEnabled;
-
- /**
- * Full name of the organization.
- */
- public String getFullName() {
- return fullName;
- }
-
- /**
- * Is the organization enabled.
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Org that = Org.class.cast(o);
- return super.equals(that) && equal(fullName, that.fullName) && equal(this.isEnabled, that.isEnabled);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), fullName, isEnabled);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("fullName", fullName).add("isEnabled", isEnabled);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
deleted file mode 100644
index d310a63..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
+++ /dev/null
@@ -1,307 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-
-@XmlRootElement(name = "OrgEmailSettings")
-@XmlType(propOrder = {
- "isDefaultSmtpServer",
- "isDefaultOrgEmail",
- "fromEmailAddress",
- "defaultSubjectPrefix",
- "isAlertEmailToAllAdmins",
- "alertEmailTo",
- "smtpServerSettings"
-})
-public class OrgEmailSettings extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgEmailSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private boolean isDefaultSmtpServer;
- private boolean isDefaultOrgEmail;
- private String fromEmailAddress;
- private String defaultSubjectPrefix;
- private boolean isAlertEmailToAllAdmins;
- private List<String> alertEmailTo;
- private SmtpServerSettings smtpServerSettings;
-
- /**
- * @see OrgEmailSettings#getIsDefaultSmtpServer()
- */
- public B isDefaultSmtpServer(boolean isDefaultSmtpServer) {
- this.isDefaultSmtpServer = isDefaultSmtpServer;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getIsDefaultOrgEmail()
- */
- public B isDefaultOrgEmail(boolean isDefaultOrgEmail) {
- this.isDefaultOrgEmail = isDefaultOrgEmail;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getFromEmailAddress()
- */
- public B fromEmailAddress(String fromEmailAddress) {
- this.fromEmailAddress = fromEmailAddress;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getDefaultSubjectPrefix()
- */
- public B defaultSubjectPrefix(String defaultSubjectPrefix) {
- this.defaultSubjectPrefix = defaultSubjectPrefix;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getIsAlertEmailToAllAdmins()
- */
- public B isAlertEmailToAllAdmins(boolean isAlertEmailToAllAdmins) {
- this.isAlertEmailToAllAdmins = isAlertEmailToAllAdmins;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getAlertEmailTo()
- */
- public B alertEmailTo(List<String> alertEmailTo) {
- this.alertEmailTo = alertEmailTo == null ? null : ImmutableList.copyOf(alertEmailTo);
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getAlertEmailTo()
- */
- public B alertEmailTo(String alertEmailTo) {
- this.alertEmailTo.add(checkNotNull(alertEmailTo, "alertEmailTo"));
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getSmtpServerSettings()
- */
- public B smtpServerSettings(SmtpServerSettings smtpServerSettings) {
- this.smtpServerSettings = smtpServerSettings;
- return self();
- }
-
- @Override
- public OrgEmailSettings build() {
- return new OrgEmailSettings(this);
- }
-
- public B fromOrgEmailSettings(OrgEmailSettings in) {
- return fromResource(in)
- .isDefaultSmtpServer(in.isDefaultSmtpServer())
- .isDefaultOrgEmail(in.isDefaultOrgEmail())
- .fromEmailAddress(in.getFromEmailAddress())
- .defaultSubjectPrefix(in.getDefaultSubjectPrefix())
- .isAlertEmailToAllAdmins(in.isAlertEmailToAllAdmins())
- .alertEmailTo(in.getAlertEmailTo())
- .smtpServerSettings(in.getSmtpServerSettings());
- }
- }
-
- private OrgEmailSettings() {
- // For JAXB
- }
-
- private OrgEmailSettings(Builder<?> builder) {
- super(builder);
- this.isDefaultSmtpServer = builder.isDefaultSmtpServer;
- this.isDefaultOrgEmail = builder.isDefaultOrgEmail;
- this.fromEmailAddress = builder.fromEmailAddress;
- this.defaultSubjectPrefix = builder.defaultSubjectPrefix;
- this.isAlertEmailToAllAdmins = builder.isAlertEmailToAllAdmins;
- this.alertEmailTo = builder.alertEmailTo;
- this.smtpServerSettings = builder.smtpServerSettings;
- }
-
- @XmlElement(name = "IsDefaultSmtpServer")
- private boolean isDefaultSmtpServer;
- @XmlElement(name = "IsDefaultOrgEmail")
- private boolean isDefaultOrgEmail;
- @XmlElement(name = "FromEmailAddress", required = true)
- private String fromEmailAddress;
- @XmlElement(name = "DefaultSubjectPrefix", required = true)
- private String defaultSubjectPrefix;
- @XmlElement(name = "IsAlertEmailToAllAdmins")
- private boolean isAlertEmailToAllAdmins;
- @XmlElement(name = "AlertEmailTo")
- private List<String> alertEmailTo;
- @XmlElement(name = "SmtpServerSettings")
- private SmtpServerSettings smtpServerSettings;
-
- /**
- * Gets the value of the isDefaultSmtpServer property.
- *
- */
- public boolean isDefaultSmtpServer() {
- return isDefaultSmtpServer;
- }
-
- /**
- * Gets the value of the isDefaultOrgEmail property.
- *
- */
- public boolean isDefaultOrgEmail() {
- return isDefaultOrgEmail;
- }
-
- /**
- * Gets the value of the fromEmailAddress property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFromEmailAddress() {
- return fromEmailAddress;
- }
-
- /**
- * Gets the value of the defaultSubjectPrefix property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDefaultSubjectPrefix() {
- return defaultSubjectPrefix;
- }
-
- /**
- * Gets the value of the isAlertEmailToAllAdmins property.
- *
- */
- public boolean isAlertEmailToAllAdmins() {
- return isAlertEmailToAllAdmins;
- }
-
- /**
- * Gets the value of the alertEmailTo property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the alertEmailTo property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAlertEmailTo().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getAlertEmailTo() {
- return this.alertEmailTo;
- }
-
- /**
- * Gets the value of the smtpServerSettings property.
- *
- * @return
- * possible object is
- * {@link SmtpServerSettings }
- *
- */
- public SmtpServerSettings getSmtpServerSettings() {
- return smtpServerSettings;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgEmailSettings that = OrgEmailSettings.class.cast(o);
- return super.equals(that) &&
- equal(isDefaultSmtpServer, that.isDefaultSmtpServer) &&
- equal(isDefaultOrgEmail, that.isDefaultOrgEmail) &&
- equal(fromEmailAddress, that.fromEmailAddress) &&
- equal(defaultSubjectPrefix, that.defaultSubjectPrefix) &&
- equal(isAlertEmailToAllAdmins, that.isAlertEmailToAllAdmins) &&
- equal(alertEmailTo, that.alertEmailTo) &&
- equal(smtpServerSettings, that.smtpServerSettings);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- isDefaultSmtpServer,
- isDefaultOrgEmail,
- fromEmailAddress,
- defaultSubjectPrefix,
- isAlertEmailToAllAdmins,
- alertEmailTo,
- smtpServerSettings);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("isDefaultSmtpServer", isDefaultSmtpServer)
- .add("isDefaultOrgEmail", isDefaultOrgEmail)
- .add("fromEmailAddress", fromEmailAddress)
- .add("defaultSubjectPrefix", defaultSubjectPrefix)
- .add("isAlertEmailToAllAdmins", isAlertEmailToAllAdmins)
- .add("alertEmailTo", alertEmailTo)
- .add("smtpServerSettings", smtpServerSettings);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
deleted file mode 100644
index fc04897..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
+++ /dev/null
@@ -1,234 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "GeneralOrgSettings")
-@XmlType(propOrder = {
- "canPublishCatalogs",
- "deployedVMQuota",
- "storedVmQuota",
- "useServerBootSequence",
- "delayAfterPowerOnSeconds"
-})
-public class OrgGeneralSettings extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgGeneralSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Boolean canPublishCatalogs;
- private Integer deployedVMQuota;
- private Integer storedVmQuota;
- private Boolean useServerBootSequence;
- private Integer delayAfterPowerOnSeconds;
-
- /**
- * @see OrgGeneralSettings#getCanPublishCatalogs()
- */
- public B canPublishCatalogs(Boolean canPublishCatalogs) {
- this.canPublishCatalogs = canPublishCatalogs;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getDeployedVMQuota()
- */
- public B deployedVMQuota(Integer deployedVMQuota) {
- this.deployedVMQuota = deployedVMQuota;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getStoredVmQuota()
- */
- public B storedVmQuota(Integer storedVmQuota) {
- this.storedVmQuota = storedVmQuota;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getUseServerBootSequence()
- */
- public B useServerBootSequence(Boolean useServerBootSequence) {
- this.useServerBootSequence = useServerBootSequence;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getDelayAfterPowerOnSeconds()
- */
- public B delayAfterPowerOnSeconds(Integer delayAfterPowerOnSeconds) {
- this.delayAfterPowerOnSeconds = delayAfterPowerOnSeconds;
- return self();
- }
-
- @Override
- public OrgGeneralSettings build() {
- return new OrgGeneralSettings(this);
- }
-
- public B fromOrgGeneralSettings(OrgGeneralSettings in) {
- return fromResource(in)
- .canPublishCatalogs(in.canPublishCatalogs())
- .deployedVMQuota(in.getDeployedVMQuota())
- .storedVmQuota(in.getStoredVmQuota())
- .useServerBootSequence(in.useServerBootSequence())
- .delayAfterPowerOnSeconds(in.getDelayAfterPowerOnSeconds());
- }
- }
-
- protected OrgGeneralSettings() {
- // For JAXB
- }
-
- protected OrgGeneralSettings(Builder<?> builder) {
- super(builder);
- this.canPublishCatalogs = builder.canPublishCatalogs;
- this.deployedVMQuota = builder.deployedVMQuota;
- this.storedVmQuota = builder.storedVmQuota;
- this.useServerBootSequence = builder.useServerBootSequence;
- this.delayAfterPowerOnSeconds = builder.delayAfterPowerOnSeconds;
- }
-
- @XmlElement(name = "CanPublishCatalogs")
- protected Boolean canPublishCatalogs;
- @XmlElement(name = "DeployedVMQuota")
- protected Integer deployedVMQuota;
- @XmlElement(name = "StoredVmQuota")
- protected Integer storedVmQuota;
- @XmlElement(name = "UseServerBootSequence")
- protected Boolean useServerBootSequence;
- @XmlElement(name = "DelayAfterPowerOnSeconds")
- protected Integer delayAfterPowerOnSeconds;
-
- /**
- * Gets the value of the canPublishCatalogs property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean canPublishCatalogs() {
- return canPublishCatalogs;
- }
-
- /**
- * Gets the value of the deployedVMQuota property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getDeployedVMQuota() {
- return deployedVMQuota;
- }
-
- /**
- * Gets the value of the storedVmQuota property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getStoredVmQuota() {
- return storedVmQuota;
- }
-
- /**
- * Gets the value of the useServerBootSequence property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean useServerBootSequence() {
- return useServerBootSequence;
- }
-
- /**
- * Gets the value of the delayAfterPowerOnSeconds property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getDelayAfterPowerOnSeconds() {
- return delayAfterPowerOnSeconds;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgGeneralSettings that = OrgGeneralSettings.class.cast(o);
- return super.equals(that) &&
- equal(canPublishCatalogs, that.canPublishCatalogs) &&
- equal(deployedVMQuota, that.deployedVMQuota) &&
- equal(storedVmQuota, that.storedVmQuota) &&
- equal(useServerBootSequence, that.useServerBootSequence) &&
- equal(delayAfterPowerOnSeconds, that.delayAfterPowerOnSeconds);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- canPublishCatalogs,
- deployedVMQuota,
- storedVmQuota,
- useServerBootSequence,
- delayAfterPowerOnSeconds);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("canPublishCatalogs", canPublishCatalogs)
- .add("deployedVMQuota", deployedVMQuota)
- .add("storedVmQuota", storedVmQuota)
- .add("useServerBootSequence", useServerBootSequence)
- .add("delayAfterPowerOnSeconds", delayAfterPowerOnSeconds);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
deleted file mode 100644
index f0ba634..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
+++ /dev/null
@@ -1,261 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Defines how a group is imported from LDAP.
- */
-@XmlType(name = "OrgLdapGroupAttributes", propOrder = {
- "objectClass",
- "objectIdentifier",
- "groupName",
- "membership",
- "membershipIdentifier",
- "backLinkIdentifier"
-})
-public class OrgLdapGroupAttributes {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromOrgLdapGroupAttributes(this);
- }
-
- public static class Builder {
-
- private String objectClass;
- private String objectIdentifier;
- private String groupName;
- private String membership;
- private String membershipIdentifier;
- private String backLinkIdentifier;
-
- /**
- * @see OrgLdapGroupAttributes#getObjectClass()
- */
- public Builder objectClass(String objectClass) {
- this.objectClass = objectClass;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getObjectIdentifier()
- */
- public Builder objectIdentifier(String objectIdentifier) {
- this.objectIdentifier = objectIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getGroupName()
- */
- public Builder groupName(String groupName) {
- this.groupName = groupName;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getMembership()
- */
- public Builder membership(String membership) {
- this.membership = membership;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getMembershipIdentifier()
- */
- public Builder membershipIdentifier(String membershipIdentifier) {
- this.membershipIdentifier = membershipIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getBackLinkIdentifier()
- */
- public Builder backLinkIdentifier(String backLinkIdentifier) {
- this.backLinkIdentifier = backLinkIdentifier;
- return this;
- }
-
-
- public OrgLdapGroupAttributes build() {
- return new OrgLdapGroupAttributes(objectClass, objectIdentifier, groupName,
- membership, membershipIdentifier, backLinkIdentifier);
- }
-
- public Builder fromOrgLdapGroupAttributes(OrgLdapGroupAttributes in) {
- return objectClass(in.getObjectClass())
- .objectIdentifier(in.getObjectIdentifier())
- .groupName(in.getGroupName())
- .membership(in.getMembership())
- .membershipIdentifier(in.getMembershipIdentifier())
- .backLinkIdentifier(in.getBackLinkIdentifier());
- }
- }
-
- @SuppressWarnings("unused")
- private OrgLdapGroupAttributes() {
- // For JAXB
- }
-
- public OrgLdapGroupAttributes(String objectClass, String objectIdentifier,
- String groupName, String membership, String membershipIdentifier,
- String backLinkIdentifier) {
- this.objectClass = objectClass;
- this.objectIdentifier = objectIdentifier;
- this.groupName = groupName;
- this.membership = membership;
- this.membershipIdentifier = membershipIdentifier;
- this.backLinkIdentifier = backLinkIdentifier;
- }
-
- @XmlElement(name = "ObjectClass", required = true)
- protected String objectClass;
- @XmlElement(name = "ObjectIdentifier", required = true)
- protected String objectIdentifier;
- @XmlElement(name = "GroupName", required = true)
- protected String groupName;
- @XmlElement(name = "Membership", required = true)
- protected String membership;
- @XmlElement(name = "MembershipIdentifier", required = true)
- protected String membershipIdentifier;
- @XmlElement(name = "BackLinkIdentifier")
- protected String backLinkIdentifier;
-
- /**
- * Gets the value of the objectClass property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectClass() {
- return objectClass;
- }
-
- /**
- * Gets the value of the objectIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectIdentifier() {
- return objectIdentifier;
- }
-
- /**
- * Gets the value of the groupName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * Gets the value of the membership property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMembership() {
- return membership;
- }
-
- /**
- * Gets the value of the membershipIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMembershipIdentifier() {
- return membershipIdentifier;
- }
-
- /**
- * Gets the value of the backLinkIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBackLinkIdentifier() {
- return backLinkIdentifier;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLdapGroupAttributes that = OrgLdapGroupAttributes.class.cast(o);
- return equal(objectClass, that.objectClass) &&
- equal(objectIdentifier, that.objectIdentifier) &&
- equal(groupName, that.groupName) &&
- equal(membership, that.membership) &&
- equal(membershipIdentifier, that.membershipIdentifier) &&
- equal(backLinkIdentifier, that.backLinkIdentifier);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(objectClass,
- objectIdentifier,
- groupName,
- membership,
- membershipIdentifier,
- backLinkIdentifier);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("objectClass", objectClass)
- .add("objectIdentifier", objectIdentifier)
- .add("groupName", groupName)
- .add("membership", membership)
- .add("membershipIdentifier", membershipIdentifier)
- .add("backLinkIdentifier", backLinkIdentifier);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
deleted file mode 100644
index a994658..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
+++ /dev/null
@@ -1,230 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-/**
- * Base settings for LDAP connection
- *
- * <pre>
- * <complexType name="OrgLdapSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element name="OrgLdapMode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="CustomUsersOu" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="CustomOrgLdapSettings" type="{http://www.vmware.com/vcloud/v1.5}CustomOrgLdapSettings" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlRootElement(name = "OrgLdapSettings")
-@XmlType(propOrder = {
- "ldapMode",
- "customUsersOu",
- "customOrgLdapSettings"
-})
-public class OrgLdapSettings extends Resource {
-
- @XmlType
- @XmlEnum(String.class)
- public static enum LdapMode {
- @XmlEnumValue("NONE") NONE("NONE"),
- @XmlEnumValue("SYSTEM") SYSTEM("SYSTEM"),
- @XmlEnumValue("CUSTOM") CUSTOM("CUSTOM"),
- UNRECOGNIZED("unrecognized");
-
- public static final List<LdapMode> ALL = ImmutableList.of( NONE, SYSTEM, CUSTOM );
-
- protected final String stringValue;
-
- LdapMode(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, LdapMode> LDAP_MODE_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(LdapMode.values()), new Function<LdapMode, String>() {
- @Override
- public String apply(LdapMode input) {
- return input.stringValue;
- }
- });
-
- public static LdapMode fromValue(String value) {
- LdapMode mode = LDAP_MODE_BY_ID.get(checkNotNull(value, "stringValue"));
- return mode == null ? UNRECOGNIZED : mode;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgLdapSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private LdapMode ldapMode;
- private String customUsersOu;
- private CustomOrgLdapSettings customOrgLdapSettings;
-
- /**
- * @see OrgLdapSettings#getLdapMode()
- */
- public B ldapMode(LdapMode ldapMode) {
- this.ldapMode = ldapMode;
- return self();
- }
-
- /**
- * @see OrgLdapSettings#getLdapMode()
- */
- public B ldapMode(String ldapMode) {
- this.ldapMode = LdapMode.fromValue(ldapMode);
- return self();
- }
-
- /**
- * @see OrgLdapSettings#getCustomUsersOu()
- */
- public B customUsersOu(String customUsersOu) {
- this.customUsersOu = customUsersOu;
- return self();
- }
-
- /**
- * @see OrgLdapSettings#getCustomOrgLdapSettings()
- */
- public B customOrgLdapSettings(CustomOrgLdapSettings customOrgLdapSettings) {
- this.customOrgLdapSettings = customOrgLdapSettings;
- return self();
- }
-
- @Override
- public OrgLdapSettings build() {
- return new OrgLdapSettings(this);
- }
-
- public B fromOrgLdapSettings(OrgLdapSettings in) {
- return fromResource(in)
- .ldapMode(in.getLdapMode())
- .customUsersOu(in.getCustomUsersOu())
- .customOrgLdapSettings(in.getCustomOrgLdapSettings());
- }
- }
-
- protected OrgLdapSettings() {
- // For JAXB
- }
-
- protected OrgLdapSettings(Builder<?> builder) {
- super(builder);
- this.ldapMode = builder.ldapMode;
- this.customUsersOu = builder.customUsersOu;
- this.customOrgLdapSettings = builder.customOrgLdapSettings;
- }
-
- @XmlElement(name = "OrgLdapMode")
- private LdapMode ldapMode;
- @XmlElement(name = "CustomUsersOu")
- private String customUsersOu;
- @XmlElement(name = "CustomOrgLdapSettings")
- private CustomOrgLdapSettings customOrgLdapSettings;
-
- /**
- * Gets the value of the orgLdapMode property.
- */
- public LdapMode getLdapMode() {
- return ldapMode;
- }
-
- /**
- * Gets the value of the customUsersOu property.
- */
- public String getCustomUsersOu() {
- return customUsersOu;
- }
-
- /**
- * Gets the value of the customOrgLdapSettings property.
- */
- public CustomOrgLdapSettings getCustomOrgLdapSettings() {
- return customOrgLdapSettings;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLdapSettings that = OrgLdapSettings.class.cast(o);
- return super.equals(that) &&
- equal(ldapMode, that.ldapMode) &&
- equal(customUsersOu, that.customUsersOu) &&
- equal(customOrgLdapSettings, that.customOrgLdapSettings);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- ldapMode,
- customUsersOu,
- customOrgLdapSettings);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("orgLdapMode", ldapMode)
- .add("customUsersOu", customUsersOu)
- .add("customOrgLdapSettings", customOrgLdapSettings);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
deleted file mode 100644
index cba4df5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
+++ /dev/null
@@ -1,378 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Defines how LDAP attributes are used when importing a user.
- */
-@XmlType(name = "OrgLdapUserAttributes", propOrder = {
- "objectClass",
- "objectIdentifier",
- "userName",
- "email",
- "fullName",
- "givenName",
- "surname",
- "telephone",
- "groupMembershipIdentifier",
- "groupBackLinkIdentifier"
-})
-public class OrgLdapUserAttributes {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromOrgLdapUserAttributes(this);
- }
-
- public static class Builder {
-
- private String objectClass;
- private String objectIdentifier;
- private String userName;
- private String email;
- private String fullName;
- private String givenName;
- private String surname;
- private String telephone;
- private String groupMembershipIdentifier;
- private String groupBackLinkIdentifier;
-
- /**
- * @see OrgLdapUserAttributes#getObjectClass()
- */
- public Builder objectClass(String objectClass) {
- this.objectClass = objectClass;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getObjectIdentifier()
- */
- public Builder objectIdentifier(String objectIdentifier) {
- this.objectIdentifier = objectIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getUserName()
- */
- public Builder userName(String userName) {
- this.userName = userName;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getEmail()
- */
- public Builder email(String email) {
- this.email = email;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getFullName()
- */
- public Builder fullName(String fullName) {
- this.fullName = fullName;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getGivenName()
- */
- public Builder givenName(String givenName) {
- this.givenName = givenName;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getSurname()
- */
- public Builder surname(String surname) {
- this.surname = surname;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getTelephone()
- */
- public Builder telephone(String telephone) {
- this.telephone = telephone;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getGroupMembershipIdentifier()
- */
- public Builder groupMembershipIdentifier(String groupMembershipIdentifier) {
- this.groupMembershipIdentifier = groupMembershipIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getGroupBackLinkIdentifier()
- */
- public Builder groupBackLinkIdentifier(String groupBackLinkIdentifier) {
- this.groupBackLinkIdentifier = groupBackLinkIdentifier;
- return this;
- }
-
-
- public OrgLdapUserAttributes build() {
- return new OrgLdapUserAttributes(objectClass, objectIdentifier, userName, email,
- fullName, givenName, surname, telephone, groupMembershipIdentifier, groupBackLinkIdentifier);
- }
-
- public Builder fromOrgLdapUserAttributes(OrgLdapUserAttributes in) {
- return objectClass(in.getObjectClass())
- .objectIdentifier(in.getObjectIdentifier())
- .userName(in.getUserName())
- .email(in.getEmail())
- .fullName(in.getFullName())
- .givenName(in.getGivenName())
- .surname(in.getSurname())
- .telephone(in.getTelephone())
- .groupMembershipIdentifier(in.getGroupMembershipIdentifier())
- .groupBackLinkIdentifier(in.getGroupBackLinkIdentifier());
- }
- }
-
- @SuppressWarnings("unused")
- private OrgLdapUserAttributes() {
- // For JAXB
- }
-
- public OrgLdapUserAttributes(String objectClass, String objectIdentifier,
- String userName, String email, String fullName, String givenName,
- String surname, String telephone, String groupMembershipIdentifier,
- String groupBackLinkIdentifier) {
- this.objectClass = objectClass;
- this.objectIdentifier = objectIdentifier;
- this.userName = userName;
- this.email = email;
- this.fullName = fullName;
- this.givenName = givenName;
- this.surname = surname;
- this.telephone = telephone;
- this.groupMembershipIdentifier = groupMembershipIdentifier;
- this.groupBackLinkIdentifier = groupBackLinkIdentifier;
- }
-
- @XmlElement(name = "ObjectClass", required = true)
- protected String objectClass;
- @XmlElement(name = "ObjectIdentifier", required = true)
- protected String objectIdentifier;
- @XmlElement(name = "UserName", required = true)
- protected String userName;
- @XmlElement(name = "Email", required = true)
- protected String email;
- @XmlElement(name = "FullName", required = true)
- protected String fullName;
- @XmlElement(name = "GivenName", required = true)
- protected String givenName;
- @XmlElement(name = "Surname", required = true)
- protected String surname;
- @XmlElement(name = "Telephone", required = true)
- protected String telephone;
- @XmlElement(name = "GroupMembershipIdentifier", required = true)
- protected String groupMembershipIdentifier;
- @XmlElement(name = "GroupBackLinkIdentifier")
- protected String groupBackLinkIdentifier;
-
- /**
- * Gets the value of the objectClass property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectClass() {
- return objectClass;
- }
-
- /**
- * Gets the value of the objectIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectIdentifier() {
- return objectIdentifier;
- }
-
- /**
- * Gets the value of the userName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUserName() {
- return userName;
- }
-
- /**
- * Gets the value of the email property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEmail() {
- return email;
- }
-
- /**
- * Gets the value of the fullName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFullName() {
- return fullName;
- }
-
- /**
- * Gets the value of the givenName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGivenName() {
- return givenName;
- }
-
- /**
- * Gets the value of the surname property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSurname() {
- return surname;
- }
-
- /**
- * Gets the value of the telephone property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTelephone() {
- return telephone;
- }
-
- /**
- * Gets the value of the groupMembershipIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupMembershipIdentifier() {
- return groupMembershipIdentifier;
- }
-
- /**
- * Gets the value of the groupBackLinkIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupBackLinkIdentifier() {
- return groupBackLinkIdentifier;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLdapUserAttributes that = OrgLdapUserAttributes.class.cast(o);
- return equal(objectClass, that.objectClass) &&
- equal(objectIdentifier, that.objectIdentifier) &&
- equal(userName, that.userName) &&
- equal(email, that.email) &&
- equal(fullName, that.fullName) &&
- equal(givenName, that.givenName) &&
- equal(surname, that.surname) &&
- equal(telephone, that.telephone) &&
- equal(groupMembershipIdentifier, that.groupMembershipIdentifier) &&
- equal(groupBackLinkIdentifier, that.groupBackLinkIdentifier);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(objectClass,
- objectIdentifier,
- userName,
- email,
- fullName,
- givenName,
- surname,
- telephone,
- groupMembershipIdentifier,
- groupBackLinkIdentifier);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("objectClass", objectClass)
- .add("objectIdentifier", objectIdentifier)
- .add("userName", userName)
- .add("email", email)
- .add("fullName", fullName)
- .add("givenName", givenName)
- .add("surname", surname)
- .add("telephone", telephone)
- .add("groupMembershipIdentifier", groupMembershipIdentifier)
- .add("groupBackLinkIdentifier", groupBackLinkIdentifier);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
deleted file mode 100644
index 9e14d02..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
+++ /dev/null
@@ -1,178 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Defines default lease durations and policies for an organization.
- */
-@XmlRootElement(name = "VAppLeaseSettings")
-@XmlType(propOrder = {
- "deleteOnStorageLeaseExpiration",
- "deploymentLeaseSeconds",
- "storageLeaseSeconds"
-})
-public class OrgLeaseSettings extends Resource {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgLeaseSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Boolean deleteOnStorageLeaseExpiration;
- private Integer deploymentLeaseSeconds;
- private Integer storageLeaseSeconds;
-
- /**
- * @see OrgLeaseSettings#getDeleteOnStorageLeaseExpiration()
- */
- public B deleteOnStorageLeaseExpiration(Boolean deleteOnStorageLeaseExpiration) {
- this.deleteOnStorageLeaseExpiration = deleteOnStorageLeaseExpiration;
- return self();
- }
-
- /**
- * @see OrgLeaseSettings#getDeploymentLeaseSeconds()
- */
- public B deploymentLeaseSeconds(Integer deploymentLeaseSeconds) {
- this.deploymentLeaseSeconds = deploymentLeaseSeconds;
- return self();
- }
-
- /**
- * @see OrgLeaseSettings#getStorageLeaseSeconds()
- */
- public B storageLeaseSeconds(Integer storageLeaseSeconds) {
- this.storageLeaseSeconds = storageLeaseSeconds;
- return self();
- }
-
- @Override
- public OrgLeaseSettings build() {
- return new OrgLeaseSettings(this);
- }
-
- public B fromOrgLeaseSettings(OrgLeaseSettings in) {
- return fromResource(in)
- .deleteOnStorageLeaseExpiration(in.deleteOnStorageLeaseExpiration())
- .deploymentLeaseSeconds(in.getDeploymentLeaseSeconds())
- .storageLeaseSeconds(in.getStorageLeaseSeconds());
- }
- }
-
- protected OrgLeaseSettings() {
- // For JAXB
- }
-
- protected OrgLeaseSettings(Builder<?> builder) {
- super(builder);
- this.deleteOnStorageLeaseExpiration = builder.deleteOnStorageLeaseExpiration;
- this.deploymentLeaseSeconds = builder.deploymentLeaseSeconds;
- this.storageLeaseSeconds = builder.storageLeaseSeconds;
- }
-
- @XmlElement(name = "DeleteOnStorageLeaseExpiration")
- private Boolean deleteOnStorageLeaseExpiration;
- @XmlElement(name = "DeploymentLeaseSeconds")
- private Integer deploymentLeaseSeconds;
- @XmlElement(name = "StorageLeaseSeconds")
- private Integer storageLeaseSeconds;
-
- /**
- * Gets the value of the deleteOnStorageLeaseExpiration property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean deleteOnStorageLeaseExpiration() {
- return deleteOnStorageLeaseExpiration;
- }
-
- /**
- * Gets the value of the deploymentLeaseSeconds property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getDeploymentLeaseSeconds() {
- return deploymentLeaseSeconds;
- }
-
- /**
- * Gets the value of the storageLeaseSeconds property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getStorageLeaseSeconds() {
- return storageLeaseSeconds;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLeaseSettings that = OrgLeaseSettings.class.cast(o);
- return super.equals(that) &&
- equal(deleteOnStorageLeaseExpiration, that.deleteOnStorageLeaseExpiration) &&
- equal(deploymentLeaseSeconds, that.deploymentLeaseSeconds) &&
- equal(storageLeaseSeconds, that.storageLeaseSeconds);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- deleteOnStorageLeaseExpiration,
- deploymentLeaseSeconds,
- storageLeaseSeconds);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("deleteOnStorageLeaseExpiration", deleteOnStorageLeaseExpiration)
- .add("deploymentLeaseSeconds", deploymentLeaseSeconds)
- .add("storageLeaseSeconds", storageLeaseSeconds);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
deleted file mode 100644
index d50e5c1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
+++ /dev/null
@@ -1,92 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.collect.ForwardingSet;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "OrgList")
-public class OrgList extends ForwardingSet<Reference> {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG_LIST;
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromOrgList(this);
- }
-
- public static class Builder {
-
- private Set<Reference> orgs = Sets.newLinkedHashSet();
-
- /**
- * @see OrgList#getOrgs
- */
- public Builder orgs(Set<Reference> orgs) {
- this.orgs = Sets.newLinkedHashSet(checkNotNull(orgs, "orgs"));
- return this;
- }
-
- /**
- * @see OrgList#getOrgs
- */
- public Builder org(Reference org) {
- orgs.add(checkNotNull(org, "org"));
- return this;
- }
-
- public OrgList build() {
- return new OrgList(orgs);
- }
-
- public Builder fromOrgList(OrgList in) {
- return orgs(in.delegate());
- }
- }
-
- private OrgList() {
- // for JAXB
- }
-
- private OrgList(Set<Reference> orgs) {
- this.orgs = ImmutableSet.copyOf(orgs);
- }
-
- @XmlElement(name = "Org")
- private Set<Reference> orgs = Sets.newLinkedHashSet();
-
- @Override
- protected Set<Reference> delegate() {
- return Collections.unmodifiableSet(orgs);
- }
-
-}
[24/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
deleted file mode 100644
index 7a93659..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
+++ /dev/null
@@ -1,176 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "FirewallService")
-@XmlType(propOrder = {
- "defaultAction",
- "logDefaultAction",
- "firewallRules"
-})
-public class FirewallService extends NetworkService<FirewallService> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromFirewallService(this);
- }
-
- public static class Builder extends NetworkService.Builder<FirewallService> {
- private String defaultAction;
- private Boolean logDefaultAction;
- private Set<FirewallRule> firewallRules = Sets.newLinkedHashSet();
-
- /**
- * @see FirewallService#getDefaultAction()
- */
- public Builder defaultAction(String defaultAction) {
- this.defaultAction = defaultAction;
- return this;
- }
-
- /**
- * @see FirewallService#isLogDefaultAction()
- */
- public Builder logDefaultAction(Boolean logDefaultAction) {
- this.logDefaultAction = logDefaultAction;
- return this;
- }
-
- /**
- * @see FirewallService#getFirewallRules()
- */
- public Builder firewallRules(Set<FirewallRule> firewallRules) {
- this.firewallRules = checkNotNull(firewallRules, "firewallRules");
- return this;
- }
-
- @Override
- public FirewallService build() {
- return new FirewallService(isEnabled, defaultAction, logDefaultAction, firewallRules);
-
- }
-
- @Override
- public Builder fromNetworkServiceType(NetworkService<FirewallService> in) {
- return Builder.class.cast(super.fromNetworkServiceType(in));
- }
-
- public Builder fromFirewallService(FirewallService in) {
- return fromNetworkServiceType(in)
- .defaultAction(in.getDefaultAction())
- .logDefaultAction(in.isLogDefaultAction())
- .firewallRules(in.getFirewallRules());
- }
-
- @Override
- public Builder enabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
- }
-
- private FirewallService(boolean enabled, String defaultAction, Boolean logDefaultAction, Set<FirewallRule> firewallRules) {
- super(enabled);
- this.defaultAction = defaultAction;
- this.logDefaultAction = logDefaultAction;
- this.firewallRules = ImmutableSet.copyOf(firewallRules);
- }
-
- private FirewallService() {
- // for JAXB
- }
-
- @XmlElement(name = "DefaultAction")
- protected String defaultAction;
- @XmlElement(name = "LogDefaultAction")
- protected Boolean logDefaultAction;
- @XmlElement(name = "FirewallRule")
- protected Set<FirewallRule> firewallRules = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the defaultAction property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDefaultAction() {
- return defaultAction;
- }
-
- /**
- * Gets the value of the logDefaultAction property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isLogDefaultAction() {
- return logDefaultAction;
- }
-
- /**
- * Gets the value of the firewallRule property.
- */
- public Set<FirewallRule> getFirewallRules() {
- return Collections.unmodifiableSet(this.firewallRules);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- FirewallService that = FirewallService.class.cast(o);
- return equal(defaultAction, that.defaultAction) &&
- equal(logDefaultAction, that.logDefaultAction) &&
- equal(firewallRules, that.firewallRules);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(defaultAction,
- logDefaultAction,
- firewallRules);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("defaultAction", defaultAction)
- .add("logDefaultAction", logDefaultAction)
- .add("firewallRules", firewallRules).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
deleted file mode 100644
index 3f4bf0e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
+++ /dev/null
@@ -1,105 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "IpAddresses")
-public class IpAddresses {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpAddresses(this);
- }
-
- public static class Builder {
- private Set<String> ipAddresses = Sets.newLinkedHashSet();
-
- /**
- * @see IpAddresses#getIpAddresses()
- */
- public Builder ipAddresses(Set<String> ipAddresses) {
- this.ipAddresses = Sets.newLinkedHashSet(checkNotNull(ipAddresses, "ipAddresses"));
- return this;
- }
-
- /**
- * @see IpAddresses#getIpAddresses()
- */
- public Builder ipAddress(String ipAddress) {
- ipAddresses.add(checkNotNull(ipAddress, "ipAddress"));
- return this;
- }
-
- public IpAddresses build() {
- return new IpAddresses(ipAddresses);
- }
-
- public Builder fromIpAddresses(IpAddresses in) {
- return ipAddresses(in.getIpAddresses());
- }
- }
-
- private IpAddresses() {
- // for JAXB
- }
-
- private IpAddresses(Set<String> orgs) {
- this.ipAddresses = ImmutableSet.copyOf(orgs);
- }
-
- @XmlElement(name = "IpAddress")
- private Set<String> ipAddresses = Sets.newLinkedHashSet();
-
- public Set<String> getIpAddresses() {
- return Collections.unmodifiableSet(ipAddresses);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpAddresses that = IpAddresses.class.cast(o);
- return equal(ipAddresses, that.ipAddresses);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(ipAddresses);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("ipAddresses", ipAddresses).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
deleted file mode 100644
index f51b931..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
+++ /dev/null
@@ -1,119 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents a range of IP addresses, start and end inclusive.
- */
-@XmlRootElement(name = "IpRange")
-public class IpRange {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpRange(this);
- }
-
- public static class Builder {
-
- private String startAddress;
- private String endAddress;
-
- /**
- * @see IpRange#getStartAddress()
- */
- public Builder startAddress(String startAddress) {
- this.startAddress = startAddress;
- return this;
- }
-
- /**
- * @see IpRange#getEndAddress()
- */
- public Builder endAddress(String endAddress) {
- this.endAddress = endAddress;
- return this;
- }
-
- public IpRange build() {
- return new IpRange(startAddress, endAddress);
- }
-
- public Builder fromIpRange(IpRange in) {
- return startAddress(in.getStartAddress()).endAddress(in.getEndAddress());
- }
- }
-
- private IpRange() {
- // for JAXB
- }
-
- private IpRange(String startAddress, String endAddress) {
- this.startAddress = startAddress;
- this.endAddress = endAddress;
- }
-
- @XmlElement(name = "StartAddress")
- private String startAddress;
- @XmlElement(name = "EndAddress")
- private String endAddress;
-
- /**
- * @return Start address of the IP range.
- */
- public String getStartAddress() {
- return startAddress;
- }
-
- /**
- * @return End address of the IP range.
- */
- public String getEndAddress() {
- return endAddress;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpRange that = IpRange.class.cast(o);
- return equal(startAddress, that.startAddress) && equal(endAddress, that.endAddress);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(startAddress, endAddress);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("startAddress", startAddress)
- .add("endAddress", endAddress).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
deleted file mode 100644
index f20f7b8..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
+++ /dev/null
@@ -1,105 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "IpRanges")
-public class IpRanges {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpRanges(this);
- }
-
- public static class Builder {
- private Set<IpRange> ipRanges = Sets.newLinkedHashSet();
-
- /**
- * @see IpRanges#getIpRanges()
- */
- public Builder ipRanges(Set<IpRange> ipRanges) {
- this.ipRanges = Sets.newLinkedHashSet(checkNotNull(ipRanges, "ipRanges"));
- return this;
- }
-
- /**
- * @see IpRanges#getIpRanges()
- */
- public Builder ipRange(IpRange ipRange) {
- ipRanges.add(checkNotNull(ipRange, "ipRange"));
- return this;
- }
-
- public IpRanges build() {
- return new IpRanges(ipRanges);
- }
-
- public Builder fromIpRanges(IpRanges in) {
- return ipRanges(in.getIpRanges());
- }
- }
-
- private IpRanges() {
- // for JAXB
- }
-
- private IpRanges(Set<IpRange> ipRanges) {
- this.ipRanges = ImmutableSet.copyOf(ipRanges);
- }
-
- @XmlElement(name = "IpRange")
- private Set<IpRange> ipRanges = Sets.newLinkedHashSet();
-
- public Set<IpRange> getIpRanges() {
- return Collections.unmodifiableSet(ipRanges);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpRanges that = IpRanges.class.cast(o);
- return equal(ipRanges, that.ipRanges);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(ipRanges);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("ipRanges", ipRanges).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
deleted file mode 100644
index ac53b38..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
+++ /dev/null
@@ -1,254 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-
-/**
- * Specify network settings like gateway, network mask, DNS servers, IP ranges, etc.
- */
-@XmlRootElement(name = "IpScope")
-public class IpScope {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpScope(this);
- }
-
- public static class Builder {
-
- private boolean isInherited;
- private String gateway;
- private String netmask;
- private String dns1;
- private String dns2;
- private String dnsSuffix;
- private IpRanges ipRanges;
- private IpAddresses allocatedIpAddresses;
-
- /**
- * @see IpScope#isInherited()
- */
- public Builder isInherited(boolean isInherited) {
- this.isInherited = isInherited;
- return this;
- }
-
- /**
- * @see IpScope#getGateway()
- */
- public Builder gateway(String gateway) {
- this.gateway = gateway;
- return this;
- }
-
- /**
- * @see IpScope#getNetmask()
- */
- public Builder netmask(String netmask) {
- this.netmask = netmask;
- return this;
- }
-
- /**
- * @see IpScope#getDns1()
- */
- public Builder dns1(String dns1) {
- this.dns1 = dns1;
- return this;
- }
-
- /**
- * @see IpScope#getDns2()
- */
- public Builder dns2(String dns2) {
- this.dns2 = dns2;
- return this;
- }
-
- /**
- * @see IpScope#getDnsSuffix()
- */
- public Builder dnsSuffix(String dnsSuffix) {
- this.dnsSuffix = dnsSuffix;
- return this;
- }
-
- /**
- * @see IpScope#getIpRanges()
- */
- public Builder ipRanges(IpRanges ipRanges) {
- this.ipRanges = ipRanges;
- return this;
- }
-
- /**
- * @see IpScope#getAllocatedIpAddresses()
- */
- public Builder allocatedIpAddresses(IpAddresses allocatedIpAddresses) {
- this.allocatedIpAddresses = allocatedIpAddresses;
- return this;
- }
-
- public IpScope build() {
- return new IpScope(isInherited, gateway, netmask, dns1, dns2, dnsSuffix, ipRanges, allocatedIpAddresses);
- }
-
- public Builder fromIpScope(IpScope in) {
- return isInherited(in.isInherited()).gateway(in.getGateway())
- .netmask(in.getNetmask())
- .dns1(in.getDns1())
- .dns2(in.getDns2())
- .dnsSuffix(in.getDnsSuffix())
- .ipRanges(in.getIpRanges())
- .allocatedIpAddresses(in.getAllocatedIpAddresses());
- }
- }
-
- IpScope() {
- // For JAXB
- }
-
- public IpScope(boolean inherited, String gateway, String netmask, String dns1, String dns2, String dnsSuffix,
- IpRanges ipRanges, IpAddresses allocatedIpAddresses) {
- this.isInherited = inherited;
- this.gateway = gateway;
- this.netmask = netmask;
- this.dns1 = dns1;
- this.dns2 = dns2;
- this.dnsSuffix = dnsSuffix;
- this.ipRanges = ipRanges;
- this.allocatedIpAddresses = allocatedIpAddresses;
- }
-
-
- @XmlElement(name = "IsInherited")
- private boolean isInherited;
- @XmlElement(name = "Gateway")
- private String gateway;
- @XmlElement(name = "Netmask")
- private String netmask;
- @XmlElement(name = "Dns1")
- private String dns1;
- @XmlElement(name = "Dns2")
- private String dns2;
- @XmlElement(name = "DnsSuffix")
- private String dnsSuffix;
- @XmlElement(name = "IpRanges")
- private IpRanges ipRanges;
- @XmlElement(name = "AllocatedIpAddresses")
- private IpAddresses allocatedIpAddresses;
-
- /**
- * @return True if the IP scope is inherit from parent network.
- */
- public boolean isInherited() {
- return isInherited;
- }
-
- /**
- * @return Gateway of the network..
- */
- public String getGateway() {
- return gateway;
- }
-
- /**
- * @return Network mask.
- */
- public String getNetmask() {
- return netmask;
- }
-
- /**
- * @return Primary DNS server.
- */
- public String getDns1() {
- return dns1;
- }
-
- /**
- * @return Secondary DNS server.
- */
- public String getDns2() {
- return dns2;
- }
-
- /**
- * @return DNS suffix.
- */
- public String getDnsSuffix() {
- return dnsSuffix;
- }
-
- /**
- * @return IP ranges used for static pool allocation in the network.
- */
- public IpRanges getIpRanges() {
- return ipRanges;
- }
-
- /**
- * @return Read-only list of allocated IP addresses in the network.
- */
- public IpAddresses getAllocatedIpAddresses() {
- return allocatedIpAddresses;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpScope that = IpScope.class.cast(o);
- return equal(isInherited, that.isInherited) && equal(gateway, that.gateway) &&
- equal(netmask, that.netmask) &&
- equal(dns1, that.dns1) &&
- equal(dns2, that.dns2) &&
- equal(dnsSuffix, that.dnsSuffix) &&
- equal(ipRanges, that.ipRanges) &&
- equal(allocatedIpAddresses, that.allocatedIpAddresses);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(isInherited, gateway, netmask, dns1, dns2, dnsSuffix,
- ipRanges, allocatedIpAddresses);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("isInherited", isInherited)
- .add("gateway", gateway)
- .add("netmask", netmask)
- .add("dns1", dns1)
- .add("dns2", dns2)
- .add("dnsSuffix", dnsSuffix)
- .add("ipRanges", ipRanges)
- .add("allocatedIpAddresses", allocatedIpAddresses).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java
deleted file mode 100644
index eaf5602..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java
+++ /dev/null
@@ -1,67 +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.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "IpsecVpnLocalPeer")
-public class IpsecVpnLocalPeer
- extends IpsecVpnManagedPeer<IpsecVpnLocalPeer>
-
-{
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnLocalPeer(this);
- }
-
- public static class Builder extends IpsecVpnManagedPeer.Builder<IpsecVpnLocalPeer> {
- public IpsecVpnLocalPeer build() {
- return new IpsecVpnLocalPeer(id, name);
- }
-
- @Override
- public Builder fromIpsecVpnManagedPeerType(IpsecVpnManagedPeer<IpsecVpnLocalPeer> in) {
- return Builder.class.cast(super.fromIpsecVpnManagedPeerType(in));
- }
-
- public Builder fromIpsecVpnLocalPeer(IpsecVpnLocalPeer in) {
- return fromIpsecVpnManagedPeerType(in);
- }
-
- @Override
- public Builder id(String id) {
- return Builder.class.cast(super.id(id));
- }
-
- @Override
- public Builder name(String name) {
- return Builder.class.cast(super.name(name));
- }
-
- }
-
- private IpsecVpnLocalPeer(String id, String name) {
- super(id, name);
- }
-
- private IpsecVpnLocalPeer() {
- // For JAXB
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
deleted file mode 100644
index 733fc1a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import com.google.common.base.Objects;
-
-@XmlSeeAlso(
- IpsecVpnLocalPeer.class
-)
-public abstract class IpsecVpnManagedPeer<T extends IpsecVpnManagedPeer<T>> extends IpsecVpnPeer<T> {
-
- public abstract static class Builder<T extends IpsecVpnManagedPeer<T>> {
- protected String id;
- protected String name;
-
- /**
- * @see IpRange#getStartAddress()
- */
- public Builder<T> id(String id) {
- this.id = id;
- return this;
- }
-
- /**
- * @see IpRange#getEndAddress()
- */
- public Builder<T> name(String name) {
- this.name = name;
- return this;
- }
-
- public Builder<T> fromIpsecVpnManagedPeerType(IpsecVpnManagedPeer<T> in) {
- return id(in.getId())
- .name(in.getName());
- }
- }
-
- @XmlElement(name = "Id", required = true)
- protected String id;
- @XmlElement(name = "Name", required = true)
- protected String name;
-
- protected IpsecVpnManagedPeer(String id, String name) {
- this.id = id;
- this.name = name;
- }
-
- protected IpsecVpnManagedPeer() {
- // for JAXB
- }
-
- /**
- * @return id of peer network
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the name of the peer network
- */
- public String getName() {
- return name;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnManagedPeer<?> that = IpsecVpnManagedPeer.class.cast(o);
- return equal(id, that.id) && equal(name, that.name);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("id", id).add("name", name);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java
deleted file mode 100644
index 745097a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java
+++ /dev/null
@@ -1,27 +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.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-@XmlSeeAlso({
- IpsecVpnLocalPeer.class,
- IpsecVpnRemotePeer.class,
- IpsecVpnThirdPartyPeer.class
-})
-public abstract class IpsecVpnPeer<T extends IpsecVpnPeer<T>> {
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
deleted file mode 100644
index 6642114..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
+++ /dev/null
@@ -1,178 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "IpsecVpnRemotePeer")
-@XmlType(propOrder = {
- "vcdUrl",
- "vcdOrganization",
- "vcdUsername"
-})
-public class IpsecVpnRemotePeer extends IpsecVpnManagedPeer<IpsecVpnRemotePeer> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnRemotePeer(this);
- }
-
- public static class Builder extends IpsecVpnManagedPeer.Builder<IpsecVpnRemotePeer> {
- private String vcdUrl;
- private String vcdOrganization;
- private String vcdUsername;
-
- /**
- * @see IpsecVpnRemotePeer#getVcdUrl()
- */
- public Builder vcdUrl(String vcdUrl) {
- this.vcdUrl = vcdUrl;
- return this;
- }
-
- /**
- * @see IpsecVpnRemotePeer#getVcdOrganization()
- */
- public Builder vcdOrganization(String vcdOrganization) {
- this.vcdOrganization = vcdOrganization;
- return this;
- }
-
- /**
- * @see IpsecVpnRemotePeer#getVcdUsername()
- */
- public Builder vcdUsername(String vcdUsername) {
- this.vcdUsername = vcdUsername;
- return this;
- }
-
- public IpsecVpnRemotePeer build() {
- return new IpsecVpnRemotePeer(id, name, vcdUrl, vcdOrganization, vcdUsername);
- }
-
- @Override
- public Builder fromIpsecVpnManagedPeerType(IpsecVpnManagedPeer<IpsecVpnRemotePeer> in) {
- return Builder.class.cast(super.fromIpsecVpnManagedPeerType(in));
- }
-
- public Builder fromIpsecVpnRemotePeer(IpsecVpnRemotePeer in) {
- return fromIpsecVpnManagedPeerType(in)
- .vcdUrl(in.getVcdUrl())
- .vcdOrganization(in.getVcdOrganization())
- .vcdUsername(in.getVcdUsername());
- }
-
-
- @Override
- public Builder id(String id) {
- return Builder.class.cast(super.id(id));
- }
-
- @Override
- public Builder name(String name) {
- return Builder.class.cast(super.name(name));
- }
-
- }
-
- private IpsecVpnRemotePeer(String id, String name, String vcdUrl, String vcdOrganization, String vcdUsername) {
- super(id, name);
- this.vcdUrl = vcdUrl;
- this.vcdOrganization = vcdOrganization;
- this.vcdUsername = vcdUsername;
- }
-
- private IpsecVpnRemotePeer() {
- // for JAXB
- }
-
- @XmlElement(name = "VcdUrl", required = true)
- protected String vcdUrl;
- @XmlElement(name = "VcdOrganization", required = true)
- protected String vcdOrganization;
- @XmlElement(name = "VcdUsername", required = true)
- protected String vcdUsername;
-
- /**
- * Gets the value of the vcdUrl property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVcdUrl() {
- return vcdUrl;
- }
-
- /**
- * Gets the value of the vcdOrganization property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVcdOrganization() {
- return vcdOrganization;
- }
-
- /**
- * Gets the value of the vcdUsername property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVcdUsername() {
- return vcdUsername;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnRemotePeer that = IpsecVpnRemotePeer.class.cast(o);
- return super.equals(that)
- && equal(vcdUrl, that.vcdUrl)
- && equal(vcdOrganization, that.vcdOrganization)
- && equal(vcdUsername, that.vcdUsername);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- vcdUrl,
- vcdOrganization,
- vcdUsername);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("vcdUrl", vcdUrl)
- .add("vcdOrganization", vcdOrganization)
- .add("vcdUsername", vcdUsername);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
deleted file mode 100644
index 277ff23..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
+++ /dev/null
@@ -1,179 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "IpsecVpnService")
-@XmlType(propOrder = {
- "externalIpAddress",
- "publicIpAddress",
- "ipsecVpnTunnels"
-})
-public class IpsecVpnService extends NetworkService<IpsecVpnService> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnService(this);
- }
-
- public static class Builder extends NetworkService.Builder<IpsecVpnService> {
-
- private String externalIpAddress;
- private String publicIpAddress;
- private List<IpsecVpnTunnel> ipsecVpnTunnels;
-
- /**
- * @see IpsecVpnService#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnService#getPublicIpAddress()
- */
- public Builder publicIpAddress(String publicIpAddress) {
- this.publicIpAddress = publicIpAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnService#getIpsecVpnTunnels()
- */
- public Builder ipsecVpnTunnels(List<IpsecVpnTunnel> ipsecVpnTunnels) {
- this.ipsecVpnTunnels = checkNotNull(ipsecVpnTunnels, "ipsecVpnTunnels");
- return this;
- }
-
- @Override
- public IpsecVpnService build() {
- return new IpsecVpnService(isEnabled, externalIpAddress, publicIpAddress, ipsecVpnTunnels);
- }
-
- @Override
- public Builder fromNetworkServiceType(NetworkService<IpsecVpnService> in) {
- return Builder.class.cast(super.fromNetworkServiceType(in));
- }
-
- public Builder fromIpsecVpnService(IpsecVpnService in) {
- return fromNetworkServiceType(in)
- .externalIpAddress(in.getExternalIpAddress())
- .publicIpAddress(in.getPublicIpAddress())
- .ipsecVpnTunnels(in.getIpsecVpnTunnels());
- }
-
- @Override
- public Builder enabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
- }
-
- private IpsecVpnService(boolean enabled, String externalIpAddress, String publicIpAddress, List<IpsecVpnTunnel> ipsecVpnTunnel) {
- super(enabled);
- this.externalIpAddress = externalIpAddress;
- this.publicIpAddress = publicIpAddress;
- this.ipsecVpnTunnels = ImmutableList.copyOf(ipsecVpnTunnel);
- }
-
- private IpsecVpnService() {
- // for JAXB
- }
-
- @XmlElement(name = "ExternalIpAddress")
- protected String externalIpAddress;
- @XmlElement(name = "PublicIpAddress")
- protected String publicIpAddress;
- @XmlElement(name = "IpsecVpnTunnel")
- protected List<IpsecVpnTunnel> ipsecVpnTunnels = Lists.newArrayList();
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the publicIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getPublicIpAddress() {
- return publicIpAddress;
- }
-
- /**
- * Gets the value of the ipsecVpnTunnel property.
- */
- public List<IpsecVpnTunnel> getIpsecVpnTunnels() {
- return Collections.unmodifiableList(this.ipsecVpnTunnels);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnService that = IpsecVpnService.class.cast(o);
- return super.equals(that) &&
- equal(externalIpAddress, that.externalIpAddress) &&
- equal(publicIpAddress, that.publicIpAddress) &&
- equal(ipsecVpnTunnels, that.ipsecVpnTunnels);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(
- super.hashCode(),
- externalIpAddress,
- publicIpAddress,
- ipsecVpnTunnels);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("externalIpAddress", externalIpAddress)
- .add("publicIpAddress", publicIpAddress)
- .add("ipsecVpnTunnels", ipsecVpnTunnels);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java
deleted file mode 100644
index 8168132..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java
+++ /dev/null
@@ -1,44 +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.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "IpsecVpnThirdPartyPeer")
-public class IpsecVpnThirdPartyPeer extends IpsecVpnUnmanagedPeer<IpsecVpnThirdPartyPeer> {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnThirdPartyPeer(this);
- }
-
- public static class Builder {
- public IpsecVpnThirdPartyPeer build() {
- return new IpsecVpnThirdPartyPeer();
- }
-
- public Builder fromIpsecVpnThirdPartyPeer(IpsecVpnThirdPartyPeer in) {
- return new Builder();
- }
- }
-
- private IpsecVpnThirdPartyPeer() {
- // for JAXB
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
deleted file mode 100644
index c30e9f2..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
+++ /dev/null
@@ -1,365 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "IpsecVpnTunnel", propOrder = {
- "name",
- "description",
- "ipsecVpnPeer",
- "peerIpAddress",
- "peerNetworkAddress",
- "peerNetworkMask",
- "sharedSecret",
- "encryptionProtocol",
- "mtu",
- "isEnabled",
- "isOperational",
- "errorDetails"
-})
-public class IpsecVpnTunnel {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnTunnel(this);
- }
-
- public static class Builder {
-
- private String name;
- private String description;
- private IpsecVpnPeer<?> ipsecVpnPeer;
- private String peerIpAddress;
- private String peerNetworkAddress;
- private String peerNetworkMask;
- private String sharedSecret;
- private String encryptionProtocol;
- private int mtu;
- private boolean isEnabled;
- private Boolean isOperational;
- private String errorDetails;
-
- /**
- * @see IpsecVpnTunnel#getName()
- */
- public Builder name(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getDescription()
- */
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getIpsecVpnPeer()
- */
- public Builder ipsecVpnPeer(IpsecVpnPeer<?> ipsecVpnPeer) {
- this.ipsecVpnPeer = ipsecVpnPeer;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getPeerIpAddress()
- */
- public Builder peerIpAddress(String peerIpAddress) {
- this.peerIpAddress = peerIpAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getPeerNetworkAddress()
- */
- public Builder peerNetworkAddress(String peerNetworkAddress) {
- this.peerNetworkAddress = peerNetworkAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getPeerNetworkMask()
- */
- public Builder peerNetworkMask(String peerNetworkMask) {
- this.peerNetworkMask = peerNetworkMask;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getSharedSecret()
- */
- public Builder sharedSecret(String sharedSecret) {
- this.sharedSecret = sharedSecret;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getEncryptionProtocol()
- */
- public Builder encryptionProtocol(String encryptionProtocol) {
- this.encryptionProtocol = encryptionProtocol;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getMtu()
- */
- public Builder mtu(int mtu) {
- this.mtu = mtu;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#isEnabled()
- */
- public Builder isEnabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#isOperational()
- */
- public Builder isOperational(Boolean isOperational) {
- this.isOperational = isOperational;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getErrorDetails()
- */
- public Builder errorDetails(String errorDetails) {
- this.errorDetails = errorDetails;
- return this;
- }
-
-
- public IpsecVpnTunnel build() {
- return new IpsecVpnTunnel
- (name, description, ipsecVpnPeer, peerIpAddress, peerNetworkAddress, peerNetworkMask, sharedSecret,
- encryptionProtocol, mtu, isEnabled, isOperational, errorDetails);
- }
-
-
- public Builder fromIpsecVpnTunnel(IpsecVpnTunnel in) {
- return name(in.getName())
- .description(in.getDescription())
- .peerIpAddress(in.getPeerIpAddress())
- .peerNetworkAddress(in.getPeerNetworkAddress())
- .peerNetworkMask(in.getPeerNetworkMask())
- .sharedSecret(in.getSharedSecret())
- .encryptionProtocol(in.getEncryptionProtocol())
- .mtu(in.getMtu())
- .isEnabled(in.isEnabled())
- .isOperational(in.isOperational())
- .errorDetails(in.getErrorDetails());
- }
- }
-
- private IpsecVpnTunnel(String name, String description, IpsecVpnPeer<?> ipsecVpnPeer, String peerIpAddress,
- String peerNetworkAddress, String peerNetworkMask, String sharedSecret, String encryptionProtocol, int mtu, boolean enabled, Boolean operational, String errorDetails) {
- this.name = name;
- this.description = description;
- this.ipsecVpnPeer = ipsecVpnPeer;
- this.peerIpAddress = peerIpAddress;
- this.peerNetworkAddress = peerNetworkAddress;
- this.peerNetworkMask = peerNetworkMask;
- this.sharedSecret = sharedSecret;
- this.encryptionProtocol = encryptionProtocol;
- this.mtu = mtu;
- isEnabled = enabled;
- isOperational = operational;
- this.errorDetails = errorDetails;
- }
-
- private IpsecVpnTunnel() {
- // for JAXB
- }
-
- @XmlElement(name = "Name", required = true)
- protected String name;
- @XmlElement(name = "Description")
- protected String description;
- @XmlElementRef
- protected IpsecVpnPeer<?> ipsecVpnPeer;
- @XmlElement(name = "PeerIpAddress", required = true)
- protected String peerIpAddress;
- @XmlElement(name = "PeerNetworkAddress", required = true)
- protected String peerNetworkAddress;
- @XmlElement(name = "PeerNetworkMask", required = true)
- protected String peerNetworkMask;
- @XmlElement(name = "SharedSecret", required = true)
- protected String sharedSecret;
- @XmlElement(name = "EncryptionProtocol", required = true)
- protected String encryptionProtocol;
- @XmlElement(name = "Mtu")
- protected int mtu;
- @XmlElement(name = "IsEnabled")
- protected boolean isEnabled;
- @XmlElement(name = "IsOperational")
- protected Boolean isOperational;
- @XmlElement(name = "ErrorDetails")
- protected String errorDetails;
-
- /**
- * Gets the value of the name property.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the value of the description property.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Details about the peer network.
- */
- public IpsecVpnPeer<?> getIpsecVpnPeer() {
- return ipsecVpnPeer;
- }
-
- /**
- * Gets the value of the peerIpAddress property.
- */
- public String getPeerIpAddress() {
- return peerIpAddress;
- }
-
- /**
- * Gets the value of the peerNetworkAddress property.
- */
- public String getPeerNetworkAddress() {
- return peerNetworkAddress;
- }
-
- /**
- * Gets the value of the peerNetworkMask property.
- */
- public String getPeerNetworkMask() {
- return peerNetworkMask;
- }
-
- /**
- * Gets the value of the sharedSecret property.
- */
- public String getSharedSecret() {
- return sharedSecret;
- }
-
- /**
- * Gets the value of the encryptionProtocol property.
- */
- public String getEncryptionProtocol() {
- return encryptionProtocol;
- }
-
- /**
- * Gets the value of the mtu property.
- */
- public int getMtu() {
- return mtu;
- }
-
- /**
- * Gets the value of the isEnabled property.
- */
- public boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Gets the value of the isOperational property.
- */
- public Boolean isOperational() {
- return isOperational;
- }
-
- /**
- * Gets the value of the errorDetails property.
- */
- public String getErrorDetails() {
- return errorDetails;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnTunnel that = IpsecVpnTunnel.class.cast(o);
- return equal(name, that.name) &&
- equal(description, that.description) &&
- equal(peerIpAddress, that.peerIpAddress) &&
- equal(peerNetworkAddress, that.peerNetworkAddress) &&
- equal(peerNetworkMask, that.peerNetworkMask) &&
- equal(sharedSecret, that.sharedSecret) &&
- equal(encryptionProtocol, that.encryptionProtocol) &&
- equal(mtu, that.mtu) &&
- equal(isEnabled, that.isEnabled) &&
- equal(isOperational, that.isOperational) &&
- equal(errorDetails, that.errorDetails);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name,
- description,
- peerIpAddress,
- peerNetworkAddress,
- peerNetworkMask,
- sharedSecret,
- encryptionProtocol,
- mtu,
- isEnabled,
- isOperational,
- errorDetails);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("name", name)
- .add("description", description)
- .add("peerIpAddress", peerIpAddress)
- .add("peerNetworkAddress", peerNetworkAddress)
- .add("peerNetworkMask", peerNetworkMask)
- .add("sharedSecret", sharedSecret)
- .add("encryptionProtocol", encryptionProtocol)
- .add("mtu", mtu)
- .add("isEnabled", isEnabled)
- .add("isOperational", isOperational)
- .add("errorDetails", errorDetails).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java
deleted file mode 100644
index d098e6a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java
+++ /dev/null
@@ -1,25 +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.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-@XmlSeeAlso(
- IpsecVpnThirdPartyPeer.class
-)
-public abstract class IpsecVpnUnmanagedPeer<T extends IpsecVpnUnmanagedPeer<T>> extends IpsecVpnPeer<T> {
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
deleted file mode 100644
index bd65b0e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
+++ /dev/null
@@ -1,162 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents the NAT basic rule for one to one mapping of internal
- * and external IP addresses from a network.
- */
-@XmlType(name = "NatOneToOneBasicRule", propOrder = {
- "mappingMode",
- "externalIpAddress",
- "internalIpAddress"
-})
-public class NatOneToOneBasicRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatOneToOneBasicRule(this);
- }
-
- public static class Builder {
-
- private String mappingMode;
- private String externalIpAddress;
- private String internalIpAddress;
-
- /**
- * @see NatOneToOneBasicRule#getMappingMode()
- */
- public Builder mappingMode(String mappingMode) {
- this.mappingMode = mappingMode;
- return this;
- }
-
- /**
- * @see NatOneToOneBasicRule#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NatOneToOneBasicRule#getInternalIpAddress()
- */
- public Builder internalIpAddress(String internalIpAddress) {
- this.internalIpAddress = internalIpAddress;
- return this;
- }
-
- public NatOneToOneBasicRule build() {
- return new NatOneToOneBasicRule(mappingMode, externalIpAddress, internalIpAddress);
- }
-
- public Builder fromNatOneToOneBasicRule(NatOneToOneBasicRule in) {
- return mappingMode(in.getMappingMode())
- .externalIpAddress(in.getExternalIpAddress())
- .internalIpAddress(in.getInternalIpAddress());
- }
- }
-
- private NatOneToOneBasicRule(String mappingMode, String externalIpAddress, String internalIpAddress) {
- this.mappingMode = mappingMode;
- this.externalIpAddress = externalIpAddress;
- this.internalIpAddress = internalIpAddress;
- }
-
- private NatOneToOneBasicRule() {
- // For JAXB
- }
-
-
- @XmlElement(name = "MappingMode", required = true)
- protected String mappingMode;
- @XmlElement(name = "ExternalIpAddress", required = true)
- protected String externalIpAddress;
- @XmlElement(name = "InternalIpAddress", required = true)
- protected String internalIpAddress;
-
- /**
- * Gets the value of the mappingMode property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getMappingMode() {
- return mappingMode;
- }
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the internalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getInternalIpAddress() {
- return internalIpAddress;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatOneToOneBasicRule that = NatOneToOneBasicRule.class.cast(o);
- return equal(mappingMode, that.mappingMode) &&
- equal(externalIpAddress, that.externalIpAddress) &&
- equal(internalIpAddress, that.internalIpAddress);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(mappingMode,
- externalIpAddress,
- internalIpAddress);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("mappingMode", mappingMode)
- .add("externalIpAddress", externalIpAddress)
- .add("internalIpAddress", internalIpAddress).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
deleted file mode 100644
index f64a361..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
+++ /dev/null
@@ -1,185 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents the NAT rule for one to one mapping of VM NIC and
- * external IP addresses from a network.
- */
-@XmlType(name = "NatOneToOneVmRule", propOrder = {
- "mappingMode",
- "externalIpAddress",
- "vAppScopedVmId",
- "vmNicId"
-})
-public class NatOneToOneVmRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatOneToOneVmRule(this);
- }
-
- public static class Builder {
-
- private String mappingMode;
- private String externalIpAddress;
- private String vAppScopedVmId;
- private int vmNicId;
-
- /**
- * @see NatOneToOneVmRule#getMappingMode()
- */
- public Builder mappingMode(String mappingMode) {
- this.mappingMode = mappingMode;
- return this;
- }
-
- /**
- * @see NatOneToOneVmRule#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NatOneToOneVmRule#getVAppScopedVmId()
- */
- public Builder vAppScopedVmId(String vAppScopedVmId) {
- this.vAppScopedVmId = vAppScopedVmId;
- return this;
- }
-
- /**
- * @see NatOneToOneVmRule#getVmNicId()
- */
- public Builder vmNicId(int vmNicId) {
- this.vmNicId = vmNicId;
- return this;
- }
-
- public NatOneToOneVmRule build() {
- return new NatOneToOneVmRule(mappingMode, externalIpAddress, vAppScopedVmId, vmNicId);
- }
-
- public Builder fromNatOneToOneVmRule(NatOneToOneVmRule in) {
- return mappingMode(in.getMappingMode())
- .externalIpAddress(in.getExternalIpAddress())
- .vAppScopedVmId(in.getVAppScopedVmId())
- .vmNicId(in.getVmNicId());
- }
- }
-
- private NatOneToOneVmRule(String mappingMode, String externalIpAddress, String vAppScopedVmId, int vmNicId) {
- this.mappingMode = mappingMode;
- this.externalIpAddress = externalIpAddress;
- this.vAppScopedVmId = vAppScopedVmId;
- this.vmNicId = vmNicId;
- }
-
- private NatOneToOneVmRule() {
- // For JAXB
- }
-
- @XmlElement(name = "MappingMode", required = true)
- protected String mappingMode;
- @XmlElement(name = "ExternalIpAddress")
- protected String externalIpAddress;
- @XmlElement(name = "VAppScopedVmId", required = true)
- protected String vAppScopedVmId;
- @XmlElement(name = "VmNicId")
- protected int vmNicId;
-
- /**
- * Gets the value of the mappingMode property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getMappingMode() {
- return mappingMode;
- }
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the vAppScopedVmId property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVAppScopedVmId() {
- return vAppScopedVmId;
- }
-
- /**
- * Gets the value of the vmNicId property.
- */
- public int getVmNicId() {
- return vmNicId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatOneToOneVmRule that = NatOneToOneVmRule.class.cast(o);
- return equal(mappingMode, that.mappingMode) &&
- equal(externalIpAddress, that.externalIpAddress) &&
- equal(vAppScopedVmId, that.vAppScopedVmId) &&
- equal(vmNicId, that.vmNicId);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(mappingMode,
- externalIpAddress,
- vAppScopedVmId,
- vmNicId);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("mappingMode", mappingMode)
- .add("externalIpAddress", externalIpAddress)
- .add("vAppScopedVmId", vAppScopedVmId)
- .add("vmNicId", vmNicId).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
deleted file mode 100644
index 11d2fdc..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
+++ /dev/null
@@ -1,209 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents the NAT rule for port forwarding between internal
- * IP/port and external IP/port.
- */
-@XmlType(name = "NatPortForwardingRule", propOrder = {
- "externalIpAddress",
- "externalPort",
- "internalIpAddress",
- "internalPort",
- "protocol"
-})
-public class NatPortForwardingRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatPortForwardingRule(this);
- }
-
- public static class Builder {
-
- private String externalIpAddress;
- private int externalPort;
- private String internalIpAddress;
- private int internalPort;
- private String protocol;
-
- /**
- * @see NatPortForwardingRule#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getExternalPort()
- */
- public Builder externalPort(int externalPort) {
- this.externalPort = externalPort;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getInternalIpAddress()
- */
- public Builder internalIpAddress(String internalIpAddress) {
- this.internalIpAddress = internalIpAddress;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getInternalPort()
- */
- public Builder internalPort(int internalPort) {
- this.internalPort = internalPort;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getProtocol()
- */
- public Builder protocol(String protocol) {
- this.protocol = protocol;
- return this;
- }
-
- public NatPortForwardingRule build() {
- return new NatPortForwardingRule(externalIpAddress, externalPort, internalIpAddress, internalPort, protocol);
- }
-
- public Builder fromNatPortForwardingRule(NatPortForwardingRule in) {
- return externalIpAddress(in.getExternalIpAddress())
- .externalPort(in.getExternalPort())
- .internalIpAddress(in.getInternalIpAddress())
- .internalPort(in.getInternalPort())
- .protocol(in.getProtocol());
- }
- }
-
- private NatPortForwardingRule(String externalIpAddress, int externalPort, String internalIpAddress, int internalPort, String protocol) {
- this.externalIpAddress = externalIpAddress;
- this.externalPort = externalPort;
- this.internalIpAddress = internalIpAddress;
- this.internalPort = internalPort;
- this.protocol = protocol;
- }
-
- private NatPortForwardingRule() {
- // For JAXB
- }
-
- @XmlElement(name = "ExternalIpAddress", required = true)
- protected String externalIpAddress;
- @XmlElement(name = "ExternalPort")
- protected int externalPort;
- @XmlElement(name = "InternalIpAddress", required = true)
- protected String internalIpAddress;
- @XmlElement(name = "InternalPort")
- protected int internalPort;
- @XmlElement(name = "Protocol", required = true)
- protected String protocol;
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the externalPort property.
- */
- public int getExternalPort() {
- return externalPort;
- }
-
- /**
- * Gets the value of the internalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getInternalIpAddress() {
- return internalIpAddress;
- }
-
- /**
- * Gets the value of the internalPort property.
- */
- public int getInternalPort() {
- return internalPort;
- }
-
- /**
- * Gets the value of the protocol property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getProtocol() {
- return protocol;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatPortForwardingRule that = NatPortForwardingRule.class.cast(o);
- return equal(externalIpAddress, that.externalIpAddress) &&
- equal(externalPort, that.externalPort) &&
- equal(internalIpAddress, that.internalIpAddress) &&
- equal(internalPort, that.internalPort) &&
- equal(protocol, that.protocol);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(externalIpAddress,
- externalPort,
- internalIpAddress,
- internalPort,
- protocol);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("externalIpAddress", externalIpAddress)
- .add("externalPort", externalPort)
- .add("internalIpAddress", internalIpAddress)
- .add("internalPort", internalPort)
- .add("protocol", protocol).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
deleted file mode 100644
index 489c0b5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
+++ /dev/null
@@ -1,211 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "NatRule", propOrder = {
- "description",
- "oneToOneBasicRule",
- "oneToOneVmRule",
- "portForwardingRule",
- "vmRule"
-})
-public class NatRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatRule(this);
- }
-
- public static class Builder {
- private String description;
- private NatOneToOneBasicRule oneToOneBasicRule;
- private NatOneToOneVmRule oneToOneVmRule;
- private NatPortForwardingRule portForwardingRule;
- private NatVmRule vmRule;
-
- /**
- * @see NatRule#getDescription()
- */
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * @see NatRule#getOneToOneBasicRule()
- */
- public Builder oneToOneBasicRule(NatOneToOneBasicRule oneToOneBasicRule) {
- this.oneToOneBasicRule = oneToOneBasicRule;
- return this;
- }
-
- /**
- * @see NatRule#getOneToOneVmRule()
- */
- public Builder oneToOneVmRule(NatOneToOneVmRule oneToOneVmRule) {
- this.oneToOneVmRule = oneToOneVmRule;
- return this;
- }
-
- /**
- * @see NatRule#getPortForwardingRule()
- */
- public Builder portForwardingRule(NatPortForwardingRule portForwardingRule) {
- this.portForwardingRule = portForwardingRule;
- return this;
- }
-
- /**
- * @see NatRule#getVmRule()
- */
- public Builder vmRule(NatVmRule vmRule) {
- this.vmRule = vmRule;
- return this;
- }
-
- public NatRule build() {
- return new NatRule(description, oneToOneBasicRule, oneToOneVmRule, portForwardingRule, vmRule);
- }
-
- public Builder fromNatRule(NatRule in) {
- return description(in.getDescription())
- .oneToOneBasicRule(in.getOneToOneBasicRule())
- .oneToOneVmRule(in.getOneToOneVmRule())
- .portForwardingRule(in.getPortForwardingRule())
- .vmRule(in.getVmRule());
- }
- }
-
- public NatRule(String description, NatOneToOneBasicRule oneToOneBasicRule, NatOneToOneVmRule oneToOneVmRule,
- NatPortForwardingRule portForwardingRule, NatVmRule vmRule) {
- this.description = description;
- this.oneToOneBasicRule = oneToOneBasicRule;
- this.oneToOneVmRule = oneToOneVmRule;
- this.portForwardingRule = portForwardingRule;
- this.vmRule = vmRule;
- }
-
- NatRule() {
- // for JAXB
- }
-
- @XmlElement(name = "Description")
- protected String description;
- @XmlElement(name = "OneToOneBasicRule")
- protected NatOneToOneBasicRule oneToOneBasicRule;
- @XmlElement(name = "OneToOneVmRule")
- protected NatOneToOneVmRule oneToOneVmRule;
- @XmlElement(name = "PortForwardingRule")
- protected NatPortForwardingRule portForwardingRule;
- @XmlElement(name = "VmRule")
- protected NatVmRule vmRule;
-
- /**
- * Gets the value of the description property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Gets the value of the oneToOneBasicRule property.
- *
- * @return possible object is
- * {@link NatOneToOneBasicRule }
- */
- public NatOneToOneBasicRule getOneToOneBasicRule() {
- return oneToOneBasicRule;
- }
-
-
- /**
- * Gets the value of the oneToOneVmRule property.
- *
- * @return possible object is
- * {@link NatOneToOneVmRule }
- */
- public NatOneToOneVmRule getOneToOneVmRule() {
- return oneToOneVmRule;
- }
-
- /**
- * Gets the value of the portForwardingRule property.
- *
- * @return possible object is
- * {@link NatPortForwardingRule }
- */
- public NatPortForwardingRule getPortForwardingRule() {
- return portForwardingRule;
- }
-
- /**
- * Gets the value of the vmRule property.
- *
- * @return possible object is
- * {@link NatVmRule }
- */
- public NatVmRule getVmRule() {
- return vmRule;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatRule that = NatRule.class.cast(o);
- return equal(description, that.description) &&
- equal(oneToOneBasicRule, that.oneToOneBasicRule) &&
- equal(oneToOneVmRule, that.oneToOneVmRule) &&
- equal(portForwardingRule, that.portForwardingRule) &&
- equal(vmRule, that.vmRule);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(description,
- oneToOneBasicRule,
- oneToOneVmRule,
- portForwardingRule,
- vmRule);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("description", description)
- .add("oneToOneBasicRule", oneToOneBasicRule)
- .add("oneToOneVmRule", oneToOneVmRule)
- .add("portForwardingRule", portForwardingRule)
- .add("vmRule", vmRule).toString();
- }
-
-}
[09/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiLiveTest.java
deleted file mode 100644
index 2ebc07e..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiLiveTest.java
+++ /dev/null
@@ -1,332 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkCustomizationSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkLeaseSettingsSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataFor;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataKeyAbsentFor;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkNetworkConfigSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOvfEnvelope;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOvfNetworkSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOwner;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkProductSectionList;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkVAppTemplate;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.metadataToMap;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.vcloud.director.v1_5.AbstractVAppApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Link.Rel;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-
-/**
- * NOTE The environment MUST have at least one template configured
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "VAppTemplateApiLiveTest")
-public class VAppTemplateApiLiveTest extends AbstractVAppApiLiveTest {
-
- private URI vAppTemplateHref;
- private String key;
- private String val;
-
- @BeforeClass
- void setUp() {
- vAppTemplateHref = context.resolveIdToHref(vAppTemplateId);
- }
-
- @AfterClass(alwaysRun = true, dependsOnMethods = { "cleanUpEnvironment" })
- protected void tidyUp() {
- if (key != null) {
- try {
- Task remove = context.getApi().getMetadataApi(vAppTemplateHref).remove(key);
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error when deleting metadata entry '%s'", key);
- }
- }
- }
-
- private VAppTemplate cloneVAppTemplate(boolean waitForTask) throws Exception {
- CloneVAppTemplateParams cloneVAppTemplateParams = CloneVAppTemplateParams.builder()
- .source(Reference.builder().href(lazyGetVAppTemplate().getHref()).build()).isSourceDelete(false)
- .name("clone").build();
- VAppTemplate clonedVappTemplate = vdcApi
- .cloneVAppTemplate(context.resolveIdToHref(vdcId), cloneVAppTemplateParams);
-
- if (waitForTask) {
- Task cloneTask = Iterables.getFirst(clonedVappTemplate.getTasks(), null);
- assertNotNull(cloneTask, "vdcApi.cloneVAppTemplate returned VAppTemplate that did not contain any tasks");
- assertTaskSucceeds(cloneTask);
- }
- return clonedVappTemplate;
- }
-
- @Test(description = "GET /vAppTemplate/{id}")
- public void testGetVAppTemplate() {
- vAppTemplate = vAppTemplateApi.get(vAppTemplateHref);
-
- checkVAppTemplate(vAppTemplate);
- assertEquals(vAppTemplate.getId(), vAppTemplateId);
- }
-
- @Test(description = "GET /vAppTemplate/{id}/owner")
- public void testGetVAppTemplateOwner() {
- Owner owner = vAppTemplateApi.getOwner(vAppTemplateHref);
-
- checkOwner(owner);
- assertEquals(owner.getUser(), vAppTemplateApi.get(vAppTemplateHref).getOwner().getUser());
- }
-
- @Test(description = "GET /vAppTemplate/{id}/customizationSection")
- public void testGetCustomizationSection() {
- CustomizationSection customizationSection = vAppTemplateApi.getCustomizationSection(vAppTemplateHref);
-
- checkCustomizationSection(customizationSection);
- }
-
- @Test(description = "GET /vAppTemplate/{id}/productSections")
- public void testGetProductSections() {
- ProductSectionList productSectionList = vAppTemplateApi.getProductSections(vAppTemplateHref);
-
- checkProductSectionList(productSectionList);
- }
-
- @Test(description = "GET /vAppTemplate/{id}/leaseSettingsSection")
- public void testGetLeaseSettingsSection() {
- LeaseSettingsSection leaseSettingsSection = vAppTemplateApi.getLeaseSettingsSection(vAppTemplateHref);
-
- checkLeaseSettingsSection(leaseSettingsSection);
- }
-
- @Test(description = "GET /vAppTemplate/{id}/metadata", dependsOnMethods = { "testEditMetadataValue" })
- public void testGetVAppTemplateMetadata() {
- Metadata metadata = context.getApi().getMetadataApi(vAppTemplateHref).get();
-
- checkMetadata(metadata);
- }
-
- // implicitly tested by testEditVAppTemplateMetadataValue, which first adds the metadata entry;
- // otherwise no entry may exist
- @Test(description = "GET /vAppTemplate/{id}/metadata/{key}", dependsOnMethods = { "testGetVAppTemplateMetadata" })
- public void testGetMetadataValue() {
- Metadata metadata = context.getApi().getMetadataApi(vAppTemplateHref).get();
- MetadataEntry entry = Iterables.get(metadata.getMetadataEntries(), 0);
-
- String val = context.getApi().getMetadataApi(vAppTemplateHref).get(entry.getKey());
-
- assertEquals(val, entry.getValue());
- }
-
- @Test(description = "GET /vAppTemplate/{id}/networkConfigSection")
- public void testGetVAppTemplateNetworkConfigSection() {
- NetworkConfigSection networkConfigSection = vAppTemplateApi.getNetworkConfigSection(vAppTemplateHref);
-
- checkNetworkConfigSection(networkConfigSection);
- }
-
- @Test(description = "GET /vAppTemplate/{id}/networkSection")
- public void testGetVAppTemplateNetworkSection() {
- NetworkSection networkSection = vAppTemplateApi.getNetworkSection(vAppTemplateHref);
-
- checkOvfNetworkSection(networkSection);
- }
-
- @Test(description = "GET /vAppTemplate/{id}/ovf")
- public void testGetVAppTemplateOvf() {
- Envelope envelope = vAppTemplateApi.getOvf(vAppTemplateHref);
-
- checkOvfEnvelope(envelope);
- }
-
- @Test(description = "PUT /vAppTemplate/{id}")
- public void testEditVAppTemplate() {
- String name = name("myname-");
- String description = name("Description ");
- VAppTemplate template = VAppTemplate.builder().name(name).description(description).build();
-
- final Task task = vAppTemplateApi.edit(vAppTemplateHref, template);
- assertTaskSucceeds(task);
-
- VAppTemplate newTemplate = vAppTemplateApi.get(vAppTemplateHref);
- assertEquals(newTemplate.getName(), name);
- assertEquals(newTemplate.getDescription(), description);
- }
-
- @Test(description = "POST /vAppTemplate/{id}/metadata", dependsOnMethods = { "testGetVAppTemplate" })
- public void testEditMetadata() {
- Metadata oldMetadata = context.getApi().getMetadataApi(vAppTemplateHref).get();
- Map<String, String> oldMetadataMap = metadataToMap(oldMetadata);
-
- key = name("key-");
- val = name("value-");
-
- final Task task = context.getApi().getMetadataApi(vAppTemplateHref).putAll(ImmutableMap.of(key, val));
- assertTaskSucceeds(task);
-
- Metadata newMetadata = context.getApi().getMetadataApi(vAppTemplateHref).get();
- Map<String, String> expectedMetadataMap = ImmutableMap.<String, String> builder().putAll(oldMetadataMap)
- .put(key, val).build();
- checkMetadataFor("vAppTemplate", newMetadata, expectedMetadataMap);
- }
-
- @Test(description = "PUT /vAppTemplate/{id}/metadata/{key}", dependsOnMethods = { "testEditMetadata" })
- public void testEditMetadataValue() {
- val = "new" + val;
-
- final Task task = context.getApi().getMetadataApi(vAppTemplateHref).put(key, val);
- retryTaskSuccess.apply(task);
-
- String newMetadataValue = context.getApi().getMetadataApi(vAppTemplateHref).get(key);
- assertEquals(newMetadataValue, val);
- }
-
- @Test(description = "DELETE /vAppTemplate/{id}/metadata/{key}", dependsOnMethods = { "testGetMetadataValue" })
- public void testRemoveVAppTemplateMetadataValue() {
- final Task deletionTask = context.getApi().getMetadataApi(vAppTemplateHref).remove(key);
- assertTaskSucceeds(deletionTask);
-
- Metadata newMetadata = context.getApi().getMetadataApi(vAppTemplateHref).get();
- checkMetadataKeyAbsentFor("vAppTemplate", newMetadata, key);
- key = null;
- }
-
- // NOTE vAppTemplate supports only storageLease (deployment lease applies to vApp too)
- @Test(description = "PUT /vAppTemplate/{id}/leaseSettingsSection")
- public void testEditLeaseSettingsSection() throws Exception {
- // NOTE use smallish number for storageLeaseInSeconds; it seems to be capped at 5184000?
- int storageLeaseInSeconds = random.nextInt(10000) + 1;
-
- LeaseSettingsSection leaseSettingSection = LeaseSettingsSection.builder().info("my info")
- .storageLeaseInSeconds(storageLeaseInSeconds).build();
-
- final Task task = vAppTemplateApi.editLeaseSettingsSection(vAppTemplateHref, leaseSettingSection);
- assertTaskSucceeds(task);
-
- LeaseSettingsSection newLeaseSettingsSection = vAppTemplateApi.getLeaseSettingsSection(vAppTemplateHref);
- assertEquals(newLeaseSettingsSection.getStorageLeaseInSeconds(), (Integer) storageLeaseInSeconds);
- }
-
- @Test(description = "DELETE /vAppTemplate/{id}", dependsOnMethods = { "testGetVAppTemplate" })
- public void testRemoveVAppTemplate() throws Exception {
- VAppTemplate clonedVappTemplate = cloneVAppTemplate(true);
-
- // Confirm that "get" works pre-remove
- VAppTemplate vAppTemplatePreDelete = vAppTemplateApi.get(clonedVappTemplate.getHref());
- checkVAppTemplate(vAppTemplatePreDelete);
-
- // Delete the template
- final Task task = vAppTemplateApi.remove(clonedVappTemplate.getHref());
- assertTaskSucceeds(task);
-
- // Confirm that can't access post-remove, i.e. template has been removed
- VAppTemplate removed = vAppTemplateApi.get(clonedVappTemplate.getHref());
- assertNull(removed);
- }
-
- @Test(description = "POST /vAppTemplate/{id}/action/disableDownload")
- public void testDisableVAppTemplateDownload() throws Exception {
- vAppTemplateApi.disableDownload(vAppTemplateHref);
-
- // TODO Check that it really is disabled. The only thing I can see for determining this
- // is the undocumented "download" link in the VAppTemplate. But that is brittle and we
- // don't know what timing guarantees there are for adding/removing the link.
- VAppTemplate vAppTemplate = vAppTemplateApi.get(vAppTemplateHref);
- Set<Link> links = vAppTemplate.getLinks();
- assertTrue(Iterables.all(Iterables.transform(links, rel),
- Predicates.not(Predicates.in(EnumSet.of(Link.Rel.DOWNLOAD_DEFAULT, Link.Rel.DOWNLOAD_ALTERNATE)))),
- "Should not offer download link after disabling download: " + vAppTemplate);
- }
-
- @Test(description = "POST /vAppTemplate/{id}/action/enableDownload")
- public void testEnableVAppTemplateDownload() throws Exception {
- // First disable so that enable really has some work to do...
- vAppTemplateApi.disableDownload(vAppTemplateHref);
- final Task task = vAppTemplateApi.enableDownload(vAppTemplateHref);
- assertTaskSucceedsLong(task);
-
- // TODO Check that it really is enabled. The only thing I can see for determining this
- // is the undocumented "download" link in the VAppTemplate. But that is brittle and we
- // don't know what timing guarantees there are for adding/removing the link.
- VAppTemplate vAppTemplate = vAppTemplateApi.get(vAppTemplateHref);
- Set<Link> links = vAppTemplate.getLinks();
- assertTrue(
- Iterables.any(Iterables.transform(links, rel),
- Predicates.in(EnumSet.of(Link.Rel.DOWNLOAD_DEFAULT, Link.Rel.DOWNLOAD_ALTERNATE))),
- "Should offer download link after enabling download: " + vAppTemplate);
- }
-
- private Function<Link, Link.Rel> rel = new Function<Link, Link.Rel>() {
- @Override
- public Rel apply(Link input) {
- return input.getRel();
- }
- };
-
- // This failed previously, but is passing now.
- // However, it's not part of the official API so not necessary to assert it.
- @Test(description = "test completed task not included in vAppTemplate")
- public void testCompletedTaskNotIncludedInVAppTemplate() throws Exception {
- // Kick off a task, and wait for it to complete
- vAppTemplateApi.disableDownload(vAppTemplateHref);
- final Task task = vAppTemplateApi.enableDownload(vAppTemplateHref);
- assertTaskDoneEventually(task);
-
- // Ask the VAppTemplate for its tasks, and the status of the matching task if it exists
- VAppTemplate vAppTemplate = vAppTemplateApi.get(vAppTemplateHref);
- List<Task> tasks = vAppTemplate.getTasks();
- for (Task contender : tasks) {
- if (task.getId().equals(contender.getId())) {
- Task.Status status = contender.getStatus();
- if (EnumSet.of(Task.Status.QUEUED, Task.Status.PRE_RUNNING, Task.Status.RUNNING).contains(status)) {
- fail("Task " + contender + " reported complete, but is included in VAppTemplate in status " + status);
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiExpectTest.java
deleted file mode 100644
index ddcd6b7..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiExpectTest.java
+++ /dev/null
@@ -1,575 +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.vcloud.director.v1_5.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-import java.text.ParseException;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Capabilities;
-import org.jclouds.vcloud.director.v1_5.domain.CapacityWithUsage;
-import org.jclouds.vcloud.director.v1_5.domain.ComputeCapacity;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.Media.ImageType;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.User;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "VdcApiExpectTest")
-public class VdcApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private URI vdcURI;
-
- @BeforeClass
- public void before() {
- String vdcId = "e9cd3387-ac57-4d27-a481-9bee75e0690f";
- vdcURI = URI.create(endpoint + "/vdc/" + vdcId);
- }
-
- @Test
- public void testGetVdc() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/vdc.xml", VCloudDirectorMediaType.VDC)
- .httpResponseBuilder().build());
-
- Vdc expected = getVdc();
-
- assertEquals(api.getVdcApi().get(vdcURI), expected);
- }
-
- @Test
- public void testResponse400ForInvalidVdcId() {
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/vdc/NOTAUUID")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/error400.xml", VCloudDirectorMediaType.ERROR)
- .httpResponseBuilder().statusCode(400).build());
-
- Error expected = Error.builder()
- .message("validation error : EntityRef has incorrect type, expected type is com.vmware.vcloud.entity.vdc.")
- .majorErrorCode(400)
- .minorErrorCode("BAD_REQUEST")
- .build();
-
- try {
- api.getVdcApi().get(URI.create(endpoint + "/vdc/NOTAUUID"));
- fail("Should give HTTP 400 error");
- } catch (VCloudDirectorException vde) {
- assertEquals(vde.getError(), expected);
- }
- }
-
- @Test
- public void testResponse403ForFakeVdcId() {
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/vdc/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/error403-fake.xml", VCloudDirectorMediaType.ERROR)
- .httpResponseBuilder().statusCode(403).build());
-
- assertNull(api.getVdcApi().get(URI.create(endpoint + "/vdc/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")));
- }
-
- @Test(enabled = false)
- public void testCaptureVApp() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp")
- .xmlFilePayload("/vdc/params/captureVApp.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/vdc.xml", VCloudDirectorMediaType.VDC)
- .httpResponseBuilder().build());
-
- VAppTemplate expected = captureVApp();
-
- // TODO: configure params
- CaptureVAppParams params = CaptureVAppParams.builder()
-
- .build();
-
- assertEquals(api.getVdcApi().captureVApp(vdcURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testResponse4xxForCaptureVAppNoParams() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp")
- .xmlFilePayload("/vdc/params/captureVApp.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/param/error400.xml", VCloudDirectorMediaType.ERROR)
- .httpResponseBuilder().statusCode(400).build());
-
- Error expected = Error.builder()
- .message("?")
- .majorErrorCode(400)
- .minorErrorCode("BAD_REQUEST")
- .build();
-
- try {
- api.getVdcApi().captureVApp(vdcURI, null);
- fail("Should give HTTP 400 error");
- } catch (VCloudDirectorException vde) {
- assertEquals(vde.getError(), expected);
- }
- }
-
- @Test(enabled = false)
- public void testCloneVApp() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate")
- .xmlFilePayload("/vdc/params/cloneVApp.xml", VCloudDirectorMediaType.CLONE_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/cloneVApp.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- VApp expected = cloneVApp();
-
- // TODO: configure params
- CloneVAppParams params = CloneVAppParams.builder()
-
- .build();
-
- assertEquals(api.getVdcApi().cloneVApp(vdcURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testCloneVAppTemplate() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate")
- .xmlFilePayload("/vdc/params/cloneVAppTemplate.xml", VCloudDirectorMediaType.CLONE_VAPP_TEMPLATE_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/cloneVAppTemplate.xml", VCloudDirectorMediaType.VAPP_TEMPLATE)
- .httpResponseBuilder().build());
-
- VAppTemplate expected = cloneVAppTemplate();
-
- // TODO: configure params
- CloneVAppTemplateParams params = CloneVAppTemplateParams.builder()
-
- .build();
-
- assertEquals(api.getVdcApi().cloneVAppTemplate(vdcURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testComposeVApp() throws ParseException {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/composeVApp")
- .xmlFilePayload("/vdc/composeVAppParams.xml", VCloudDirectorMediaType.COMPOSE_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/composeVApp.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- VApp expected = composeVApp();
-
- // TODO: configure params
- ComposeVAppParams params = ComposeVAppParams.builder()
-
- .build();
-
- assertEquals(api.getVdcApi().composeVApp(vdcURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testInstantiateVAppTemplate() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/instantiateVAppTemplate")
- .xmlFilePayload("/vdc/params/instantiateVAppTemplate.xml", VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/instantiateVAppTemplate.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- VApp expected = instantiateVAppTemplate();
-
- // TODO: configure params
- InstantiateVAppTemplateParams params = InstantiateVAppTemplateParams.builder()
-
- .build();
-
- assertEquals(api.getVdcApi().instantiateVApp(vdcURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testUploadVAppTemplate() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/uploadVAppTemplate")
- .xmlFilePayload("/vdc/params/uploadVAppTemplate.xml", VCloudDirectorMediaType.UPLOAD_VAPP_TEMPLATE_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/uploadVAppTemplate.xml", VCloudDirectorMediaType.VAPP_TEMPLATE)
- .httpResponseBuilder().build());
-
- VAppTemplate expected = uploadVAppTemplate();
-
- // TODO: configure params
- UploadVAppTemplateParams params = UploadVAppTemplateParams.builder()
-
- .build();
-
- assertEquals(api.getVdcApi().uploadVAppTemplate(vdcURI, params), expected);
- }
-
- @Test
- public void testAddMedia() {
- URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media")
- .acceptMedia(VCloudDirectorMediaType.MEDIA)
- .xmlFilePayload("/media/addMediaSource.xml", VCloudDirectorMediaType.MEDIA)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/addMedia.xml", VCloudDirectorMediaType.MEDIA)
- .httpResponseBuilder().statusCode(201).build());
-
- Media source = Media.builder()
- .size(0)
- .imageType(ImageType.ISO)
- .name("Test media 1")
- .type("application/vnd.vmware.vcloud.media+xml")
- .description("Test media generated by testCreateMedia()")
- .build();
- Media expected = MediaApiExpectTest.addMedia();
-
- assertEquals(api.getVdcApi().addMedia(vdcUri, source), expected);
- }
-
- @Test
- public void testCloneMedia() {
- URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia")
- .acceptMedia(VCloudDirectorMediaType.MEDIA)
- .xmlFilePayload("/media/cloneMediaParams.xml", VCloudDirectorMediaType.CLONE_MEDIA_PARAMS)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/cloneMedia.xml", VCloudDirectorMediaType.MEDIA)
- .httpResponseBuilder().statusCode(201).build());
-
- CloneMediaParams params = CloneMediaParams.builder()
- .name("moved test media")
- .description("moved by testCloneMedia()")
- .source(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("copied test media")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/da8361af-cccd-4103-a71c-493513c49094"))
- .build())
- .isSourceDelete(false)
- .build();
- Media expected = MediaApiExpectTest.cloneMedia();
-
- assertEquals(api.getVdcApi().cloneMedia(vdcUri, params), expected);
- }
-
- @Test(enabled = false)
- public void testGetMetadata() {
- URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/metadata.xml", VCloudDirectorMediaType.METADATA)
- .httpResponseBuilder().build());
-
- Metadata expected = metadata();
-
- assertEquals(api.getMetadataApi(vdcUri).get(), expected);
- }
-
- @Test(enabled = false)
- public void testGetMetadataValue() {
- URI vdcUri = URI.create("https://vcloudbeta.bluelock.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata/key")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/metadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE)
- .httpResponseBuilder().build());
-
- assertEquals(api.getMetadataApi(vdcUri).get("key"), "");
- }
-
- public static Vdc getVdc() {
- return Vdc.builder()
- .status(1)
- .name("orgVDC-cloudsoft-Tier1-PAYG")
- .id("urn:vcloud:vdc:e9cd3387-ac57-4d27-a481-9bee75e0690f")
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.org+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/org/c076f90a-397a-49fa-89b8-b294c1599cd0"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/metadata"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.uploadVAppTemplateParams+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/uploadVAppTemplate"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.media+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/instantiateVAppTemplate"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.cloneVAppParams+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVApp"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.cloneVAppTemplateParams+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.cloneMediaParams+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.captureVAppParams+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/captureVApp"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.composeVAppParams+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/composeVApp"))
- .build())
- .description("Pay As You go resources for organization cloudsoft ")
- .allocationModel("AllocationVApp")
- .storageCapacity(new CapacityWithUsage.Builder()
- .units("MB")
- .allocated(0l)
- .limit(0l)
- .used(4519l)
- .overhead(0l)
- .build())
- .computeCapacity(ComputeCapacity.builder()
- .cpu(new CapacityWithUsage.Builder()
- .units("MHz")
- .allocated(0l)
- .limit(0l)
- .used(0l)
- .overhead(0l)
- .build())
- .memory(new CapacityWithUsage.Builder()
- .units("MB")
- .allocated(0l)
- .limit(0l)
- .used(0l)
- .overhead(0l)
- .build())
- .build())
- .resourceEntity(Reference.builder()
- .type("application/vnd.vmware.vcloud.vApp+xml")
- .name("vcdcap-db9")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vapp-e2a4ab74-ea62-4afa-8bb7-0c11259044fb"))
- .build())
- .resourceEntity(Reference.builder()
- .type("application/vnd.vmware.vcloud.vAppTemplate+xml")
- .name("adriancolecap")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vAppTemplate/vappTemplate-5571eb21-f532-4506-9737-01a4635a04cb"))
- .build())
- .resourceEntity(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("DansTestMedia")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .network(Reference.builder()
- .type("application/vnd.vmware.vcloud.network+xml")
- .name("orgNet-cloudsoft-Isolated")
- .href(URI.create("https://mycloud.greenhousedata.com/api/network/a604f3c2-0343-453e-ae1f-cddac5b7bd94"))
- .build())
- .network(Reference.builder()
- .type("application/vnd.vmware.vcloud.network+xml")
- .name("orgNet-cloudsoft-External")
- .href(URI.create("https://mycloud.greenhousedata.com/api/network/b466c0c5-8a5c-4335-b703-a2e2e6b5f3e1"))
- .build())
- .network(Reference.builder()
- .type("application/vnd.vmware.vcloud.network+xml")
- .name("orgNet-cloudsoft-Internal-Routed")
- .href(URI.create("https://mycloud.greenhousedata.com/api/network/6d7392e2-c816-43fb-99be-f9ebcd70abf6"))
- .build())
- .capabilities(Capabilities.builder()
- .supportedHardwareVersion("vmx-04")
- .supportedHardwareVersion("vmx-07")
- .supportedHardwareVersion("vmx-08")
- .build())
- .nicQuota(0)
- .networkQuota(10)
- .vmQuota(10)
- .isEnabled(true)
- .build();
- }
-
- private VAppTemplate captureVApp() {
- // TODO Auto-generated method stub
- return null;
- }
-
- private VApp cloneVApp() {
- // TODO Auto-generated method stub
- return null;
- }
-
- private VAppTemplate cloneVAppTemplate() {
- // TODO Auto-generated method stub
- return null;
- }
-
- private VApp composeVApp() throws ParseException {
-
- return VApp
- .builder()
- .status(0)
- .name("test-vapp")
- .id("urn:vcloud:vapp:d0e2b6b9-4381-4ddc-9572-cdfae54059be")
- .type("application/vnd.vmware.vcloud.vApp+xml")
- .description("Test VApp")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"))
- .link(Link
- .builder()
- .name("orgNet-cloudsoft-External")
- .rel("down")
- .type("application/vnd.vmware.vcloud.vAppNetwork+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/network/2a2e2da4-446a-4ebc-a086-06df7c9570f0"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.controlAccess+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/controlAccess/"))
- .build())
- .link(Link
- .builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.owner+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/owner"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/metadata"))
- .build())
- .owner(Owner
- .builder()
- .type("application/vnd.vmware.vcloud.owner+xml")
- .user(User
- .builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("acole")
- .href(URI.create("https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"))
- .build().getRole()).build()).build();
- }
-
- private VApp instantiateVAppTemplate() {
- // TODO Auto-generated method stub
- return null;
- }
-
- private VAppTemplate uploadVAppTemplate() {
- // TODO Auto-generated method stub
- return null;
- }
-
- private Metadata metadata() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiLiveTest.java
deleted file mode 100644
index 3e976f0..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcApiLiveTest.java
+++ /dev/null
@@ -1,329 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_REQ_LIVE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.URN_REQ_LIVE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiationParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "VdcApiLiveTest")
-public class VdcApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String VDC = "vdc";
-
- /*
- * Convenience reference to API api.
- */
- protected VdcApi vdcApi;
- protected VAppTemplateApi vappTemplateApi;
- protected VAppApi vappApi;
- private URI vdcHref;
-
- private VApp instantiatedVApp;
- private VApp clonedVApp;
- private VApp composedVApp;
- private VAppTemplate clonedVAppTemplate;
- private VAppTemplate capturedVAppTemplate;
- private VAppTemplate uploadedVAppTemplate;
- private boolean metadataSet = false;
- private Network network;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- vdcApi = context.getApi().getVdcApi();
- vappTemplateApi = context.getApi().getVAppTemplateApi();
- vappApi = context.getApi().getVAppApi();
-
- assertNotNull(vdcId, String.format(URN_REQ_LIVE, VDC));
- network = lazyGetNetwork();
- vdcHref = context.resolveIdToHref(vdcId);
- }
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() throws Exception {
- if (clonedVAppTemplate != null) {
- cleanUpVAppTemplate(clonedVAppTemplate);
- }
- if (capturedVAppTemplate != null) {
- cleanUpVAppTemplate(capturedVAppTemplate);
- }
- if (uploadedVAppTemplate != null) {
- cleanUpVAppTemplate(uploadedVAppTemplate);
- }
- if (instantiatedVApp != null) {
- cleanUpVApp(instantiatedVApp);
- }
- if (clonedVApp != null) {
- cleanUpVApp(clonedVApp);
- }
- if (composedVApp != null) {
- cleanUpVApp(composedVApp);
- }
-
- if (metadataSet) {
- try {
- Task remove = adminContext.getApi().getMetadataApi(vdcHref).remove("key");
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error deleting metadata entry");
- }
- }
- }
-
- @Test(description = "GET /vdc/{id}")
- public void testGetVdc() {
- Vdc vdc = lazyGetVdc();
- assertNotNull(vdc, String.format(OBJ_REQ_LIVE, VDC));
- assertNotEquals("DO NOT USE", vdc.getDescription(), "vDC isn't to be used for testing");
- Checks.checkVdc(vdc);
- }
-
- @Test(description = "POST /vdc/{id}/action/captureVApp", dependsOnMethods = { "testInstantiateVAppTemplate" })
- public void testCaptureVApp() {
- String name = name("captured-");
-
- CaptureVAppParams captureVappParams = CaptureVAppParams.builder()
- .name(name)
- .source(instantiatedVApp.getHref())
- // TODO: test optional params
- // .description("")
- // .sections(sections) // TODO: ovf sections
- .build();
-
- capturedVAppTemplate = vdcApi.captureVApp(vdcHref, captureVappParams);
-
- Task task = Iterables.getFirst(capturedVAppTemplate.getTasks(), null);
- assertTaskSucceedsLong(task);
-
- Checks.checkVAppTemplate(capturedVAppTemplate);
-
- assertEquals(capturedVAppTemplate.getName(), name,
- String.format(OBJ_FIELD_EQ, "VAppTemplate", "name", name, capturedVAppTemplate.getName()));
- }
-
- @Test(description = "POST /vdc/{id}/action/cloneVApp", dependsOnMethods = { "testInstantiateVAppTemplate" })
- public void testCloneVApp() {
- CloneVAppParams cloneVappParams = CloneVAppParams.builder().source(instantiatedVApp.getHref())
- .name(name("vappClone-"))
- .deploy(true)
- // TODO: test optional params
- // .description("")
- // .isSourceDelete(true)
- // .powerOn(true)
- // .instantiationParams(InstantiationParams.builder()
- // .sections(sections)
- // TODO: ovf sections? various tests?
- // .build())
-
- // Reserved. Unimplemented params; may test eventually when implemented
- // .vAppParent(vAppParentRef)
- // .linkedClone(true)
- .build();
-
- clonedVApp = vdcApi.cloneVApp(vdcHref, cloneVappParams);
-
- Task task = Iterables.getFirst(clonedVApp.getTasks(), null);
- assertNotNull(task, "vdcApi.cloneVApp returned VApp that did not contain any tasks");
- assertTaskSucceedsLong(task);
-
- Checks.checkVApp(clonedVApp);
- }
-
- @Test(description = "POST /vdc/{id}/action/cloneVAppTemplate")
- public void testCloneVAppTemplate() {
- clonedVAppTemplate = vdcApi.cloneVAppTemplate(vdcHref,
- CloneVAppTemplateParams.builder()
- .name(name("vappTemplateClone-"))
- .source(lazyGetVAppTemplate().getHref())
- .build());
-
- Task task = Iterables.getFirst(clonedVAppTemplate.getTasks(), null);
- assertNotNull(task, "vdcApi.cloneVAppTemplate returned VAppTemplate that did not contain any tasks");
- assertTaskSucceedsLong(task);
-
- Checks.checkVAppTemplate(clonedVAppTemplate);
- }
-
- @Test(description = "POST /vdc/{id}/action/composeVApp")
- public void testComposeVApp() {
- String name = name("composed-");
-
- composedVApp = vdcApi.composeVApp(vdcHref, ComposeVAppParams.builder().name(name)
- // TODO: test optional params
- // .sourcedItem(SourcedCompositionItemParam.builder()
- // .sourcedItem(vAppTemplateURI)
- // .build())
- // .description("")
- // .deploy(true)
- // .isSourceDelete(false)
- // .powerOn(true)
- // .instantiationParams(InstantiationParams.builder()
- // .sections(sections) // TODO: ovf sections? various tests?
- // .build())
-
- // Reserved. Unimplemented params; may test eventually when implemented
- // .linkedClone()
- .build());
-
- Task task = Iterables.getFirst(composedVApp.getTasks(), null);
- assertNotNull(task, "vdcApi.composeVApp returned VApp that did not contain any tasks");
- assertTaskSucceedsLong(task);
-
- Checks.checkVApp(composedVApp);
- assertEquals(composedVApp.getName(), name,
- String.format(OBJ_FIELD_EQ, "VApp", "name", name, composedVApp.getName()));
- }
-
- // TODO Duplicates code in VAppApiLiveTest
- @Test(description = "POST /vdc/{id}/action/instantiateVAppTemplate")
- public void testInstantiateVAppTemplate() {
- Vdc vdc = vdcApi.get(vdcHref);
-
- Set<Reference> networks = vdc.getAvailableNetworks();
- Optional<Reference> parentNetwork = Iterables.tryFind(networks, new Predicate<Reference>() {
- @Override
- public boolean apply(Reference reference) {
- return reference.getHref().equals(network.getHref());
- }
- });
-
- if (!parentNetwork.isPresent()) {
- fail(String.format("Could not find network %s in vdc", network.getHref().toASCIIString()));
- }
-
- NetworkConfiguration networkConfiguration = NetworkConfiguration.builder().parentNetwork(parentNetwork.get())
- .fenceMode(FenceMode.BRIDGED).build();
-
- NetworkConfigSection networkConfigSection = NetworkConfigSection
- .builder()
- .info("Configuration parameters for logical networks")
- .networkConfigs(
- ImmutableSet.of(VAppNetworkConfiguration.builder().networkName("vAppNetwork")
- .configuration(networkConfiguration).build())).build();
-
- InstantiationParams instantiationParams = InstantiationParams.builder()
- .sections(ImmutableSet.of(networkConfigSection)).build();
-
- InstantiateVAppTemplateParams instantiate = InstantiateVAppTemplateParams.builder().name(name("test-vapp-"))
- .notDeploy().notPowerOn().description("Test VApp").instantiationParams(instantiationParams)
- .source(lazyGetVAppTemplate().getHref()).build();
-
- instantiatedVApp = vdcApi.instantiateVApp(vdcHref, instantiate);
- Task instantiationTask = Iterables.getFirst(instantiatedVApp.getTasks(), null);
- assertTaskSucceedsLong(instantiationTask);
-
- Checks.checkVApp(instantiatedVApp);
- }
-
- @Test(description = "POST /vdc/{id}/action/uploadVAppTemplate")
- public void testUploadVAppTemplate() {
- // TODO Should test all 4 stages of upload; currently doing only stage 1 here.
- // 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
-
- String name = name("uploaded-");
-
- UploadVAppTemplateParams uploadVAppTemplateParams = UploadVAppTemplateParams.builder().name(name)
- // TODO: test optional params
- // .description("")
- // .transferFormat("")
- // .manifestRequired(true)
- .build();
-
- uploadedVAppTemplate = vdcApi.uploadVAppTemplate(vdcHref, uploadVAppTemplateParams);
-
- Checks.checkVAppTemplateWhenNotReady(uploadedVAppTemplate);
-
- assertEquals(uploadedVAppTemplate.getName(), name,
- String.format(OBJ_FIELD_EQ, "VAppTemplate", "name", name, uploadedVAppTemplate.getName()));
-
- ResourceEntity.Status expectedStatus = ResourceEntity.Status.UNRESOLVED;
- ResourceEntity.Status actualStatus = uploadedVAppTemplate.getStatus();
- assertEquals(actualStatus, expectedStatus,
- String.format(OBJ_FIELD_EQ, "VAppTemplate", "status", expectedStatus, actualStatus));
-
- }
-
- @Test(description = "GET /vdc/{id}/metadata", dependsOnMethods = { "testGetVdc" })
- public void testGetMetadata() {
- Metadata metadata = context.getApi().getMetadataApi(vdcHref).get();
-
- // required for testing
- assertTrue(Iterables.isEmpty(metadata.getMetadataEntries()),
- String.format(OBJ_FIELD_REQ_LIVE, VDC, "metadata.entries"));
-
- Checks.checkMetadataFor(VDC, metadata);
- }
-
- @Test(description = "GET /vdc/{id}/metadata/{key}", dependsOnMethods = { "testGetMetadata" })
- public void testGetMetadataValue() {
- // setupMetadata();
- // First find a key
- Metadata metadata = context.getApi().getMetadataApi(vdcHref).get();
- Map<String, String> metadataMap = Checks.metadataToMap(metadata);
- String key = Iterables.getFirst(metadataMap.keySet(), "MadeUpKey!");
- String value = metadataMap.get(key);
-
- String metadataValue = context.getApi().getMetadataApi(vdcHref).get(key);
-
- assertEquals(metadataValue, value);
- }
-
-}
[06/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiLiveTest.java
deleted file mode 100644
index fa81ec6..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApiLiveTest.java
+++ /dev/null
@@ -1,209 +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.vcloud.director.v1_5.features.admin;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_UPDATABLE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REQUIRED_VALUE_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.URN_REQ_LIVE;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.network.ExternalNetwork;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpScope;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures;
-import org.jclouds.vcloud.director.v1_5.domain.network.RouterInfo;
-import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "AdminNetworkLiveTest")
-public class AdminNetworkApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String NETWORK = "AdminNetwork";
-
- /*
- * Convenience references to API apis.
- */
- private AdminNetworkApi networkApi;
-
- private Network network;
-
- @Override
- @BeforeClass(alwaysRun = true)
- protected void setupRequiredApis() {
- networkApi = adminContext.getApi().getNetworkApi();
- }
-
- @Test(description = "GET /admin/network/{id}")
- public void testGetNetwork() {
- //TODO: test both org and external networks
- network = lazyGetNetwork();
-
-
- if (network instanceof ExternalNetwork) {
- Checks.checkExternalNetwork(Network.<ExternalNetwork>toSubType(network));
- } else if (network instanceof OrgNetwork) {
- Checks.checkOrgNetwork(Network.<OrgNetwork>toSubType(network));
- } else {
- fail(String.format(REQUIRED_VALUE_OBJECT_FMT, ".class", NETWORK,
- network.getClass(), "ExternalNetwork,. OrgNetwork"));
- }
- }
-
- // TODO: this test is far from exhaustive
- @Test(description = "PUT /admin/network/{id}" )
- public void testEditNetwork() {
- //TODO: ensure network instanceof OrgNetwork, may require queries
- assertTrue(network instanceof OrgNetwork, String.format(URN_REQ_LIVE, "OrgNetwork"));
-
- OrgNetwork oldNetwork = Network.<OrgNetwork>toSubType(network)
- .toBuilder()
- .tasks(ImmutableSet.<Task>of())
- .build();
-
- OrgNetwork editNetwork = getMutatedOrgNetwork(oldNetwork);
-
- try {
- Task editNetworkTask = networkApi.edit(network.getHref(), editNetwork);
- Checks.checkTask(editNetworkTask);
- assertTrue(retryTaskSuccess.apply(editNetworkTask), String.format(TASK_COMPLETE_TIMELY, "editNetworkTask"));
- network = networkApi.get(network.getHref());
-
- Checks.checkOrgNetwork(Network.<OrgNetwork>toSubType(network));
-
- assertTrue(equal(network.getConfiguration().getIpScope(),
- editNetwork.getConfiguration().getIpScope()),
- String.format(OBJ_FIELD_UPDATABLE, NETWORK + ".configuration", "ipScope"));
- assertTrue(equal(network.getConfiguration().getParentNetwork(),
- editNetwork.getConfiguration().getParentNetwork()),
- String.format(OBJ_FIELD_UPDATABLE, NETWORK + ".configuration", "parentNetwork"));
- assertTrue(equal(network.getConfiguration().getFenceMode(),
- editNetwork.getConfiguration().getFenceMode()),
- String.format(OBJ_FIELD_UPDATABLE, NETWORK + ".configuration", "fenceMode"));
- assertTrue(equal(network.getConfiguration().retainNetInfoAcrossDeployments(),
- editNetwork.getConfiguration().retainNetInfoAcrossDeployments()),
- String.format(OBJ_FIELD_UPDATABLE, NETWORK + ".configuration", "retainNetInfoAcrossDeployments"));
- assertTrue(equal(network.getConfiguration().getNetworkFeatures(),
- editNetwork.getConfiguration().getNetworkFeatures()),
- String.format(OBJ_FIELD_UPDATABLE, NETWORK + ".configuration", "networkFeatures"));
- assertTrue(equal(network.getConfiguration().getSyslogServerSettings(),
- editNetwork.getConfiguration().getSyslogServerSettings()),
- String.format(OBJ_FIELD_UPDATABLE, NETWORK + ".configuration", "syslogServerSettings"));
- assertTrue(equal(network.getConfiguration().getRouterInfo(),
- editNetwork.getConfiguration().getRouterInfo()),
- String.format(OBJ_FIELD_UPDATABLE, NETWORK + ".configuration", "routerInfo"));
- // FIXME: fails
-// assertTrue(equal(Network.<OrgNetwork>toSubType(network).getNetworkPool(),
-// editNetwork.getNetworkPool()),
-// String.format(OBJ_FIELD_UPDATABLE, NETWORK, "networkPool"));
-
-// assertTrue(equal(Network.<OrgNetwork>toSubType(network).getAllowedExternalIpAddresses(),
-// editNetwork.getAllowedExternalIpAddresses()),
-// String.format(OBJ_FIELD_UPDATABLE, NETWORK, "allowedExternalIpAddresses"));
- } finally {
- Task editNetworkTask = networkApi.edit(network.getHref(), oldNetwork);
- Checks.checkTask(editNetworkTask);
- assertTrue(retryTaskSuccess.apply(editNetworkTask), String.format(TASK_COMPLETE_TIMELY, "editNetworkTask"));
- network = networkApi.get(network.getHref());
- }
- }
-
- @Test(description = "POST /admin/network/{id}/action/reset")
- public void testResetNetwork() {
- // TODO assert that network is deployed somehow
- Task resetNetworkTask = networkApi.reset(network.getHref());
- Checks.checkTask(resetNetworkTask);
- assertTrue(retryTaskSuccess.apply(resetNetworkTask), String.format(TASK_COMPLETE_TIMELY, "resetNetworkTask"));
- network = networkApi.get(network.getHref());
-
- Checks.checkOrgNetwork(Network.<OrgNetwork>toSubType(network));
- // TODO: other assertions about the reset? that network is deployed when task is complete, for example
- }
-
- private static OrgNetwork getMutatedOrgNetwork(OrgNetwork network) {
- OrgNetwork.Builder<?> networkBuilder = OrgNetwork.builder().fromNetwork(network)
- .tasks(ImmutableSet.<Task>of())
-// .name("new " + network.getName())
- .description("new " + network.getDescription())
- .configuration(getMutatedNetworkConfiguration(network.getConfiguration()));
-
- // FIXME: fails
-// if (network.getNetworkPool() != null) {
-// networkBuilder.networkPool(null);
-// } // TODO: else?
-
-// if (network.getAllowedExternalIpAddresses() != null) {
-// networkBuilder.allowedExternalIpAddresses(null);
-// } // TODO: else?
-
- return networkBuilder.build();
- }
-
- private static NetworkConfiguration getMutatedNetworkConfiguration(NetworkConfiguration config) {
- NetworkConfiguration.Builder configBuilder = config.toBuilder();
-
- if (config.getIpScope() != null) {
- configBuilder.ipScope(IpScope.builder().fromIpScope(config.getIpScope())
- // TODO: mutate to test more
- .build());
- }
-
- if (config.getParentNetwork() != null) {
-// configBuilder.parentNetwork(null);
- } // TODO: else?
-
-// configBuilder.fenceMode(config.getFenceMode() == Network.FenceMode.BRIDGED ?
-// Network.FenceMode.BRIDGED : Network.FenceMode.ISOLATED);
-
- if (config.getSyslogServerSettings() != null) {
- configBuilder.syslogServerSettings(SyslogServerSettings.builder()
- .fromSyslogServerSettings(config.getSyslogServerSettings())
- // TODO: mutate to test more
- .build());
- }
-
- if (config.retainNetInfoAcrossDeployments() != null) {
-// configBuilder.retainNetInfoAcrossDeployments(!config.retainNetInfoAcrossDeployments());
- } else {
-// configBuilder.retainNetInfoAcrossDeployments(false);
- }
-
- if (config.getNetworkFeatures() != null) {
- configBuilder.features(NetworkFeatures.builder().fromNetworkFeatures(config.getNetworkFeatures())
- // TODO: mutate to test more
- .build());
- }
-
- if (config.getRouterInfo() != null) {
- configBuilder.routerInfo(RouterInfo.builder().fromRouterInfo(config.getRouterInfo())
- // TODO: mutate to test more
- .build());
- }
-
- return configBuilder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiExpectTest.java
deleted file mode 100644
index e7df633..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiExpectTest.java
+++ /dev/null
@@ -1,610 +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.vcloud.director.v1_5.features.admin;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "AdminOrgApiExpectTest")
-public class AdminOrgApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private Reference orgRef = Reference.builder()
- .href(URI.create(endpoint + "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0")).build();
-
- @Test
- public void testGetOrg() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0").acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/org/admin/org.xml", VCloudDirectorMediaType.ADMIN_ORG)
- .httpResponseBuilder().build());
-
- AdminOrg expected = adminOrg();
-
- assertEquals(api.getOrgApi().get(orgRef.getHref()), expected);
- }
-
- public static final AdminOrg adminOrg() {
- return AdminOrg
- .builder()
- .name("JClouds")
- .id("urn:vcloud:org:6f312e42-cd2b-488d-a2bb-97519cd57ed0")
- .type("application/vnd.vmware.admin.organization+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.tasksList+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/tasksList/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/metadata"))
- .build())
- .link(Link
- .builder()
- .rel("add")
- .type("application/vnd.vmware.admin.catalog+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/catalogs"))
- .build())
- .link(Link
- .builder()
- .rel("add")
- .type("application/vnd.vmware.admin.user+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/users"))
- .build())
- .link(Link
- .builder()
- .rel("add")
- .type("application/vnd.vmware.admin.group+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/groups"))
- .build())
- .link(Link
- .builder()
- .rel("add")
- .type("application/vnd.vmware.admin.orgNetwork+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/networks"))
- .build())
- .link(Link
- .builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.organization+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link
- .builder()
- .rel("remove")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link
- .builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.org+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .description("")
- .fullName("JClouds")
- .isEnabled(true)
- .settings(settings())
- .user(Reference
- .builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adam.lowe@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/672ebb67-d8ff-4201-9c1b-c1be869e526c"))
- .build())
- .user(Reference
- .builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adrian@jclouds.org")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/8c360b93-ed25-4c9a-8e24-d48cd9966d93"))
- .build())
- .user(Reference
- .builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("qunying.huang@enstratus.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69"))
- .build())
- .user(Reference
- .builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("dan@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/ae75edd2-12de-414c-8e85-e6ea10442c08"))
- .build())
- .user(Reference
- .builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .catalog(Reference
- .builder()
- .type("application/vnd.vmware.admin.catalog+xml")
- .name("QunyingTestCatalog")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"))
- .build())
- .catalog(Reference
- .builder()
- .type("application/vnd.vmware.admin.catalog+xml")
- .name("Public")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/9e08c2f6-077a-42ce-bece-d5332e2ebb5c"))
- .build())
- .catalog(Reference
- .builder()
- .type("application/vnd.vmware.admin.catalog+xml")
- .name("dantest")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/b542aff4-9f97-4f51-a126-4330fbf62f02"))
- .build())
- .catalog(Reference
- .builder()
- .type("application/vnd.vmware.admin.catalog+xml")
- .name("test")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/catalog/b7289d54-4ca4-497f-9a93-2d4afc97e3da"))
- .build())
- .vdc(Reference
- .builder()
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .name("Cluster01-JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/vdc/d16d333b-e3c0-4176-845d-a5ee6392df07"))
- .build())
- .network(Reference
- .builder()
- .type("application/vnd.vmware.admin.network+xml")
- .name("ilsolation01-Jclouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/network/f3ba8256-6f48-4512-aad6-600e85b4dc38"))
- .build())
- .network(Reference
- .builder()
- .type("application/vnd.vmware.admin.network+xml")
- .name("internet01-Jclouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/network/55a677cf-ab3f-48ae-b880-fab90421980c"))
- .build()).build();
- }
-
- @Test(enabled = false)
- public void testGetSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/")
- .acceptAnyMedia().httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/settings.xml", VCloudDirectorMediaType.ORG_SETTINGS)
- .httpResponseBuilder().build());
-
- OrgSettings expected = settings();
-
- assertEquals(api.getOrgApi().getSettings(orgRef.getHref()), expected);
- }
-
- @Test(enabled = false)
- public void testEditSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/")
- .xmlFilePayload("/org/admin/editSettingsSource.xml", VCloudDirectorMediaType.ORG_SETTINGS)
- .acceptMedia(VCloudDirectorMediaType.ORG_SETTINGS).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/editSettings.xml", VCloudDirectorMediaType.ORG_SETTINGS)
- .httpResponseBuilder().build());
-
- OrgSettings expected = editSettings();
-
- assertEquals(api.getOrgApi().editSettings(orgRef.getHref(), expected), expected);
- }
-
- @Test
- public void testGetEmailSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email")
- .acceptAnyMedia().httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/emailSettings.xml", VCloudDirectorMediaType.ORG_GENERAL_SETTINGS)
- .httpResponseBuilder().build());
-
- OrgEmailSettings expected = emailSettings();
-
- assertEquals(api.getOrgApi().getEmailSettings(orgRef.getHref()), expected);
- }
-
- @Test
- public void testEditEmailSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email")
- .xmlFilePayload("/org/admin/editEmailSettingsSource.xml",
- VCloudDirectorMediaType.ORG_EMAIL_SETTINGS)
- .acceptMedia(VCloudDirectorMediaType.ORG_EMAIL_SETTINGS).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/editEmailSettings.xml",
- VCloudDirectorMediaType.ORG_EMAIL_SETTINGS).httpResponseBuilder().build());
-
- OrgEmailSettings expected = editEmailSettings();
-
- assertEquals(api.getOrgApi().editEmailSettings(orgRef.getHref(), expected), expected);
- }
-
- @Test(enabled = false)
- public void testGetGeneralSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general")
- .acceptAnyMedia().httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/generalSettings.xml", VCloudDirectorMediaType.ORG_GENERAL_SETTINGS)
- .httpResponseBuilder().build());
-
- OrgGeneralSettings expected = generalSettings();
-
- assertEquals(api.getOrgApi().getGeneralSettings(orgRef.getHref()), expected);
- }
-
- public static final OrgGeneralSettings generalSettings() {
- return OrgGeneralSettings
- .builder()
- .type("application/vnd.vmware.admin.organizationGeneralSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general"))
- .link(Link
- .builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.organizationGeneralSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general"))
- .build()).canPublishCatalogs(false).deployedVMQuota(0).storedVmQuota(0)
- .useServerBootSequence(false).delayAfterPowerOnSeconds(0).build();
- }
-
- @Test(enabled = false)
- public void testEditGeneralSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general")
- .xmlFilePayload("/org/admin/editGeneralSettingsSource.xml",
- VCloudDirectorMediaType.ORG_GENERAL_SETTINGS)
- .acceptMedia(VCloudDirectorMediaType.ORG_GENERAL_SETTINGS).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/editGeneralSettings.xml",
- VCloudDirectorMediaType.ORG_GENERAL_SETTINGS).httpResponseBuilder().build());
-
- OrgGeneralSettings expected = editGeneralSettings();
-
- assertEquals(api.getOrgApi().editGeneralSettings(orgRef.getHref(), expected), expected);
- }
-
- public static final OrgGeneralSettings editGeneralSettings() {
- return generalSettings().toBuilder()
-
- .build();
- }
-
- @Test
- public void testGetLdapSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap")
- .acceptAnyMedia().httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/ldapSettings.xml", VCloudDirectorMediaType.ORG_LDAP_SETTINGS)
- .httpResponseBuilder().build());
-
- OrgLdapSettings expected = ldapSettings();
-
- assertEquals(api.getOrgApi().getLdapSettings(orgRef.getHref()), expected);
- }
-
- public static final OrgLdapSettings ldapSettings() {
- return OrgLdapSettings
- .builder()
- .type("application/vnd.vmware.admin.organizationLdapSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap"))
- .ldapMode("NONE").build();
- }
-
- @Test
- public void testGetPasswordPolicy() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy")
- .acceptAnyMedia().httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/passwordPolicy.xml",
- VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS).httpResponseBuilder().build());
-
- OrgPasswordPolicySettings expected = passwordPolicy();
-
- assertEquals(api.getOrgApi().getPasswordPolicy(orgRef.getHref()), expected);
- }
-
- public static final OrgPasswordPolicySettings passwordPolicy() {
- return OrgPasswordPolicySettings
- .builder()
- .type("application/vnd.vmware.admin.organizationPasswordPolicySettings+xml")
- .link(Link
- .builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.organizationPasswordPolicySettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"))
- .build())
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"))
- .accountLockoutEnabled(false).invalidLoginsBeforeLockout(5).accountLockoutIntervalMinutes(10).build();
- }
-
- @Test
- public void testEditPasswordPolicy() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy")
- .xmlFilePayload("/org/admin/editPasswordPolicySource.xml",
- VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS)
- .acceptMedia(VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/editPasswordPolicy.xml",
- VCloudDirectorMediaType.ORG_PASSWORD_POLICY_SETTINGS).httpResponseBuilder().build());
-
- OrgPasswordPolicySettings expected = editOrgPasswordPolicy();
-
- assertEquals(api.getOrgApi().editPasswordPolicy(orgRef.getHref(), expected), expected);
- }
-
- public static final OrgPasswordPolicySettings editOrgPasswordPolicy() {
- return passwordPolicy().toBuilder().accountLockoutEnabled(true).invalidLoginsBeforeLockout(6)
- .accountLockoutIntervalMinutes(11).build();
- }
-
- @Test(enabled = false)
- public void testGetVAppLeaseSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings")
- .acceptAnyMedia().httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/vAppLeaseSettings.xml", VCloudDirectorMediaType.ORG_LEASE_SETTINGS)
- .httpResponseBuilder().build());
-
- OrgLeaseSettings expected = vAppLeaseSettings();
-
- assertEquals(api.getOrgApi().getVAppLeaseSettings(orgRef.getHref()), expected);
- }
-
- public static final OrgLeaseSettings vAppLeaseSettings() {
- return OrgLeaseSettings
- .builder()
- .type("application/vnd.vmware.admin.vAppLeaseSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings"))
- .link(Link
- .builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.vAppLeaseSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings"))
- .build()).deleteOnStorageLeaseExpiration(false).deploymentLeaseSeconds(0)
- .storageLeaseSeconds(0).build();
- }
-
- @Test(enabled = false)
- public void testEditOrgVAppLeaseSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings")
- .xmlFilePayload("/org/admin/editVAppLeaseSettingsSource.xml",
- VCloudDirectorMediaType.ORG_LEASE_SETTINGS)
- .acceptMedia(VCloudDirectorMediaType.ORG_LEASE_SETTINGS).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/editVAppLeaseSettings.xml",
- VCloudDirectorMediaType.ORG_LEASE_SETTINGS).httpResponseBuilder().build());
-
- OrgLeaseSettings expected = editVAppLeaseSettings();
-
- assertEquals(api.getOrgApi().editVAppLeaseSettings(orgRef.getHref(), expected), expected);
- }
-
- public static final OrgLeaseSettings editVAppLeaseSettings() {
- return vAppLeaseSettings().toBuilder()
-
- .build();
- }
-
- @Test(enabled = false)
- public void testGetVAppTemplateLeaseSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET",
- "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings")
- .acceptAnyMedia().httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/vAppTemplateLeaseSettings.xml",
- VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS).httpResponseBuilder()
- .build());
-
- OrgVAppTemplateLeaseSettings expected = vAppTemplateLeaseSettings();
-
- assertEquals(api.getOrgApi().getVAppTemplateLeaseSettings(orgRef.getHref()), expected);
- }
-
- public static final OrgVAppTemplateLeaseSettings vAppTemplateLeaseSettings() {
- return OrgVAppTemplateLeaseSettings
- .builder()
- .type("application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings"))
- .link(Link
- .builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings"))
- .build()).deleteOnStorageLeaseExpiration(false).storageLeaseSeconds(0).build();
- }
-
- @Test(enabled = false)
- public void testEditOrgVAppTemplateLeaseSettings() {
- VCloudDirectorAdminApi api = requestsSendResponses(
- loginRequest,
- sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT",
- "/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings")
- .xmlFilePayload("/org/admin/editVAppLeaseSettingsSource.xml",
- VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS)
- .acceptMedia(VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS).httpRequestBuilder()
- .build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/org/admin/editVAppLeaseSettings.xml",
- VCloudDirectorMediaType.ORG_VAPP_TEMPLATE_LEASE_SETTINGS).httpResponseBuilder()
- .build());
-
- OrgVAppTemplateLeaseSettings expected = editVAppTemplateLeaseSettings();
-
- assertEquals(api.getOrgApi().editVAppTemplateLeaseSettings(orgRef.getHref(), expected), expected);
- }
-
- public static final OrgVAppTemplateLeaseSettings editVAppTemplateLeaseSettings() {
- return vAppTemplateLeaseSettings().toBuilder()
-
- .build();
- }
-
- public static final OrgSettings settings() {
- return OrgSettings
- .builder()
- .type("application/vnd.vmware.admin.orgSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings"))
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.admin.vAppTemplateLeaseSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppTemplateLeaseSettings"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.admin.organizationEmailSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.admin.vAppLeaseSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/vAppLeaseSettings"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.admin.organizationPasswordPolicySettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/passwordPolicy"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.admin.organizationGeneralSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/general"))
- .build())
- .link(Link
- .builder()
- .rel("down")
- .type("application/vnd.vmware.admin.organizationLdapSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/ldap"))
- .build())
- .link(Link
- .builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.orgSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings"))
- .build()).generalSettings(generalSettings()).vAppLeaseSettings(vAppLeaseSettings())
- .vAppTemplateLeaseSettings(vAppTemplateLeaseSettings()).ldapSettings(ldapSettings())
- .emailSettings(emailSettings()).passwordPolicy(passwordPolicy()).build();
- }
-
- @Test
- public static final OrgSettings editSettings() {
- return settings().toBuilder().build();
- }
-
- public static final OrgEmailSettings emailSettings() {
- return OrgEmailSettings
- .builder()
- .type("application/vnd.vmware.admin.organizationEmailSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"))
- .link(Link
- .builder()
- .rel("edit")
- .type("application/vnd.vmware.admin.organizationEmailSettings+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0/settings/email"))
- .build())
- .isDefaultSmtpServer(true)
- .isDefaultOrgEmail(true)
- .fromEmailAddress("")
- .defaultSubjectPrefix("")
- .isAlertEmailToAllAdmins(true)
- .smtpServerSettings(
- SmtpServerSettings.builder().useAuthentication(false).host("").username("").password("")
- .build()).build();
- }
-
- @Test
- public static final OrgEmailSettings editEmailSettings() {
- return emailSettings()
- .toBuilder()
- .isDefaultSmtpServer(false)
- .isDefaultOrgEmail(false)
- .fromEmailAddress("test@test.com")
- .defaultSubjectPrefix("new")
- .isAlertEmailToAllAdmins(false)
- .smtpServerSettings(
- emailSettings().getSmtpServerSettings().toBuilder().useAuthentication(true).host("new")
- .username("new").build()).build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiLiveTest.java
deleted file mode 100644
index feb6ba2..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApiLiveTest.java
+++ /dev/null
@@ -1,345 +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.vcloud.director.v1_5.features.admin;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_UPDATABLE;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "AdminOrgApiLiveTest")
-public class AdminOrgApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String ORG = "admin org";
-
- /*
- * Convenience references to API apis.
- */
-
- private AdminOrgApi orgApi;
-
- /*
- * Shared state between dependant tests.
- */
- private OrgSettings settings;
- private OrgEmailSettings emailSettings;
- private OrgGeneralSettings generalSettings;
- private OrgLdapSettings ldapSettings;
- private OrgPasswordPolicySettings passwordPolicy;
- private OrgLeaseSettings vAppLeaseSettings;
- private OrgVAppTemplateLeaseSettings vAppTemplateLeaseSettings;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- orgApi = adminContext.getApi().getOrgApi();
- }
-
- @Test(description = "GET /admin/org/{id}")
- public void testGetAdminOrg() {
- AdminOrg adminOrg = orgApi.get(org.getHref());
-
- Checks.checkAdminOrg(adminOrg);
- }
-
- @Test(description = "GET /admin/org/{id}/settings/email")
- public void testGetEmailSettings() {
- emailSettings = orgApi.getEmailSettings(org.getHref());
-
- Checks.checkEmailSettings(emailSettings);
- }
-
- @Test(description = "PUT /admin/org/{id}/settings/email", dependsOnMethods = { "testGetEmailSettings" })
- public void testEditEmailSettings() {
- boolean isDefaultSmtpServer = emailSettings.isDefaultSmtpServer();
- boolean isDefaultOrgEmail = emailSettings.isDefaultOrgEmail();
- String oldFromEmailAddress = emailSettings.getFromEmailAddress();
- String newFromEmailAddress = "test@test.com";
- String oldDefaultSubjectPrefix = emailSettings.getDefaultSubjectPrefix();
- String newDefaultSubjectPrefix = "new" + oldDefaultSubjectPrefix;
- boolean isAlertEmailToAllAdmins = emailSettings.isAlertEmailToAllAdmins();
- SmtpServerSettings oldSmtpServerSettings = emailSettings.getSmtpServerSettings();
- SmtpServerSettings newSmtpServerSettings = oldSmtpServerSettings.toBuilder()
- .useAuthentication(!oldSmtpServerSettings.useAuthentication())
- .host("new" + oldSmtpServerSettings.getHost()).username("new" + oldSmtpServerSettings.getUsername())
- .password("new" + oldSmtpServerSettings.getPassword()).build();
-
- try {
- OrgEmailSettings newEmailSettings = emailSettings.toBuilder().isDefaultSmtpServer(!isDefaultSmtpServer)
- .isDefaultOrgEmail(!isDefaultOrgEmail).fromEmailAddress(newFromEmailAddress)
- .defaultSubjectPrefix(newDefaultSubjectPrefix).isAlertEmailToAllAdmins(!isAlertEmailToAllAdmins)
- .smtpServerSettings(newSmtpServerSettings).build();
-
- emailSettings = orgApi.editEmailSettings(org.getHref(), newEmailSettings);
-
- assertTrue(equal(emailSettings.isDefaultSmtpServer(), !isDefaultSmtpServer),
- String.format(OBJ_FIELD_UPDATABLE, "emailSettings", "isDefaultSmtpServer"));
- assertTrue(equal(emailSettings.isDefaultOrgEmail(), !isDefaultOrgEmail),
- String.format(OBJ_FIELD_UPDATABLE, "emailSettings", "isDefaultOrgEmail"));
- assertTrue(equal(emailSettings.getFromEmailAddress(), newFromEmailAddress),
- String.format(OBJ_FIELD_UPDATABLE, "emailSettings", "fromEmailAddress"));
- assertTrue(equal(emailSettings.getDefaultSubjectPrefix(), newDefaultSubjectPrefix),
- String.format(OBJ_FIELD_UPDATABLE, "emailSettings", "defaultSubjectPrefix"));
- assertTrue(equal(emailSettings.isAlertEmailToAllAdmins(), !isAlertEmailToAllAdmins),
- String.format(OBJ_FIELD_UPDATABLE, "emailSettings", "isAlertEmailToAllAdmins"));
- assertTrue(equal(emailSettings.getSmtpServerSettings(), newSmtpServerSettings),
- String.format(OBJ_FIELD_UPDATABLE, "emailSettings", "smtpServerSettings"));
-
- // TODO negative tests?
-
- Checks.checkEmailSettings(emailSettings);
- } finally {
- emailSettings = emailSettings.toBuilder().isDefaultSmtpServer(isDefaultSmtpServer)
- .isDefaultOrgEmail(isDefaultOrgEmail).fromEmailAddress(oldFromEmailAddress)
- .defaultSubjectPrefix(oldDefaultSubjectPrefix).isAlertEmailToAllAdmins(isAlertEmailToAllAdmins)
- .smtpServerSettings(oldSmtpServerSettings).build();
-
- emailSettings = orgApi.editEmailSettings(org.getHref(), emailSettings);
- }
- }
-
- @Test(description = "GET /admin/org/{id}/settings/general")
- public void testGetGeneralSettings() {
- generalSettings = orgApi.getGeneralSettings(org.getHref());
-
- Checks.checkGeneralSettings(generalSettings);
- }
-
- @Test(description = "PUT /admin/org/{id}/settings/general", dependsOnMethods = { "testGetGeneralSettings" })
- public void testEditGeneralSettings() {
- // FIXME: canPublishCatalogs does not edit
- // boolean canPublishCatalogs = generalSettings.canPublishCatalogs();
- Integer deployedVMQuota = generalSettings.getDeployedVMQuota();
- Integer storedVmQuota = generalSettings.getStoredVmQuota();
- boolean useServerBootSequence = generalSettings.useServerBootSequence();
- Integer delayAfterPowerOnSeconds = generalSettings.getDelayAfterPowerOnSeconds();
-
- try {
- OrgGeneralSettings newGeneralSettings = generalSettings
- .toBuilder()
- // .canPublishCatalogs(!canPublishCatalogs)
- .deployedVMQuota(deployedVMQuota + 1).storedVmQuota(storedVmQuota + 1)
- .useServerBootSequence(!useServerBootSequence).delayAfterPowerOnSeconds(delayAfterPowerOnSeconds + 1)
- .build();
-
- generalSettings = orgApi.editGeneralSettings(org.getHref(), newGeneralSettings);
-
- // assertTrue(equal(generalSettings.canPublishCatalogs(), !canPublishCatalogs),
- // String.format(OBJ_FIELD_UPDATABLE,
- // "generalSettings", "canPublishCatalogs"));
- assertTrue(equal(generalSettings.getDeployedVMQuota(), deployedVMQuota + 1),
- String.format(OBJ_FIELD_UPDATABLE, "generalSettings", "deployedVMQuota"));
- assertTrue(equal(generalSettings.getStoredVmQuota(), storedVmQuota + 1),
- String.format(OBJ_FIELD_UPDATABLE, "generalSettings", "storedVmQuota"));
- assertTrue(equal(generalSettings.useServerBootSequence(), !useServerBootSequence),
- String.format(OBJ_FIELD_UPDATABLE, "generalSettings", "useServerBootSequence"));
- assertTrue(equal(generalSettings.getDelayAfterPowerOnSeconds(), delayAfterPowerOnSeconds + 1),
- String.format(OBJ_FIELD_UPDATABLE, "generalSettings", "delayAfterPowerOnSeconds"));
-
- // TODO negative tests?
-
- Checks.checkGeneralSettings(generalSettings);
- } finally {
- generalSettings = generalSettings
- .toBuilder()
- // .canPublishCatalogs(canPublishCatalogs)
- .deployedVMQuota(deployedVMQuota).storedVmQuota(storedVmQuota)
- .useServerBootSequence(useServerBootSequence).delayAfterPowerOnSeconds(delayAfterPowerOnSeconds)
- .build();
-
- generalSettings = orgApi.editGeneralSettings(org.getHref(), generalSettings);
- }
- }
-
- @Test(description = "GET /admin/org/{id}/settings/ldap")
- public void testGetLdapSettings() {
- ldapSettings = orgApi.getLdapSettings(org.getHref());
-
- Checks.checkLdapSettings(ldapSettings);
- }
-
- @Test(description = "GET /admin/org/{id}/settings/passwordPolicy")
- public void testGetPasswordPolicy() {
- passwordPolicy = orgApi.getPasswordPolicy(org.getHref());
-
- Checks.checkPasswordPolicySettings(passwordPolicy);
- }
-
- @Test(description = "PUT /admin/org/{id}/settings/passwordPolicy", dependsOnMethods = { "testGetPasswordPolicy" })
- public void testEditPasswordPolicy() {
- boolean accountLockoutEnabled = passwordPolicy.isAccountLockoutEnabled();
- Integer invalidLoginsBeforeLockout = passwordPolicy.getInvalidLoginsBeforeLockout();
- Integer accountLockoutIntervalMinutes = passwordPolicy.getAccountLockoutIntervalMinutes();
-
- try {
- OrgPasswordPolicySettings newPasswordPolicy = passwordPolicy.toBuilder()
- .accountLockoutEnabled(!accountLockoutEnabled)
- .invalidLoginsBeforeLockout(invalidLoginsBeforeLockout + 1)
- .accountLockoutIntervalMinutes(accountLockoutIntervalMinutes + 1).build();
-
- passwordPolicy = orgApi.editPasswordPolicy(org.getHref(), newPasswordPolicy);
-
- assertTrue(equal(passwordPolicy.isAccountLockoutEnabled(), !accountLockoutEnabled),
- String.format(OBJ_FIELD_UPDATABLE, "PasswordPolicySettings", "deleteOnStorageLeaseExpiration"));
- assertTrue(equal(passwordPolicy.getInvalidLoginsBeforeLockout(), invalidLoginsBeforeLockout + 1),
- String.format(OBJ_FIELD_UPDATABLE, "PasswordPolicySettings", "storageLeaseSeconds"));
- assertTrue(equal(passwordPolicy.getAccountLockoutIntervalMinutes(), accountLockoutIntervalMinutes + 1),
- String.format(OBJ_FIELD_UPDATABLE, "PasswordPolicySettings", "deploymentLeaseSeconds"));
-
- // TODO negative tests?
-
- Checks.checkPasswordPolicySettings(passwordPolicy);
- } finally {
- passwordPolicy = passwordPolicy.toBuilder().accountLockoutEnabled(accountLockoutEnabled)
- .invalidLoginsBeforeLockout(invalidLoginsBeforeLockout)
- .accountLockoutIntervalMinutes(accountLockoutIntervalMinutes).build();
-
- passwordPolicy = orgApi.editPasswordPolicy(org.getHref(), passwordPolicy);
- }
- }
-
- @Test(description = "GET /admin/org/{id}/settings/vAppLeaseSettings")
- public void testGetVAppLeaseSettings() {
- vAppLeaseSettings = orgApi.getVAppLeaseSettings(org.getHref());
-
- Checks.checkVAppLeaseSettings(vAppLeaseSettings);
- }
-
- @Test(description = "PUT /admin/org/{id}/settings/vAppLeaseSettings", dependsOnMethods = { "testGetVAppLeaseSettings" })
- // FIXME: fails with 403 forbidden
- public void testEditVAppLeaseSettings() {
- boolean deleteOnStorageLeaseExpiration = vAppLeaseSettings.deleteOnStorageLeaseExpiration();
- Integer storageLeaseSeconds = vAppLeaseSettings.getStorageLeaseSeconds();
- Integer deploymentLeaseSeconds = vAppLeaseSettings.getDeploymentLeaseSeconds();
-
- try {
- OrgLeaseSettings newVAppLeaseSettings = vAppLeaseSettings.toBuilder()
- .deleteOnStorageLeaseExpiration(!deleteOnStorageLeaseExpiration)
- .storageLeaseSeconds(storageLeaseSeconds + 1).deploymentLeaseSeconds(deploymentLeaseSeconds + 1)
- .build();
-
- vAppLeaseSettings = orgApi.editVAppLeaseSettings(org.getHref(), newVAppLeaseSettings);
-
- assertTrue(equal(vAppLeaseSettings.deleteOnStorageLeaseExpiration(), !deleteOnStorageLeaseExpiration),
- String.format(OBJ_FIELD_UPDATABLE, "vAppLeaseSettings", "deleteOnStorageLeaseExpiration"));
- assertTrue(equal(vAppLeaseSettings.getStorageLeaseSeconds(), storageLeaseSeconds + 1),
- String.format(OBJ_FIELD_UPDATABLE, "vAppLeaseSettings", "storageLeaseSeconds"));
- assertTrue(equal(vAppLeaseSettings.getDeploymentLeaseSeconds(), deploymentLeaseSeconds + 1),
- String.format(OBJ_FIELD_UPDATABLE, "vAppLeaseSettings", "deploymentLeaseSeconds"));
-
- // TODO negative tests?
-
- Checks.checkVAppLeaseSettings(vAppLeaseSettings);
- } finally {
- vAppLeaseSettings = vAppLeaseSettings.toBuilder()
- .deleteOnStorageLeaseExpiration(deleteOnStorageLeaseExpiration)
- .storageLeaseSeconds(storageLeaseSeconds).deploymentLeaseSeconds(deploymentLeaseSeconds).build();
-
- vAppLeaseSettings = orgApi.editVAppLeaseSettings(org.getHref(), vAppLeaseSettings);
- }
- }
-
- @Test(description = "GET /admin/org/{id}/settings/vAppTemplateLeaseSettings")
- public void testGetVAppTemplateLeaseSettings() {
- vAppTemplateLeaseSettings = orgApi.getVAppTemplateLeaseSettings(org.getHref());
-
- Checks.checkVAppTemplateLeaseSettings(vAppTemplateLeaseSettings);
- }
-
- @Test(description = "PUT /admin/org/{id}/settings/vAppTemplateLeaseSettings", dependsOnMethods = { "testGetVAppTemplateLeaseSettings" })
- // FIXME: fails with 403 forbidden
- public void testEditVAppTemplateLeaseSettings() {
- boolean deleteOnStorageLeaseExpiration = vAppTemplateLeaseSettings.deleteOnStorageLeaseExpiration();
- Integer storageLeaseSeconds = vAppTemplateLeaseSettings.getStorageLeaseSeconds();
-
- try {
- OrgVAppTemplateLeaseSettings newVAppTemplateLeaseSettings = vAppTemplateLeaseSettings.toBuilder()
- .deleteOnStorageLeaseExpiration(!deleteOnStorageLeaseExpiration)
- .storageLeaseSeconds(storageLeaseSeconds + 1).build();
-
- vAppTemplateLeaseSettings = orgApi.editVAppTemplateLeaseSettings(org.getHref(), newVAppTemplateLeaseSettings);
-
- assertTrue(equal(vAppTemplateLeaseSettings.deleteOnStorageLeaseExpiration(), !deleteOnStorageLeaseExpiration),
- String.format(OBJ_FIELD_UPDATABLE, "vAppTemplateLeaseSettings", "deleteOnStorageLeaseExpiration"));
- assertTrue(equal(vAppTemplateLeaseSettings.getStorageLeaseSeconds(), storageLeaseSeconds + 1),
- String.format(OBJ_FIELD_UPDATABLE, "vAppTemplateLeaseSettings", "storageLeaseSeconds"));
-
- // TODO negative tests?
-
- Checks.checkVAppTemplateLeaseSettings(vAppTemplateLeaseSettings);
- } finally {
- vAppTemplateLeaseSettings = vAppTemplateLeaseSettings.toBuilder()
- .deleteOnStorageLeaseExpiration(deleteOnStorageLeaseExpiration)
- .storageLeaseSeconds(storageLeaseSeconds).build();
-
- vAppTemplateLeaseSettings = orgApi.editVAppTemplateLeaseSettings(org.getHref(), vAppTemplateLeaseSettings);
- }
- }
-
- @Test(description = "GET /admin/org/{id}/settings")
- public void testGetSettings() {
- settings = orgApi.getSettings(org.getHref());
-
- Checks.checkOrgSettings(settings);
- }
-
- @Test(description = "PUT /admin/org/{id}/settings", dependsOnMethods = { "testGetEmailSettings" })
- public void testEditSettings() throws Exception {
- String newFromEmailAddress = "test" + random.nextInt(Integer.MAX_VALUE) + "@test.com";
- Exception exception = null;
-
- try {
- OrgSettings newSettings = OrgSettings.builder()
- .emailSettings(emailSettings.toBuilder().fromEmailAddress(newFromEmailAddress).build()).build();
-
- OrgSettings modified = orgApi.editSettings(org.getHref(), newSettings);
-
- Checks.checkOrgSettings(settings);
- assertTrue(equal(modified.getEmailSettings().getFromEmailAddress(), newFromEmailAddress),
- String.format(OBJ_FIELD_UPDATABLE, "orgSettings", "emailSettings"));
-
- } catch (Exception e) {
- exception = e;
- } finally {
- try {
- OrgSettings restorableSettings = OrgSettings.builder().emailSettings(emailSettings).build();
-
- settings = orgApi.editSettings(org.getHref(), restorableSettings);
- } catch (Exception e) {
- if (exception != null) {
- logger.warn(e, "Error resetting settings; rethrowing original test exception...");
- throw exception;
- } else {
- throw e;
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java
deleted file mode 100644
index 9f90096..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiExpectTest.java
+++ /dev/null
@@ -1,133 +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.vcloud.director.v1_5.features.admin;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRoleRecord;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "admin" }, singleThreaded = true, testName = "AdminQueryApiExpectTest")
-public class AdminQueryApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- // TODO Write expect tests for all other admin-query operations
-
- @Test
- public void testQueryAllGroups() {
-
- // TODO Need an example /admin/groups/query that actually contains records!
-
- HttpRequest queryRequest = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/admin/groups/query")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse queryResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/query/admin/allGroups.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5"))
- .build();
-
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse);
-
- QueryResultRecords expected = QueryResultRecords.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/groups/query?page=1&pageSize=25&format=records"))
- .type("application/vnd.vmware.vcloud.query.records+xml")
- .name("group")
- .page(1)
- .pageSize(25)
- .total(0L)
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.references+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/groups/query?page=1&pageSize=25&format=references"))
- .build())
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.idrecords+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/groups/query?page=1&pageSize=25&format=idrecords"))
- .build())
- .build();
-
- assertEquals(api.getQueryApi().groupsQueryAll(), expected);
- }
-
-// <?xml version="1.0" encoding="UTF-8"?>
-// <QueryResultRecords xmlns="http://www.vmware.com/vcloud/v1.5" total="4" pageSize="25" page="1" name="role" type="application/vnd.vmware.vcloud.query.records+xml" href="https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=records" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
-// <Link rel="alternate" type="application/vnd.vmware.vcloud.query.references+xml" href="https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=references"/>
-// <Link rel="alternate" type="application/vnd.vmware.vcloud.query.idrecords+xml" href="https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=idrecords"/>
-// <RoleRecord name="vApp Author" isReadOnly="false" href="https://vcloudbeta.bluelock.com/api/admin/role/1bf4457f-a253-3cf1-b163-f319f1a31802"/>
-// </QueryResultRecords>
-
- @Test
- public void testQueryAllRoles() {
-
- HttpRequest queryRequest = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/admin/roles/query")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse queryResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/query/admin/allRoles.xml", VCloudDirectorMediaType.QUERY_RESULT_RECORDS + ";version=1.5"))
- .build();
-
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse, queryRequest, queryResponse);
-
- QueryResultRecords expected = QueryResultRecords.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=records"))
- .type("application/vnd.vmware.vcloud.query.records+xml")
- .name("role")
- .page(1)
- .pageSize(25)
- .total(1L)
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.references+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=references"))
- .build())
- .link(Link.builder()
- .rel("alternate")
- .type("application/vnd.vmware.vcloud.query.idrecords+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/roles/query?page=1&pageSize=25&format=idrecords"))
- .build())
- .record(QueryResultRoleRecord.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/role/1bf4457f-a253-3cf1-b163-f319f1a31802"))
- .name("vApp Author")
- .isReadOnly(false)
- .build())
- .build();
-
- assertEquals(api.getQueryApi().rolesQueryAll(), expected);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiLiveTest.java
deleted file mode 100644
index d74c1de..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApiLiveTest.java
+++ /dev/null
@@ -1,130 +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.vcloud.director.v1_5.features.admin;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.RoleReferences;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultAdminUserRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultAdminVdcRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRightRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRoleRecord;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultStrandedUserRecord;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "AdminQueryApiLiveTest")
-public class AdminQueryApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- /*
- * Convenience references to API apis.
- */
-
- private AdminQueryApi queryApi;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- queryApi = adminContext.getApi().getQueryApi();
- }
-
- @Test(description = "GET /admin/groups/query")
- public void testQueryAllGroups() {
- // TODO Ensure there will be at least one record, for asserting result
- QueryResultRecords resultRecords = queryApi.groupsQueryAll();
-
- for (QueryResultRecord record : resultRecords.getRecords()) {
- Checks.checkQueryResultRecord(record);
- }
- }
-
- @Test(description = "GET /admin/orgs/query")
- public void testQueryAllOrgs() {
- // TODO Ensure there will be at least one record, for asserting result
- QueryResultRecords resultRecords = queryApi.orgsQueryAll();
-
- for (QueryResultRecord record : resultRecords.getRecords()) {
- Checks.checkQueryResultRecord(record);
- }
- }
-
- @Test(description = "GET /admin/rights/query")
- public void testQueryAllRights() {
- // TODO Ensure there will be at least one record, for asserting result
- QueryResultRecords resultRecords = queryApi.rightsQueryAll();
-
- for (QueryResultRecord record : resultRecords.getRecords()) {
- Checks.checkQueryResultRecord(record);
- assertEquals(record.getClass(), QueryResultRightRecord.class, "incorrect record type admin query");
- }
- }
-
- @Test(description = "GET /admin/roles/query")
- public void testQueryAllRoles() {
- // TODO Ensure there will be at least one record, for asserting result
- QueryResultRecords resultRecords = queryApi.rolesQueryAll();
-
- for (QueryResultRecord record : resultRecords.getRecords()) {
- Checks.checkQueryResultRecord(record);
- assertEquals(record.getClass(), QueryResultRoleRecord.class, "incorrect record type admin query");
- }
-
- RoleReferences roleRefs = queryApi.roleReferencesQueryAll();
-
- for (Reference ref : roleRefs.getReferences()) {
- Checks.checkReferenceType(ref);
- }
- }
-
- @Test(description = "GET /admin/strandedUsers/query")
- public void testQueryAllStrandedUsers() {
- // TODO Ensure there will be at least one record, for asserting result
- QueryResultRecords resultRecords = queryApi.strandedUsersQueryAll();
-
- for (QueryResultRecord record : resultRecords.getRecords()) {
- Checks.checkQueryResultRecord(record);
- assertEquals(record.getClass(), QueryResultStrandedUserRecord.class, "incorrect record type admin query");
- }
- }
-
- @Test(description = "GET /admin/users/query")
- public void testQueryAllUsers() {
- // TODO Ensure there will be at least one record, for asserting result
- QueryResultRecords resultRecords = queryApi.usersQueryAll();
-
- for (QueryResultRecord record : resultRecords.getRecords()) {
- Checks.checkQueryResultRecord(record);
- assertEquals(record.getClass(), QueryResultAdminUserRecord.class, "incorrect record type admin query");
- }
- }
-
- @Test(description = "GET /admin/vdcs/query")
- public void testQueryAllVdc() {
- // TODO Ensure there will be at least one record, for asserting result
- QueryResultRecords resultRecords = queryApi.vdcsQueryAll();
-
- for (QueryResultRecord record : resultRecords.getRecords()) {
- Checks.checkQueryResultRecord(record);
- assertEquals(record.getClass(), QueryResultAdminVdcRecord.class, "incorrect record type admin query");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiExpectTest.java
deleted file mode 100644
index ad28867..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiExpectTest.java
+++ /dev/null
@@ -1,60 +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.vcloud.director.v1_5.features.admin;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
-import org.jclouds.vcloud.director.v1_5.domain.AdminVdc;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.features.VdcApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-@Test(groups = { "unit", "admin" }, singleThreaded = true, testName = "AdminVdcApiExpectTest")
-public class AdminVdcApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private Reference vdcRef = Reference.builder()
- .href(URI.create(endpoint + "???"))
- .build();
-
- @Test( enabled = false )
- public void testGetVdc() {
- VCloudDirectorAdminApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/admin/vdc/???")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vdc/admin/vdc.xml",
- VCloudDirectorMediaType.ADMIN_VDC)
- .httpResponseBuilder().build());
-
- AdminVdc expected = adminVdc();
-
- assertEquals(api.getVdcApi().get(vdcRef.getHref()), expected);
- }
-
- public static final AdminVdc adminVdc() {
- return AdminVdc.builder().fromVdc(VdcApiExpectTest.getVdc())
-
- .build();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiLiveTest.java
deleted file mode 100644
index 99e792a..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApiLiveTest.java
+++ /dev/null
@@ -1,205 +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.vcloud.director.v1_5.features.admin;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_REQ_LIVE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.domain.AdminVdc;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "AdminVdcApiLiveTest")
-public class AdminVdcApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String VDC = "admin vdc";
-
- /*
- * Convenience reference to API api.
- */
- protected AdminVdcApi vdcApi;
- protected MetadataApi metadataApi;
-
- private String metadataKey;
- private String metadataValue;
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- vdcApi = adminContext.getApi().getVdcApi();
- metadataApi = context.getApi().getMetadataApi(context.resolveIdToHref(vdcId));
- }
-
- @AfterClass(alwaysRun = true)
- public void cleanUp() throws Exception {
- if (metadataKey != null) {
- try {
- Task task = metadataApi.remove(metadataKey);
- taskDoneEventually(task);
- } catch (VCloudDirectorException e) {
- logger.warn(e, "Error deleting metadata-value (perhaps it doesn't exist?); continuing...");
- }
- }
- }
-
- @Test(description = "GET /admin/vdc/{id}")
- public void testGetVdc() {
- AdminVdc vdc = vdcApi.get(context.resolveIdToAdminHref(vdcId));
- assertNotNull(vdc, String.format(OBJ_REQ_LIVE, VDC));
-
- // parent type
- Checks.checkAdminVdc(vdc);
- }
-
- // TODO insufficient permissions to test
- @Test(description = "PUT /admin/vdc/{id}", enabled = false)
- public void testEditVdc() throws Exception {
- String origName = lazyGetVdc().getName();
- String newName = name("a");
- Exception exception = null;
-
- AdminVdc vdc = AdminVdc.builder().name(newName).build();
-
- try {
- Task task = vdcApi.edit(vdc.getHref(), vdc);
- assertTaskSucceeds(task);
-
- AdminVdc modified = vdcApi.get(vdc.getHref());
- assertEquals(modified.getName(), newName);
-
- // parent type
- Checks.checkAdminVdc(vdc);
- } catch (Exception e) {
- exception = e;
- } finally {
- try {
- AdminVdc restorableVdc = AdminVdc.builder().name(origName).build();
- Task task = vdcApi.edit(vdc.getHref(), restorableVdc);
- assertTaskSucceeds(task);
- } catch (Exception e) {
- if (exception != null) {
- logger.warn(e, "Error resetting adminVdc.name; rethrowing original test exception...");
- throw exception;
- } else {
- throw e;
- }
- }
- }
- }
-
- // TODO insufficient permissions to test
- @Test(description = "DELETE /admin/vdc/{id}", enabled = false)
- public void testRemoveVdc() throws Exception {
- // TODO Need to have a VDC that we're happy to remove!
- Task task = vdcApi.remove(context.resolveIdToAdminHref(vdcId));
- assertTaskSucceeds(task);
-
- try {
- vdcApi.get(context.resolveIdToAdminHref(vdcId));
- } catch (VCloudDirectorException e) {
- // success; unreachable because it has been removed
- // TODO: ^^ wrong. this should return null
- }
- }
-
- // TODO insufficient permissions to test
- @Test(description = "DISABLE/ENABLE /admin/vdc/{id}", enabled = false)
- public void testDisableAndEnableVdc() throws Exception {
- // TODO Need to have a VDC that we're happy to remove!
- Exception exception = null;
-
- try {
- vdcApi.disable(context.resolveIdToAdminHref(vdcId));
- } catch (Exception e) {
- exception = e;
- } finally {
- try {
- vdcApi.enable(context.resolveIdToAdminHref(vdcId));
- } catch (Exception e) {
- if (exception != null) {
- logger.warn(e, "Error resetting adminVdc.name; rethrowing original test exception...");
- throw exception;
- } else {
- throw e;
- }
- }
- }
- }
-
- @Test(description = "GET /admin/vdc/{id}/metadata")
- public void testGetMetadata() throws Exception {
- Metadata metadata = metadataApi.get();
-
- Checks.checkMetadata(metadata);
- }
-
- // TODO insufficient permissions to test
- @Test(description = "PUT /admin/vdc/{id}/metadata", enabled = false)
- public void testSetMetadata() throws Exception {
- metadataKey = name("key-");
- metadataValue = name("value-");
-
- Task task = metadataApi.putAll(ImmutableMap.of(metadataKey, metadataValue));
-
- assertTaskSucceeds(task);
-
- String modified = metadataApi.get(metadataKey);
- assertEquals(modified, metadataValue);
- }
-
- // TODO insufficient permissions to test
- @Test(description = "GET /admin/vdc/{id}/metadata/{key}", dependsOnMethods = { "testSetMetadata" }, enabled = false)
- public void testGetMetadataValue() throws Exception {
- String retrievedMetadataValue = metadataApi.get(metadataKey);
-
- assertEquals(retrievedMetadataValue, metadataValue);
- }
-
- // TODO insufficient permissions to test
- @Test(description = "PUT /admin/vdc/{id}/metadata/{key}", dependsOnMethods = { "testGetMetadataValue" }, enabled = false)
- public void testSetMetadataValue() throws Exception {
- metadataValue = name("value-");
-
- Task task = metadataApi.put(metadataKey, metadataValue);
- assertTaskSucceeds(task);
-
- String retrievedMetadataValue = metadataApi.get(metadataKey);
- assertEquals(retrievedMetadataValue, metadataValue);
- }
-
- // TODO insufficient permissions to test
- @Test(description = "DELETE /admin/vdc/{id}/metadata/{key}", dependsOnMethods = { "testSetMetadataValue" }, enabled = false)
- public void testRemoveMetadataValue() throws Exception {
- // TODO Remove dependency on other tests; make cleanUp remove a list of metadata entries?
-
- Task task = metadataApi.remove(metadataKey);
- assertTaskSucceeds(task);
-
- assertNull(metadataApi.get(metadataKey));
- }
-}
[27/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
deleted file mode 100644
index 13722ef..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
+++ /dev/null
@@ -1,251 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Arrays;
-
-import javax.annotation.Resource;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * The standard error message type used in the vCloud REST API.
- */
-@XmlRootElement(name = "Error")
-public class Error {
-
- @Resource
- protected static Logger logger = Logger.NULL;
-
- @XmlType
- @XmlEnum(Integer.class)
- public static enum Code {
- @XmlEnumValue("200") OK(200),
- @XmlEnumValue("201") CREATED(201),
- @XmlEnumValue("202") ACCEPTED(202),
- @XmlEnumValue("204") NO_CONTENT(204),
- @XmlEnumValue("303") SEE_OTHER(303),
- @XmlEnumValue("400") BAD_REQUEST(400),
- @XmlEnumValue("401") UNAUTHORIZED(401),
- @XmlEnumValue("403") FORBIDDEN(403), // NOTE also means 'not found' for entities
- @XmlEnumValue("404") NOT_FOUND(404),
- @XmlEnumValue("405") NOT_ALLOWED(405),
- @XmlEnumValue("500") INTERNAL_ERROR(500),
- @XmlEnumValue("501") NOT_IMPLEMENTED(501),
- @XmlEnumValue("503") UNAVAILABLE(503),
- UNRECOGNIZED(-1);
-
- private Integer majorErrorCode;
-
- private Code(Integer majorErrorCode) {
- this.majorErrorCode = majorErrorCode;
- }
-
- public Integer getCode() {
- return majorErrorCode;
- }
-
- public static Code fromCode(final int majorErrorCode) {
- Optional<Code> found = Iterables.tryFind(Arrays.asList(values()), new Predicate<Code>() {
- @Override
- public boolean apply(Code code) {
- return code.getCode().equals(majorErrorCode);
- }
- });
- if (found.isPresent()) {
- return found.get();
- } else {
- logger.warn("Unrecognized major error code '%d'", majorErrorCode);
- return UNRECOGNIZED;
- }
- }
- }
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.ERROR;
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromError(this);
- }
-
- public static class Builder {
-
- protected String message;
- protected int majorErrorCode;
- protected String minorErrorCode;
- protected String vendorSpecificErrorCode;
- protected String stackTrace;
-
- /**
- * @see Error#getMessage()
- */
- public Builder message(String message) {
- this.message = message;
- return this;
- }
-
- /**
- * @see Error#getMajorErrorCode()
- */
- public Builder majorErrorCode(int majorErrorCode) {
- this.majorErrorCode = majorErrorCode;
- return this;
- }
-
- /**
- * @see Error#getMinorErrorCode()
- */
- public Builder minorErrorCode(String minorErrorCode) {
- this.minorErrorCode = minorErrorCode;
- return this;
- }
-
- /**
- * @see Error#getVendorSpecificErrorCode()
- */
- public Builder vendorSpecificErrorCode(String vendorSpecificErrorCode) {
- this.vendorSpecificErrorCode = vendorSpecificErrorCode;
- return this;
- }
-
- /**
- * @see Error#getStackTrace()
- */
- public Builder stackTrace(String stackTrace) {
- this.stackTrace = stackTrace;
- return this;
- }
-
- public Error build() {
- return new Error(message, majorErrorCode, minorErrorCode, vendorSpecificErrorCode, stackTrace);
- }
-
- public Builder fromError(Error in) {
- return message(in.getMessage())
- .majorErrorCode(in.getMajorErrorCode())
- .minorErrorCode(in.getMinorErrorCode())
- .vendorSpecificErrorCode(in.getVendorSpecificErrorCode())
- .stackTrace(in.getStackTrace());
- }
- }
-
- @XmlAttribute
- private String message;
- @XmlAttribute
- private Integer majorErrorCode;
- @XmlAttribute
- private String minorErrorCode;
- @XmlAttribute
- private String vendorSpecificErrorCode;
- @XmlAttribute
- private String stackTrace;
-
- private Error(String message, Integer majorErrorCode, String minorErrorCode, String vendorSpecificErrorCode, String stackTrace) {
- this.message = checkNotNull(message, "message");
- this.majorErrorCode = checkNotNull(majorErrorCode, "majorErrorCode");
- this.minorErrorCode = checkNotNull(minorErrorCode, "minorErrorCode");
- this.vendorSpecificErrorCode = vendorSpecificErrorCode;
- this.stackTrace = stackTrace;
- }
-
- private Error() {
- // For JAXB
- }
-
- /**
- * An one line, human-readable message describing the error that occurred.
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * The class of the error. Matches the HTTP status code.
- */
- public Integer getMajorErrorCode() {
- return majorErrorCode;
- }
-
- /**
- * Specific API error code.
- *
- * For example - can indicate that vApp power on failed by some reason.
- */
- public String getMinorErrorCode() {
- return minorErrorCode;
- }
-
- /**
- * A vendor/implementation specific error code that point to specific
- * modules/parts of the code and can make problem diagnostics easier.
- */
- public String getVendorSpecificErrorCode() {
- return vendorSpecificErrorCode;
- }
-
- /**
- * The stack trace of the exception which when examined might make problem
- * diagnostics easier.
- */
- public String getStackTrace() {
- return stackTrace;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Error that = (Error) o;
- return equal(this.message, that.message) &&
- equal(this.majorErrorCode, that.majorErrorCode) &&
- equal(this.minorErrorCode, that.minorErrorCode) &&
- equal(this.vendorSpecificErrorCode, that.vendorSpecificErrorCode) &&
- equal(this.stackTrace, that.stackTrace);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(message, majorErrorCode, minorErrorCode, vendorSpecificErrorCode, stackTrace);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("message", message).add("majorErrorCode", majorErrorCode).add("minorErrorCode", minorErrorCode)
- .add("vendorSpecificErrorCode", vendorSpecificErrorCode).add("stackTrace", stackTrace)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
deleted file mode 100644
index 1dbb52a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
+++ /dev/null
@@ -1,173 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-
-/**
- * Represents a file to be transferred (uploaded or downloaded).
- */
-@XmlType(name = "File")
-public class File extends Entity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromFile(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private Long size;
- private Long bytesTransferred;
- private String checksum;
-
- /**
- * @see File#getSize()
- */
- public B size(Long size) {
- this.size = size;
- return self();
- }
-
- /**
- * @see File#getBytesTransferred()
- */
- public B bytesTransferred(Long bytesTransferred) {
- this.bytesTransferred = bytesTransferred;
- return self();
- }
-
- /**
- * @see File#getChecksum()
- */
- public B checksum(String checksum) {
- this.checksum = checksum;
- return self();
- }
-
- @Override
- public File build() {
- return new File(this);
-
- }
-
- public B fromFile(File in) {
- return fromEntityType(in)
- .size(in.getSize())
- .bytesTransferred(in.getBytesTransferred())
- .checksum(in.getChecksum());
- }
- }
-
- public File(Builder<?> builder) {
- super(builder);
- this.size = builder.size;
- this.bytesTransferred = builder.bytesTransferred;
- this.checksum = builder.checksum;
- }
-
- @SuppressWarnings("unused")
- private File() {
- // For JAXB
- }
-
- @XmlAttribute
- protected Long size;
- @XmlAttribute
- protected Long bytesTransferred;
- @XmlAttribute
- @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
- @XmlSchemaType(name = "normalizedString")
- protected String checksum;
-
- /**
- * Gets the value of the size property.
- *
- * @return possible object is
- * {@link Long }
- */
- public Long getSize() {
- return size;
- }
-
- /**
- * Gets the value of the bytesTransferred property.
- *
- * @return possible object is
- * {@link Long }
- */
- public Long getBytesTransferred() {
- return bytesTransferred;
- }
-
- /**
- * Gets the value of the checksum property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getChecksum() {
- return checksum;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- File that = File.class.cast(o);
- return super.equals(that) &&
- equal(size, that.size) &&
- equal(bytesTransferred, that.bytesTransferred) &&
- equal(checksum, that.checksum);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- size,
- bytesTransferred,
- checksum);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("size", size)
- .add("bytesTransferred", bytesTransferred)
- .add("checksum", checksum);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
deleted file mode 100644
index ea5feba..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
+++ /dev/null
@@ -1,177 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents group in the system.
- */
-@XmlRootElement(name = "Group")
-@XmlType(propOrder = {
- "nameInSource",
- "usersList",
- "role"
-})
-public class Group extends Entity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromGroup(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private String nameInSource;
- private Set<Reference> users = Sets.newLinkedHashSet();
- private Reference role;
-
- /**
- * @see Group#getNameInSource()
- */
- public B nameInSource(String nameInSource) {
- this.nameInSource = nameInSource;
- return self();
- }
-
- /**
- * @see Group#getUsers()
- */
- public B users(Iterable<Reference> users) {
- this.users = Sets.newLinkedHashSet(checkNotNull(users, "users"));
- return self();
- }
-
- /**
- * @see Group#getUsers()
- */
- public B user(Reference user) {
- users.add(checkNotNull(user, "user"));
- return self();
- }
-
- /**
- * @see Group#getRole()
- */
- public B role(Reference role) {
- this.role = role;
- return self();
- }
-
- @Override
- public Group build() {
- return new Group(this);
- }
-
- public B fromGroup(Group in) {
- return fromEntityType(in)
- .nameInSource(in.getNameInSource())
- .users(in.getUsersList())
- .role(in.getRole());
- }
- }
-
- @SuppressWarnings("unused")
- private Group() {
- // For JAXB
- }
-
- protected Group(Builder<?> builder) {
- super(builder);
- this.nameInSource = builder.nameInSource;
- this.usersList = builder.users == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.users);
- this.role = builder.role;
- }
-
- @XmlElement(name = "NameInSource")
- protected String nameInSource;
- @XmlElementWrapper(name = "UsersList")
- @XmlElement(name = "UserReference")
- protected Set<Reference> usersList = Sets.newLinkedHashSet();
- @XmlElement(name = "Role")
- protected Reference role;
-
- /**
- * Gets the value of the nameInSource property.
- */
- public String getNameInSource() {
- return nameInSource;
- }
-
- /**
- * Gets the value of the users property.
- */
- public Set<Reference> getUsersList() {
- return usersList;
- }
-
- /**
- * Gets the value of the role property.
- */
- public Reference getRole() {
- return role;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Group that = Group.class.cast(o);
- return super.equals(that) &&
- equal(nameInSource, that.nameInSource) &&
- equal(usersList, that.usersList) &&
- equal(role, that.role);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- nameInSource,
- usersList,
- role);
- }
-
- @Override
- public String toString() {
- return super.string()
- .add("nameInSource", nameInSource)
- .add("usersList", usersList)
- .add("role", role).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
deleted file mode 100644
index ac86bc1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
+++ /dev/null
@@ -1,238 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-@XmlRootElement(name = "Link")
-public class Link extends Reference {
-
- @XmlType
- @XmlEnum(String.class)
- public static enum Rel {
- @XmlEnumValue("add") ADD("add"),
- @XmlEnumValue("alternate") ALTERNATE("alternate"),
- @XmlEnumValue("catalogItem") CATALOG_ITEM("catalogItem"),
- @XmlEnumValue("collaboration:abort") COLLABORATION_ABORT("collaboration:abort"),
- @XmlEnumValue("collaboration:fail") COLLABORATION_FAIL("collaboration:fail"),
- @XmlEnumValue("collaboration:resume") COLLABORATION_RESUME("collaboration:resume"),
- @XmlEnumValue("consolidate") CONSOLIDATE("consolidate"),
- @XmlEnumValue("controlAccess") CONTROL_ACCESS("controlAccess"),
- @XmlEnumValue("copy") COPY("copy"),
- @XmlEnumValue("deploy") DEPLOY("deploy"),
- @XmlEnumValue("disable") DISABLE("disable"),
- @XmlEnumValue("discardState") DISCARD_STATE("discardState"),
- @XmlEnumValue("down") DOWN("down"),
- @XmlEnumValue("download:alternate") DOWNLOAD_ALTERNATE("download:alternate"),
- @XmlEnumValue("download:default") DOWNLOAD_DEFAULT("download:default"),
- @XmlEnumValue("edit") EDIT("edit"),
- @XmlEnumValue("enable") ENABLE("enable"),
- @XmlEnumValue("entityResolver") ENTITY_RESOLVER("entityResolver"),
- @XmlEnumValue("firstPage") FIRST_PAGE("firstPage"),
- @XmlEnumValue("installVmwareTools") INSTALL_VMWARE_TOOLS("installVmwareTools"),
- @XmlEnumValue("lastPage") LAST_PAGE("lastPage"),
- @XmlEnumValue("media:ejectMedia") EJECT_MEDIA("media:ejectMedia"),
- @XmlEnumValue("media:insertMedia") INSERT_MEDIA("media:insertMedia"),
- @XmlEnumValue("move") MOVE("move"),
- @XmlEnumValue("nextPage") NEXT_PAGE("nextPage"),
- @XmlEnumValue("ova") OVA("ova"),
- @XmlEnumValue("ovf") OVF("ovf"),
- @XmlEnumValue("power:powerOff") POWER_OFF("power:powerOff"),
- @XmlEnumValue("power:powerOn") POWER_ON("power:powerOn"),
- @XmlEnumValue("power:reboot") REBOOT("power:reboot"),
- @XmlEnumValue("power:reset") RESET("power:reset"),
- @XmlEnumValue("power:shutdown") SHUTDOWN("power:shutdown"),
- @XmlEnumValue("power:suspend") SUSPEND("power:suspend"),
- @XmlEnumValue("previousPage") PREVIOUS_PAGE("previousPage"),
- @XmlEnumValue("publish") PUBLISH("publish"),
- @XmlEnumValue("recompose") RECOMPOSE("recompose"),
- @XmlEnumValue("reconnect") RECONNECT("reconnect"),
- @XmlEnumValue("register") REGISTER("register"),
- @XmlEnumValue("reject") REJECT("reject"),
- @XmlEnumValue("relocate") RELOCATE("relocate"),
- @XmlEnumValue("remove") REMOVE("remove"),
- @XmlEnumValue("screen:acquireTicket") SCREEN_ACQUIRE_TICKET("screen:acquireTicket"),
- @XmlEnumValue("screen:thumbnail") SCREEN_THUMBNAIL("screen:thumbnail"),
- @XmlEnumValue("syncSyslogSettings") SYNC_SYSLOG_SETTINGS("syncSyslogSettings"),
- @XmlEnumValue("task:cancel") TASK_CANCEL("task:cancel"),
- @XmlEnumValue("blockingTask") BLOCKING_TASK("blockingTask"),
- @XmlEnumValue("taskOwner") TASK_OWNER("taskOwner"),
- @XmlEnumValue("taskParams") TASK_PARAMS("taskParams"),
- @XmlEnumValue("taskRequest") TASK_REQUEST("taskRequest"),
- @XmlEnumValue("undeploy") UNDEPLOY("undeploy"),
- @XmlEnumValue("unlock") UNLOCK("unlock"),
- @XmlEnumValue("unregister") UNREGISTER("unregister"),
- @XmlEnumValue("up") UP("up"),
- @XmlEnumValue("updateProgress") UPDATE_PROGRESS("updateProgress"),
- @XmlEnumValue("upgrade") UPGRADE("upgrade"),
- @XmlEnumValue("upload:alternate") UPLOAD_ALTERNATE("upload:alternate"),
- @XmlEnumValue("upload:default") UPLOAD_DEFAULT("upload:default"),
- @XmlEnumValue("repair") REPAIR("repair"),
-
- UNRECOGNIZED("unrecognized");
-
- public static final List<Rel> ALL = ImmutableList.of(
- ADD, ALTERNATE, CATALOG_ITEM, COLLABORATION_ABORT,
- COLLABORATION_FAIL, COLLABORATION_RESUME, CONSOLIDATE,
- CONTROL_ACCESS, COPY, DEPLOY, DISABLE, DISCARD_STATE, DOWN,
- DOWNLOAD_ALTERNATE, DOWNLOAD_DEFAULT, EDIT, ENABLE, ENTITY_RESOLVER, FIRST_PAGE,
- INSTALL_VMWARE_TOOLS, LAST_PAGE, EJECT_MEDIA, INSERT_MEDIA, MOVE,
- NEXT_PAGE, OVA, OVF, POWER_OFF, POWER_ON, REBOOT, RESET, SHUTDOWN,
- SUSPEND, PREVIOUS_PAGE, PUBLISH, RECOMPOSE, RECONNECT, REGISTER,
- REJECT, RELOCATE, REMOVE, REPAIR, SCREEN_ACQUIRE_TICKET,
- SCREEN_THUMBNAIL, SYNC_SYSLOG_SETTINGS, TASK_CANCEL, BLOCKING_TASK, TASK_OWNER,
- TASK_PARAMS, TASK_REQUEST, UNDEPLOY, UNLOCK, UNREGISTER, UP,
- UPDATE_PROGRESS, UPGRADE, UPLOAD_ALTERNATE, UPLOAD_DEFAULT,
- UPLOAD_DEFAULT);
-
- protected final String stringValue;
-
- Rel(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, Rel> REL_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(Rel.values()), new Function<Rel, String>() {
- @Override
- public String apply(Rel input) {
- return input.stringValue;
- }
- });
-
- public static Rel fromValue(String value) {
- Rel rel = REL_BY_ID.get(checkNotNull(value, "stringValue"));
- return rel == null ? UNRECOGNIZED : rel;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromLink(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Reference.Builder<B> {
-
- private Rel rel;
-
- /**
- * @see Link#getRel()
- */
- public B rel(String rel) {
- this.rel = Rel.fromValue(rel);
- return self();
- }
-
- /**
- * @see Link#getRel()
- */
- public B rel(Rel rel) {
- this.rel = rel;
- return self();
- }
-
- @Override
- public Link build() {
- return new Link(this);
- }
-
- public B fromLink(Link in) {
- return fromReference(in).rel(in.getRel());
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public B fromAttributes(Map<String, String> attributes) {
- super.fromAttributes(attributes);
- rel(attributes.get("rel"));
- return self();
- }
- }
-
- @XmlAttribute(required = true)
- private Rel rel;
-
- protected Link(Builder<?> builder) {
- super(builder);
- this.rel = checkNotNull(builder.rel, "rel");
- }
-
- protected Link() {
- // For JAXB
- }
-
- /**
- * Defines the relationship of the link to the object that contains it. A relationship can be the
- * name of an operation on the object, a reference to a contained or containing object, or a
- * reference to an alternate representation of the object. The relationship value implies the
- * HTTP verb to use when you use the link's href value as a request URL.
- *
- * @return relationship of the link to the object that contains it.
- */
- public Rel getRel() {
- return rel;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Link that = (Link) o;
- return super.equals(that) && equal(this.rel, that.rel);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), rel);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("rel", rel);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
deleted file mode 100644
index 9d72e4d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
+++ /dev/null
@@ -1,202 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Represents removable media, such as a CD-ROM, DVD or Floppy disk.
- */
-@XmlRootElement(name = "Media")
-public class Media extends ResourceEntity {
-
- @XmlType
- @XmlEnum(String.class)
- public static enum ImageType {
- @XmlEnumValue("iso") ISO("iso"),
- @XmlEnumValue("floppy") FLOPPY("floppy"),
- @XmlEnumValue("") UNRECOGNIZED("unrecognized");
-
- public static final List<ImageType> ALL = ImmutableList.of(ISO, FLOPPY);
-
- protected final String stringValue;
-
- ImageType(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, ImageType> STATUS_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(ImageType.values()), new Function<ImageType, String>() {
- @Override
- public String apply(ImageType input) {
- return input.stringValue;
- }
- });
-
- public static ImageType fromValue(String value) {
- ImageType type = STATUS_BY_ID.get(checkNotNull(value, "stringValue"));
- return type == null ? UNRECOGNIZED : type;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromMedia(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ResourceEntity.Builder<B> {
-
- private Owner owner;
- private ImageType imageType;
- private long size;
-
- /**
- * @see Media#getOwner()
- */
- public B owner(Owner owner) {
- this.owner = owner;
- return self();
- }
-
- /**
- * @see Media#getImageType()
- */
- public B imageType(Media.ImageType imageType) {
- this.imageType = imageType;
- return self();
- }
-
- /**
- * @see Media#getSize()
- */
- public B size(long size) {
- this.size = size;
- return self();
- }
-
- @Override
- public Media build() {
- return new Media(this);
- }
-
- public B fromMedia(Media in) {
- return fromResourceEntityType(in).owner(in.getOwner()).imageType(in.getImageType()).size(in.getSize());
- }
- }
-
-
- public Media(Builder<?> builder) {
- super(builder);
- this.owner = builder.owner;
- this.imageType = builder.imageType;
- this.size = builder.size;
- }
-
- protected Media() {
- // for JAXB
- }
-
- @XmlElement(name = "Owner")
- protected Owner owner;
- @XmlAttribute(required = true)
- protected ImageType imageType;
- @XmlAttribute(required = true)
- protected long size;
-
- /**
- * Gets the value of the owner property.
- */
- public Owner getOwner() {
- return owner;
- }
-
- /**
- * Gets the value of the imageType property.
- */
- public ImageType getImageType() {
- return imageType;
- }
-
- /**
- * Gets the value of the size property.
- */
- public long getSize() {
- return size;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Media that = Media.class.cast(o);
- return super.equals(that) &&
- equal(this.owner, that.owner) && equal(this.imageType, that.imageType) && equal(this.size, that.size);
- }
-
- @Override
- public boolean clone(Object o) {
- if (this == o)
- return false;
- if (o == null || getClass() != o.getClass())
- return false;
- Media that = Media.class.cast(o);
- return super.clone(that) &&
- equal(this.imageType, that.imageType) && equal(this.size, that.size);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), owner, imageType, size);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("owner", owner).add("imageType", imageType).add("size", size);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
deleted file mode 100644
index 3185b76..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
+++ /dev/null
@@ -1,198 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "Metadata")
-public class Metadata extends Resource implements Map<String, String> {
-
- public static Metadata toMetadata(Map<String, String> input) {
- if (input instanceof Metadata)
- return Metadata.class.cast(input);
- Builder<?> builder = builder();
- for (Map.Entry<String, String> entry : input.entrySet()) {
- builder.entry(MetadataEntry.builder().entry(entry.getKey(), entry.getValue()).build());
- }
- return builder.build();
- }
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromMetadata(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Set<MetadataEntry> metadataEntries = Sets.newLinkedHashSet();
-
- /**
- * @see Metadata#getMetadataEntries()
- */
- public B entries(Set<MetadataEntry> metadataEntries) {
- this.metadataEntries = Sets.newLinkedHashSet(checkNotNull(metadataEntries, "metadataEntries"));
- return self();
- }
-
- /**
- * @see Metadata#getMetadataEntries()
- */
- public B entry(MetadataEntry metadataEntry) {
- metadataEntries.add(checkNotNull(metadataEntry, "metadataEntry"));
- return self();
- }
-
- @Override
- public Metadata build() {
- return new Metadata(this);
- }
-
- public B fromMetadata(Metadata in) {
- return fromResource(in).entries(in.getMetadataEntries());
- }
- }
-
- protected Metadata() {
- // For JAXB
- }
-
- protected Metadata(Builder<?> builder) {
- super(builder);
- this.metadataEntries = ImmutableSet.copyOf(builder.metadataEntries);
- }
-
- @XmlElement(name = "MetadataEntry")
- private Set<MetadataEntry> metadataEntries = Sets.newLinkedHashSet();
-
- public Set<MetadataEntry> getMetadataEntries() {
- return ImmutableSet.copyOf(metadataEntries);
- }
-
- protected Map<String, String> toMap() {
- ImmutableMap.Builder<String, String> builder = ImmutableMap.<String, String> builder();
- for (MetadataEntry entry : metadataEntries) {
- builder.put(entry.getKey(), entry.getValue());
- }
- return builder.build();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Metadata that = Metadata.class.cast(o);
- return super.equals(that) && equal(this.metadataEntries, that.metadataEntries);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), metadataEntries);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("metadataEntries", metadataEntries);
- }
-
- @Override
- public void clear() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean containsKey(Object arg0) {
- return toMap().containsKey(arg0);
- }
-
- @Override
- public boolean containsValue(Object arg0) {
- return toMap().containsValue(arg0);
- }
-
- @Override
- public Set<Map.Entry<String, String>> entrySet() {
- return toMap().entrySet();
- }
-
- @Override
- public String get(Object arg0) {
- return toMap().get(arg0);
- }
-
- @Override
- public boolean isEmpty() {
- return getMetadataEntries().size() == 0;
- }
-
- @Override
- public Set<String> keySet() {
- return toMap().keySet();
- }
-
- @Override
- public String put(String arg0, String arg1) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void putAll(Map<? extends String, ? extends String> arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String remove(Object arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int size() {
- return getMetadataEntries().size();
- }
-
- @Override
- public Collection<String> values() {
- return toMap().values();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
deleted file mode 100644
index 11cef70..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
+++ /dev/null
@@ -1,177 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Sets;
-
-//TODO: this is a ridiculously complicated way of representing Map<String, String>
-@XmlRootElement(name = "MetadataEntry")
-public class MetadataEntry extends Resource {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA_ENTRY;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromMetadataEntry(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
- private String key;
- private String value;
-
- /**
- * @see MetadataEntry#getKey()
- */
- public B key(String key) {
- this.key = key;
- return self();
- }
-
- /**
- * @see MetadataEntry#getValue()
- */
- public B value(String value) {
- this.value = value;
- return self();
- }
-
- /**
- * @see MetadataEntry#getKey()
- * @see MetadataEntry#getValue()
- */
- public B entry(String key, String value) {
- this.key = key;
- this.value = value;
- return self();
- }
-
- @Override
- public MetadataEntry build() {
- return new MetadataEntry(this);
- }
-
- /**
- * @see ResourceType#getHref()
- */
- @Override
- public B href(URI href) {
- super.href(href);
- return self();
- }
-
- /**
- * @see ResourceType#getType()
- */
- @Override
- public B type(String type) {
- super.type(type);
- return self();
- }
-
- /**
- * @see ResourceType#getLinks()
- */
- @Override
- public B links(Set<Link> links) {
- super.links(Sets.newLinkedHashSet(checkNotNull(links, "links")));
- return self();
- }
-
- /**
- * @see ResourceType#getLinks()
- */
- @Override
- public B link(Link link) {
- super.link(link);
- return self();
- }
-
- public B fromMetadataEntry(MetadataEntry in) {
- return fromResource(in).entry(key, value);
- }
-
- }
-
- MetadataEntry() {
- // for JAXB
- }
-
- public MetadataEntry(Builder<?> builder) {
- super(builder);
- this.key = checkNotNull(builder.key, "key");
- this.value = checkNotNull(builder.value, "value");
- }
-
- @XmlElement(name = "Key")
- private String key;
- @XmlElement(name = "Value")
- private String value;
-
- /**
- * @return key of the entry
- */
- public String getKey() {
- return key;
- }
-
- /**
- * @return value of the entry
- */
- public String getValue() {
- return value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- MetadataEntry that = MetadataEntry.class.cast(o);
- return super.equals(that) && equal(key, that.key) && equal(this.value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), key, value);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("key", key).add("value", value);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
deleted file mode 100644
index 0035046..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents the owner of an entity.
- */
-@XmlRootElement(name = "Owner")
-@XmlType(name = "OwnerType")
-public class Owner extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOwner(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Reference user;
-
- /**
- * @see Owner#getUser()
- */
- public B user(Reference user) {
- this.user = user;
- return self();
- }
-
- @Override
- public Owner build() {
- return new Owner(this);
- }
-
- public B fromOwner(Owner in) {
- return fromResource(in)
- .user(in.getUser());
- }
- }
-
- protected Owner() {
- // for JAXB
- }
-
- public Owner(Builder<?> builder) {
- super(builder);
- this.user = builder.user;
- }
-
- @XmlElement(name = "User", required = true)
- private Reference user;
-
- /**
- * Gets the value of the user property.
- */
- public Reference getUser() {
- return user;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Owner that = Owner.class.cast(o);
- return super.equals(that) && equal(this.user, that.user);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), user);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("user", user);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
deleted file mode 100644
index 8cb0aa4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
+++ /dev/null
@@ -1,201 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.DMTFConstants;
-import org.jclouds.dmtf.ovf.ProductSection;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "ProductSectionList")
-@XmlType(name = "ProductSectionListType")
-public class ProductSectionList extends Resource implements Set<ProductSection> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromProductSectionList(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Set<ProductSection> productSections = Sets.newLinkedHashSet();
-
- /**
- * @see ProductSectionList#getProductSections()
- */
- public B productSections(Set<ProductSection> productSections) {
- this.productSections = Sets.newLinkedHashSet(checkNotNull(productSections, "productSections"));
- return self();
- }
-
- /**
- * @see ProductSectionList#getProductSections()
- */
- public B productSection(ProductSection productSection) {
- this.productSections.add(checkNotNull(productSection, "productSection"));
- return self();
- }
-
- @Override
- public ProductSectionList build() {
- return new ProductSectionList(this);
- }
-
- public B fromProductSectionList(ProductSectionList in) {
- return fromResource(in)
- .productSections(Sets.newLinkedHashSet(in));
- }
- }
-
- protected ProductSectionList() {
- // for JAXB
- }
-
- protected ProductSectionList(Builder<?> builder) {
- super(builder);
- this.productSections = builder.productSections != null && builder.productSections.isEmpty() ? null : builder.productSections;
- }
-
-
- @XmlElement(name = "ProductSection", namespace = DMTFConstants.OVF_NS)
- private Set<ProductSection> productSections;
-
- /**
- * Gets the value of the productSection property.
- */
- public Set<ProductSection> getProductSections() {
- return productSections != null ? ImmutableSet.copyOf(productSections) : ImmutableSet.<ProductSection>of();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ProductSectionList that = ProductSectionList.class.cast(o);
- return super.equals(that)
- && equal(this.productSections, that.productSections);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), productSections);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("productSections", productSections);
- }
-
- /**
- * The delegate always returns a {@link Set} even if {@link #productSections} is {@literal null}.
- *
- * The delegated {@link Set} is used by the methods implementing its interface.
- * <p>
- * NOTE Annoying lack of multiple inheritance for using ForwardingList!
- */
- private Set<ProductSection> delegate() {
- return getProductSections();
- }
-
- @Override
- public boolean add(ProductSection arg0) {
- return delegate().add(arg0);
- }
-
- @Override
- public boolean addAll(Collection<? extends ProductSection> arg0) {
- return delegate().addAll(arg0);
- }
-
- @Override
- public void clear() {
- delegate().clear();
- }
-
- @Override
- public boolean contains(Object arg0) {
- return delegate().contains(arg0);
- }
-
- @Override
- public boolean containsAll(Collection<?> arg0) {
- return delegate().containsAll(arg0);
- }
-
- @Override
- public boolean isEmpty() {
- return delegate().isEmpty();
- }
-
- @Override
- public Iterator<ProductSection> iterator() {
- return delegate().iterator();
- }
-
- @Override
- public boolean remove(Object arg0) {
- return delegate().remove(arg0);
- }
-
- @Override
- public boolean removeAll(Collection<?> arg0) {
- return delegate().removeAll(arg0);
- }
-
- @Override
- public boolean retainAll(Collection<?> arg0) {
- return delegate().retainAll(arg0);
- }
-
- @Override
- public int size() {
- return delegate().size();
- }
-
- @Override
- public Object[] toArray() {
- return delegate().toArray();
- }
-
- @Override
- public <T> T[] toArray(T[] arg0) {
- return delegate().toArray(arg0);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
deleted file mode 100644
index 15b37f1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-/**
- * Contains key/value pair as property.
- */
-@XmlRootElement(name = "Property")
-public class Property {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.PROPERTY;
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder();
- }
-
- public static class Builder {
-
- private String value;
- private String key;
-
- /**
- * @see Property#getKey()
- */
- public Builder key(String key) {
- this.key = key;
- return this;
- }
-
- /**
- * @see Property#getValue()
- */
- public Builder value(String value) {
- this.value = value;
- return this;
- }
-
- /**
- * @see Property#getKey()
- * @see Property#getValue()
- */
- public Builder property(String key, String value) {
- this.key = key;
- this.value = value;
- return this;
- }
-
- public Property build() {
- return new Property(key, value);
- }
-
- public Builder fromProperty(Property in) {
- return property(in.getKey(), in.getValue());
- }
- }
-
- private Property() {
- // For JAXB
- }
-
- private Property(String key, String value) {
- this.value = value;
- this.key = key;
- }
-
- @XmlValue
- private String value;
- @XmlAttribute(required = true)
- private String key;
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Gets the value of the key property.
- */
- public String getKey() {
- return key;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
deleted file mode 100644
index 7837ffc..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
+++ /dev/null
@@ -1,197 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "RasdItemsList")
-@XmlType(name = "RasdItemsList")
-public class RasdItemsList extends Resource implements Set<RasdItem> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromRasdItemsList(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Set<RasdItem> items = Sets.newLinkedHashSet();
-
- /**
- * @see RasdItemsList#getItems()
- */
- public B items(Set<RasdItem> items) {
- this.items = checkNotNull(items, "items");
- return self();
- }
-
- /**
- * @see RasdItemsList#getItems()
- */
- public B item(RasdItem item) {
- this.items.add(checkNotNull(item, "item"));
- return self();
- }
-
- @Override
- public RasdItemsList build() {
- RasdItemsList rasdItemsList = new RasdItemsList(this);
- return rasdItemsList;
- }
-
- public B fromRasdItemsList(RasdItemsList in) {
- return fromResource(in).items(in.getItems());
- }
- }
-
- protected RasdItemsList() {
- // For JAXB and B use
- }
-
- protected RasdItemsList(Builder<?> builder) {
- super(builder);
- this.items = builder.items;
- }
-
- @XmlElement(name = "Item")
- protected Set<RasdItem> items = Sets.newLinkedHashSet();
-
- /**
- * A RASD item content.
- */
- public Set<RasdItem> getItems() {
- return items;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RasdItemsList that = RasdItemsList.class.cast(o);
- return super.equals(that) && equal(this.items, that.items);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), items);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("items", items);
- }
-
- /**
- * The delegate always returns a {@link Set} even if {@link #items} is {@literal null}.
- *
- * The delegated {@link Set} is used by the methods implementing its interface.
- * <p>
- * NOTE Annoying lack of multiple inheritance for using ForwardingList!
- */
- private Set<RasdItem> delegate() {
- return getItems();
- }
-
- @Override
- public boolean add(RasdItem arg0) {
- return delegate().add(arg0);
- }
-
- @Override
- public boolean addAll(Collection<? extends RasdItem> arg0) {
- return delegate().addAll(arg0);
- }
-
- @Override
- public void clear() {
- delegate().clear();
- }
-
- @Override
- public boolean contains(Object arg0) {
- return delegate().contains(arg0);
- }
-
- @Override
- public boolean containsAll(Collection<?> arg0) {
- return delegate().containsAll(arg0);
- }
-
- @Override
- public boolean isEmpty() {
- return delegate().isEmpty();
- }
-
- @Override
- public Iterator<RasdItem> iterator() {
- return delegate().iterator();
- }
-
- @Override
- public boolean remove(Object arg0) {
- return delegate().remove(arg0);
- }
-
- @Override
- public boolean removeAll(Collection<?> arg0) {
- return delegate().removeAll(arg0);
- }
-
- @Override
- public boolean retainAll(Collection<?> arg0) {
- return delegate().retainAll(arg0);
- }
-
- @Override
- public int size() {
- return delegate().size();
- }
-
- @Override
- public Object[] toArray() {
- return delegate().toArray();
- }
-
- @Override
- public <T> T[] toArray(T[] arg0) {
- return delegate().toArray(arg0);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
deleted file mode 100644
index 7322b60..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
+++ /dev/null
@@ -1,198 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * A reference to a resource.
- *
- * <p/> Contains an href attribute and optional name and type attributes.
- */
-@XmlSeeAlso({ VAppReference.class, CatalogReference.class, RoleReference.class })
-@XmlRootElement(name = "Reference")
-@XmlType(name = "ReferenceType")
-public class Reference {
-
- @javax.annotation.Resource
- protected static Logger logger = Logger.NULL;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromReference(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> {
-
- private URI href;
- private String name;
- private String type;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see Reference#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see Reference#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Reference#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- public Reference build() {
- return new Reference(this);
- }
-
- public B fromReference(Reference in) {
- return href(in.getHref()).name(in.getName()).type(in.getType());
- }
-
- public B fromEntity(Entity in) {
- return href(in.getHref()).name(in.getName()).type(in.getType());
- }
-
- protected B fromAttributes(Map<String, String> attributes) {
- return href(URI.create(attributes.get("href"))).name(attributes.get("name")).type(attributes.get("type"));
- }
- }
-
- @XmlAttribute(required = true)
- private URI href;
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String type;
-
- protected Reference(Builder<?> builder) {
- this.href = builder.href;
- this.name = builder.name;
- this.type = builder.type;
- }
-
- protected Reference(URI href, String name, String type) {
- this.href = href;
- this.name = name;
- this.type = type;
- }
-
- protected Reference() {
- // For JAXB
- }
-
- /**
- * Contains the URI to the entity.
- * <p/>
- * An object reference, expressed in URL format. Because this URL includes the object identifier
- * portion of the id attribute value, it uniquely identifies the object, persists for the life of
- * the object, and is never reused. The value of the href attribute is a reference to a view of
- * the object, and can be used to access a representation of the object that is valid in a
- * particular context. Although URLs have a well-known syntax and a well-understood
- * interpretation, a api should treat each href as an opaque string. The rules that govern how
- * the server constructs href strings might change in future releases.
- *
- * @return an opaque reference and should never be parsed
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Contains the name of the the entity.
- * <p/>
- * The object type, specified as a MIME content type, of the object that the link references.
- * This attribute is present only for links to objects. It is not present for links to actions.
- *
- * @return type definition, type, expressed as an HTTP Content-Type
- */
- public String getName() {
- return name;
- }
-
- /**
- * Contains the type of the the entity.
- * <p/>
- * The object type, specified as a MIME content type, of the object that the link references.
- * This attribute is present only for links to objects. It is not present for links to actions.
- *
- * @return type definition, type, expressed as an HTTP Content-Type
- */
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Reference that = Reference.class.cast(o);
- return equal(this.href, that.href) && equal(this.name, that.name) && equal(this.type, that.type);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(href, name, type);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected ToStringHelper string() {
- return Objects.toStringHelper("").add("href", href).add("name", name).add("type", type);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
deleted file mode 100644
index b5b52e6..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
+++ /dev/null
@@ -1,132 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.query.Container;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "References")
-@XmlType(propOrder = {
- "references"
-})
-public class References extends Container {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromReferences(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- public abstract static class Builder<T extends Builder<T>> extends Container.Builder<T> {
- private Set<Reference> references;
-
- /**
- * @see References#getReference()
- */
- public T references(Set<Reference> references) {
- this.references = references;
- return self();
- }
-
- @Override
- public References build() {
- return new References(this);
- }
-
- public T fromReferences(References in) {
- return fromContainerType(in)
- .references(in.getReferences());
- }
- }
-
- private References(Builder<?> b) {
- super(b);
- this.references = b.references;
- }
-
-
- @XmlElementRef(name = "Reference", namespace = "http://www.vmware.com/vcloud/v1.5")
- protected Set<Reference> references = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the reference property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the reference property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getReference().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
- *
- *
- */
- public Set<Reference> getReferences() {
- return this.references;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- References that = References.class.cast(o);
- return super.equals(that) && equal(references, that.references);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), references);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("references", references);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
deleted file mode 100644
index bc2c373..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
+++ /dev/null
@@ -1,199 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The base type for all objects in the vCloud model.
- *
- * <p/> Has an optional list of links and href and type attributes.
- */
-@XmlRootElement(name = "Resource")
-@XmlType(name = "ResourceType")
-public class Resource {
-
- @javax.annotation.Resource
- protected static Logger logger = Logger.NULL;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromResource(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> {
- private URI href;
- private String type;
- private Set<Link> links;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see ResourceType#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see ResourceType#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see ResourceType#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return self();
- }
-
- /**
- * @see ResourceType#getLinks()
- */
- public B link(Link link) {
- if (links == null)
- links = Sets.newLinkedHashSet();
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- public Resource build() {
- return new Resource(this);
- }
-
- protected B fromResource(Resource in) {
- return href(in.getHref()).type(in.getType()).links(Sets.newLinkedHashSet(in.getLinks()));
- }
- }
-
- @XmlAttribute
- private URI href;
- @XmlAttribute
- private String type;
- @XmlElement(name = "Link")
- private Set<Link> links = Sets.newLinkedHashSet();
-
- protected Resource(Builder<?> builder) {
- this.href = builder.href;
- this.type = builder.type;
- this.links = builder.links == null ? ImmutableSet.<Link>of() : builder.links;
- }
-
- protected Resource() {
- // For JAXB
- }
-
- /**
- * Contains the URI to the entity.
- *
- * An object reference, expressed in URL format. Because this URL includes the object identifier
- * portion of the id attribute value, it uniquely identifies the object, persists for the life of
- * the object, and is never reused. The value of the href attribute is a reference to a view of
- * the object, and can be used to access a representation of the object that is valid in a
- * particular context. Although URLs have a well-known syntax and a well-understood
- * interpretation, a api should treat each href as an opaque string. The rules that govern how
- * the server constructs href strings might change in future releases.
- *
- * @return an opaque reference and should never be parsed
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Contains the type of the the entity.
- *
- * The object type, specified as a MIME content type, of the object that the link references.
- * This attribute is present only for links to objects. It is not present for links to actions.
- *
- * @return type definition, type, expressed as an HTTP Content-Type
- */
- public String getType() {
- return type;
- }
-
- /**
- * Set of optional links to an entity or operation associated with this object.
- */
- public Set<Link> getLinks() {
- return links == null ? ImmutableSet.<Link>of() : Collections.unmodifiableSet(links);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Resource that = Resource.class.cast(o);
- return equal(this.href, that.href) && equal(this.links, that.links) && equal(this.type, that.type);
- }
-
- public boolean clone(Object o) {
- if (this == o)
- return false;
- if (o == null || getClass() != o.getClass())
- return false;
- Resource that = Resource.class.cast(o);
- return equal(this.type, that.type);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(href, links, type);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected ToStringHelper string() {
- return Objects.toStringHelper("").add("href", href).add("links", links).add("type", type);
- }
-}
[31/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
deleted file mode 100644
index 6ef6631..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
+++ /dev/null
@@ -1,902 +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.dmtf.cim;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.CIM_RASD_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import java.math.BigInteger;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * The ResourceAllocationSettingData class represents settings specifically
- * related to an allocated resource that are outside the scope of the CIM class
- * typically used to represent the resource itself.
- *
- * These settings include information specific to the allocation that may not
- * be visible to the consumer of the resource itself. For example, a virtual
- * processor may look like a 2 GHz processor to the consumer (virtual computer
- * system), however the virtualization system may use time-slicing to schedule
- * the the virtual processor to only allow it to use 1 GHz.
- *
- * @see <a href="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">CIM_ResourceAllocationSettingData</a>
- */
-@XmlType(name = "CIM_ResourceAllocationSettingData_Type", namespace = OVF_NS,
- propOrder = {
- "address",
- "addressOnParent",
- "allocationUnits",
- "automaticAllocation",
- "automaticDeallocation",
- "caption",
- "connections",
- "consumerVisibility",
- "description",
- "elementName",
- "hostResources",
- "instanceID",
- "limit",
- "mappingBehavior",
- "otherResourceType",
- "parent",
- "poolID",
- "reservation",
- "resourceSubType",
- "resourceType",
- "virtualQuantity",
- "virtualQuantityUnits",
- "weight"
- }
-)
-public class ResourceAllocationSettingData {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromResourceAllocationSettingData(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> {
-
- private String elementName;
- private String instanceID;
- private String caption;
- private String description;
- private String address;
- private String addressOnParent;
- private String allocationUnits;
- private Boolean automaticAllocation;
- private Boolean automaticDeallocation;
- private ConsumerVisibility consumerVisibility;
- private BigInteger limit;
- private MappingBehavior mappingBehavior;
- private String otherResourceType;
- private String parent;
- private String poolID;
- private BigInteger reservation;
- private String resourceSubType;
- private ResourceType resourceType;
- private BigInteger virtualQuantity;
- private String virtualQuantityUnits;
- private Long weight;
- private Set<CimString> connections = Sets.newLinkedHashSet();
- private Set<CimString> hostResources = Sets.newLinkedHashSet();
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see ResourceAllocationSettingData#getElementName()
- */
- public B elementName(String elementName) {
- this.elementName = elementName;
- return self();
- }
-
- /**
- *@see ResourceAllocationSettingData#getInstanceId()
- */
- public B instanceID(String instanceID) {
- this.instanceID = instanceID;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getCaption()
- */
- public B caption(String caption) {
- this.caption = caption;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getDescription()
- */
- public B description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getAddress
- */
- public B address(String address) {
- this.address = address;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getAddressOnParent
- */
- public B addressOnParent(String addressOnParent) {
- this.addressOnParent = addressOnParent;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getAllocationUnits
- */
- public B allocationUnits(String allocationUnits) {
- this.allocationUnits = allocationUnits;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#isAutomaticAllocation()
- */
- public B automaticAllocation(Boolean automaticAllocation) {
- this.automaticAllocation = automaticAllocation;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#isAutomaticDeallocation()
- */
- public B automaticDeallocation(Boolean automaticDeallocation) {
- this.automaticDeallocation = automaticDeallocation;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getConsumerVisibility
- */
- public B consumerVisibility(ConsumerVisibility consumerVisibility) {
- this.consumerVisibility = consumerVisibility;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getLimit
- */
- public B limit(BigInteger limit) {
- this.limit = limit;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getMappingBehavior
- */
- public B mappingBehavior(MappingBehavior mappingBehavior) {
- this.mappingBehavior = mappingBehavior;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getOtherResourceType
- */
- public B otherResourceType(String otherResourceType) {
- this.otherResourceType = otherResourceType;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getParent
- */
- public B parent(String parent) {
- this.parent = parent;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getPoolID
- */
- public B poolID(String poolID) {
- this.poolID = poolID;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getReservation
- */
- public B reservation(BigInteger reservation) {
- this.reservation = reservation;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getResourceSubType
- */
- public B resourceSubType(String resourceSubType) {
- this.resourceSubType = resourceSubType;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getResourceType
- */
- public B resourceType(ResourceType resourceType) {
- this.resourceType = resourceType;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getVirtualQuantity
- */
- public B virtualQuantity(BigInteger virtualQuantity) {
- this.virtualQuantity = virtualQuantity;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getVirtualQuantityUnits
- */
- public B virtualQuantityUnits(String virtualQuantityUnits) {
- this.virtualQuantityUnits = virtualQuantityUnits;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getWeight
- */
- public B weight(Long weight) {
- this.weight = weight;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getConnections()
- */
- public B connection(CimString connection) {
- this.connections.add(checkNotNull(connection, "connection"));
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getConnections
- */
- public B connections(Iterable<CimString> connections) {
- this.connections = Sets.newLinkedHashSet(checkNotNull(connections, "connections"));
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getHostResources()
- */
- public B hostResource(CimString hostResource) {
- this.hostResources.add(checkNotNull(hostResource, "hostResource"));
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getHostResources
- */
- public B hostResources(Iterable<CimString> hostResources) {
- this.hostResources = Sets.newLinkedHashSet(checkNotNull(hostResources, "hostResources"));
- return self();
- }
-
- public ResourceAllocationSettingData build() {
- return new ResourceAllocationSettingData(this);
- }
-
- public B fromResourceAllocationSettingData(ResourceAllocationSettingData in) {
- return elementName(in.getElementName())
- .instanceID(in.getInstanceID())
- .caption(in.getCaption())
- .description(in.getDescription())
- .address(in.getAddress())
- .addressOnParent(in.getAddressOnParent())
- .allocationUnits(in.getAllocationUnits())
- .automaticAllocation(in.isAutomaticAllocation())
- .automaticDeallocation(in.isAutomaticDeallocation())
- .consumerVisibility(in.getConsumerVisibility())
- .limit(in.getLimit())
- .mappingBehavior(in.getMappingBehavior())
- .otherResourceType(in.getOtherResourceType())
- .parent(in.getParent())
- .poolID(in.getPoolID())
- .reservation(in.getReservation())
- .resourceSubType(in.getResourceSubType())
- .resourceType(in.getResourceType())
- .virtualQuantity(in.getVirtualQuantity())
- .virtualQuantityUnits(in.getVirtualQuantityUnits())
- .weight(in.getWeight())
- .connections(in.getConnections())
- .hostResources(in.getHostResources());
- }
- }
-
- /**
- * The type of resource this allocation setting represents.
- */
- @XmlType
- @XmlEnum(Integer.class)
- public static enum ResourceType {
- @XmlEnumValue("1") OTHER(1),
- @XmlEnumValue("2") COMPUTER_SYSTEM(2),
- @XmlEnumValue("3") PROCESSOR(3),
- @XmlEnumValue("4") MEMORY(4),
- @XmlEnumValue("5") IDE_CONTROLLER(5),
- @XmlEnumValue("6") PARALLEL_SCSI_HBA(6),
- @XmlEnumValue("7") FC_HBA(7),
- @XmlEnumValue("8") ISCSI_HBA(8),
- @XmlEnumValue("9") IB_HCA(9),
- @XmlEnumValue("10") ETHERNET_ADAPTER(10),
- @XmlEnumValue("11") OTHER_NETWORK_ADAPTER(11),
- @XmlEnumValue("12") IO_SLOT(12),
- @XmlEnumValue("13") IO_DEVICE(13),
- @XmlEnumValue("14") FLOPPY_DRIVE(14),
- @XmlEnumValue("15") CD_DRIVE(15),
- @XmlEnumValue("16") DVD_DRIVE(16),
- @XmlEnumValue("17") DISK_DRIVE(17),
- @XmlEnumValue("18") TAPE_DRIVE(18),
- @XmlEnumValue("19") STORAGE_EXTENT(19),
- @XmlEnumValue("20") OTHER_STORAGE_DEVICE(20),
- @XmlEnumValue("21") SERIAL_PORT(21),
- @XmlEnumValue("22") PARALLEL_PORT(22),
- @XmlEnumValue("23") USB_CONTROLLER(23),
- @XmlEnumValue("24") GRAPHICS_CONTROLLER(24),
- @XmlEnumValue("25") IEEE_1394_CONTROLLER(25),
- @XmlEnumValue("26") PARTITIONABLE_UNIT(26),
- @XmlEnumValue("27") BASE_PARTITIONABLE_UNIT(27),
- @XmlEnumValue("28") POWER(28),
- @XmlEnumValue("29") COOLING_CAPACITY(29),
- @XmlEnumValue("30") ETHERNET_SWITCH_PORT(30),
- @XmlEnumValue("31") LOGICAL_DISK(31),
- @XmlEnumValue("32") STORAGE_VOLUME(32),
- @XmlEnumValue("33") ETHERNET_CONNECTION(33),
- @XmlEnumValue("32768") DMTF_RESERVED(Integer.valueOf("8000", 16)),
- @XmlEnumValue("65535") VENDOR_RESERVED(Integer.valueOf("FFFF", 16));
-
- protected final int code;
-
- ResourceType(int code) {
- this.code = code;
- }
-
- public String value() {
- return Integer.toString(code);
- }
-
- protected static final Map<Integer, ResourceType> RESOURCE_TYPE_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(ResourceType.values()), new Function<ResourceType, Integer>() {
- @Override
- public Integer apply(ResourceType input) {
- return input.code;
- }
- });
-
- public static ResourceType fromValue(String type) {
- return RESOURCE_TYPE_BY_ID.get(Integer.valueOf(checkNotNull(type, "type")));
- }
- }
-
- /**
- * Describes the consumers visibility to the allocated resource.
- */
- @XmlType
- @XmlEnum(Integer.class)
- public static enum ConsumerVisibility {
- @XmlEnumValue("0") UNKNOWN(0),
-
- /**
- * indicates the underlying or host resource is utilized and passed
- * through to the consumer, possibly using partitioning. At least one item
- * shall be present in the HostResource property.
- */
- @XmlEnumValue("2") PASSED_THROUGH(2),
-
- /**
- * indicates the resource is virtualized and may not map directly to an
- * underlying/host resource. Some implementations may support specific
- * assignment for virtualized resources, in which case the host
- * resource(s) are exposed using the HostResource property.
- */
- @XmlEnumValue("3") VIRTUALIZED(3),
-
- /**
- * indicates a representation of the resource does not exist within the
- * context of the resource consumer.
- */
- @XmlEnumValue("4") NOT_REPRESENTED(4),
- @XmlEnumValue("32768") DMTF_RESERVED(Integer.valueOf("8000", 16)),
- @XmlEnumValue("65535") VENDOR_RESERVED(Integer.valueOf("FFFF", 16));
-
- protected final int code;
-
- ConsumerVisibility(int code) {
- this.code = code;
- }
-
- public String value() {
- return Integer.toString(code);
- }
-
- protected static final Map<Integer, ConsumerVisibility> MAPPING_BEHAVIOR_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(ConsumerVisibility.values()), new Function<ConsumerVisibility, Integer>() {
- @Override
- public Integer apply(ConsumerVisibility input) {
- return input.code;
- }
- });
-
- public static ConsumerVisibility fromValue(String behavior) {
- return MAPPING_BEHAVIOR_BY_ID.get(Integer.valueOf(checkNotNull(behavior, "behavior")));
- }
- }
-
- /**
- * Specifies how this resource maps to underlying resourcesIf the
- * HostResource array contains any entries, this property reflects how the
- * resource maps to those specific resources.
- */
- @XmlType
- @XmlEnum(Integer.class)
- public static enum MappingBehavior {
- @XmlEnumValue("0") UNKNOWN(0),
- @XmlEnumValue("2") NOT_SUPPORTED(2),
- @XmlEnumValue("3") DEDICATED(3),
- @XmlEnumValue("4") SOFT_AFFINITY(4),
- @XmlEnumValue("5") HARD_AFFINITY(5),
- @XmlEnumValue("32768") DMTF_RESERVED(Integer.valueOf("8000", 16)),
- @XmlEnumValue("65535") VENDOR_RESERVED(Integer.valueOf("FFFF", 16));
-
- protected final int code;
-
- MappingBehavior(int code) {
- this.code = code;
- }
-
- public String value() {
- return Integer.toString(code);
- }
-
- protected static final Map<Integer, MappingBehavior> MAPPING_BEHAVIOR_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(MappingBehavior.values()), new Function<MappingBehavior, Integer>() {
- @Override
- public Integer apply(MappingBehavior input) {
- return input.code;
- }
- });
-
- public static MappingBehavior fromValue(String behavior) {
- return MAPPING_BEHAVIOR_BY_ID.get(Integer.valueOf(checkNotNull(behavior, "behavior")));
- }
- }
-
- @XmlElement(name = "ElementName", namespace = CIM_RASD_NS)
- private String elementName;
- @XmlElement(name = "InstanceID", namespace = CIM_RASD_NS)
- private String instanceID;
- @XmlElement(name = "Caption", namespace = CIM_RASD_NS)
- private String caption;
- @XmlElement(name = "Description", namespace = CIM_RASD_NS)
- private String description;
- @XmlElement(name = "Address", namespace = CIM_RASD_NS)
- private String address;
- @XmlElement(name = "AddressOnParent", namespace = CIM_RASD_NS)
- private String addressOnParent;
- @XmlElement(name = "AllocationUnits", namespace = CIM_RASD_NS)
- private String allocationUnits;
- @XmlElement(name = "AutomaticAllocation", namespace = CIM_RASD_NS)
- private Boolean automaticAllocation;
- @XmlElement(name = "AutomaticDeallocation", namespace = CIM_RASD_NS)
- private Boolean automaticDeallocation;
- @XmlElement(name = "ConsumerVisibility", namespace = CIM_RASD_NS)
- private ConsumerVisibility consumerVisibility;
- @XmlElement(name = "Limit", namespace = CIM_RASD_NS)
- private BigInteger limit;
- @XmlElement(name = "MappingBehavior", namespace = CIM_RASD_NS)
- private MappingBehavior mappingBehavior;
- @XmlElement(name = "OtherResourceType", namespace = CIM_RASD_NS)
- private String otherResourceType;
- @XmlElement(name = "Parent", namespace = CIM_RASD_NS)
- private String parent;
- @XmlElement(name = "PoolID", namespace = CIM_RASD_NS)
- private String poolID;
- @XmlElement(name = "Reservation", namespace = CIM_RASD_NS)
- private BigInteger reservation;
- @XmlElement(name = "ResourceSubType", namespace = CIM_RASD_NS)
- private String resourceSubType;
- @XmlElement(name = "ResourceType", namespace = CIM_RASD_NS)
- private ResourceType resourceType;
- @XmlElement(name = "VirtualQuantity", namespace = CIM_RASD_NS)
- private BigInteger virtualQuantity;
- @XmlElement(name = "VirtualQuantityUnits", namespace = CIM_RASD_NS)
- private String virtualQuantityUnits;
- @XmlElement(name = "Weight", namespace = CIM_RASD_NS)
- private Long weight;
- @XmlElement(name = "Connection", namespace = CIM_RASD_NS)
- private Set<CimString> connections = Sets.newLinkedHashSet();
- @XmlElement(name = "HostResource", namespace = CIM_RASD_NS)
- private Set<CimString> hostResources = Sets.newLinkedHashSet();
-
- protected ResourceAllocationSettingData(Builder<?> builder) {
- this.elementName = builder.elementName;
- this.instanceID = builder.instanceID;
- this.caption = builder.caption;
- this.description = builder.description;
- this.address = builder.address;
- this.addressOnParent = builder.addressOnParent;
- this.allocationUnits = builder.allocationUnits;
- this.automaticAllocation = builder.automaticAllocation;
- this.automaticDeallocation = builder.automaticDeallocation;
- this.consumerVisibility = builder.consumerVisibility;
- this.limit = builder.limit;
- this.mappingBehavior = builder.mappingBehavior;
- this.otherResourceType = builder.otherResourceType;
- this.parent = builder.parent;
- this.poolID = builder.poolID;
- this.reservation = builder.reservation;
- this.resourceSubType = builder.resourceSubType;
- this.resourceType = builder.resourceType;
- this.virtualQuantity = builder.virtualQuantity;
- this.virtualQuantityUnits = builder.virtualQuantityUnits;
- this.weight = builder.weight;
- this.connections = builder.connections != null ? ImmutableSet.copyOf(builder.connections) : ImmutableSet.<CimString>of();
- this.hostResources = builder.hostResources != null ? ImmutableSet.copyOf(builder.hostResources) : ImmutableSet.<CimString>of();
- }
-
- protected ResourceAllocationSettingData() {
- // for JAXB
- }
-
- /**
- * The user-friendly name for this instance of SettingData. In addition, the user-friendly name
- * can be used as an index property for a search or query. (Note: The name does not have to be
- * unique within a namespace.)
- */
- public String getElementName() {
- return elementName;
- }
-
- /**
- * Within the scope of the instantiating Namespace, InstanceID opaquely and uniquely identifies
- * an instance of this class.
- */
- public String getInstanceID() {
- return instanceID;
- }
-
- /**
- * The Caption property is a short textual description (one- line string) of the object.
- */
- public String getCaption() {
- return caption;
- }
-
- /**
- * The Description property provides a textual description of the object.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * The address of the resource. For example, the MAC address of a Ethernet
- * port.
- */
- public String getAddress() {
- return address;
- }
-
- /**
- * Describes the address of this resource in the context of the Parent. The
- * Parent/AddressOnParent properties are used to describe the controller
- * relationship as well the ordering of devices on a controller.For example,
- * if the parent is a PCI Controller, this property would specify the PCI
- * slot of this child device.
- */
- public String getAddressOnParent() {
- return addressOnParent;
- }
-
- /**
- * This property specifies the units of allocation used by the Reservation
- * and Limit properties. For example, when ResourceType=Processor,
- * AllocationUnits may be set to hertz*10^6 or percent. When
- * ResourceType=Memory, AllocationUnits may be set to bytes*10^3. It is
- * expected that profiles constrain the units that apply in context of
- * particular resource types. The value of this property shall be a legal
- * value of the Programmatic Units qualifier as defined in Annex C.1 of
- * DSP0004 V2.5 or later.
- */
- public String getAllocationUnits() {
- return allocationUnits;
- }
-
- /**
- * This property specifies if the resource will be automatically allocated.
- * For example when set to true, when the consuming virtual computer system
- * is powered on, this resource would be allocated. A value of false
- * indicates the resource must be explicitly allocated. For example, the
- * setting may represent removable media (cdrom, floppy, etc.) where at power
- * on time, the media is not present. An explicit operation is required to
- * allocate the resource.
- */
- public Boolean isAutomaticAllocation() {
- return automaticAllocation;
- }
-
- /**
- * This property specifies if the resource will be automatically
- * de-allocated. For example, when set to true, when the consuming virtual
- * computer system is powered off, this resource would be de-allocated. When
- * set to false, the resource will remain allocated and must be explicitly
- * de-allocated.
- */
- public Boolean isAutomaticDeallocation() {
- return automaticDeallocation;
- }
-
- /**
- * Describes the consumers visibility to the allocated resource.
- */
- public ConsumerVisibility getConsumerVisibility() {
- return consumerVisibility;
- }
-
- /**
- * This property specifies the upper bound, or maximum amount of resource
- * that will be granted for this allocation. For example, a system which
- * supports memory paging may support setting the Limit of a Memory
- * allocation below that of the VirtualQuantity, thus forcing paging to occur
- * for this allocation. The value of the Limit property is expressed in the
- * unit specified by the value of the AllocationUnits property.
- */
- public BigInteger getLimit() {
- return limit;
- }
-
- /**
- * Specifies how this resource maps to underlying resourcesIf the
- * HostResource array contains any entries, this property reflects how the
- * resource maps to those specific resources.
- */
- public MappingBehavior getMappingBehavior() {
- return mappingBehavior;
- }
-
- /**
- * A string that describes the resource type when a well defined value is not
- * available and ResourceType has the value "Other".
- */
- public String getOtherResourceType() {
- return otherResourceType;
- }
-
- /**
- * The Parent of the resource. For example, a controller for the current
- * allocation
- */
- public String getParent() {
- return parent;
- }
-
- /**
- * This property specifies which ResourcePool the resource is currently
- * allocated from, or which ResourcePool the resource will be allocated from
- * when the allocation occurs.
- */
- public String getPoolID() {
- return poolID;
- }
-
- /**
- * This property specifies the amount of resource guaranteed to be available
- * for this allocation. On system which support over-commitment of resources,
- * this value is typically used for admission control to prevent an an
- * allocation from being accepted thus preventing starvation. The value of
- * the Reservation property is expressed in the unit specified by the value
- * of the AllocationUnits property.
- */
- public BigInteger getReservation() {
- return reservation;
- }
-
- /**
- * A string describing an implementation specific sub-type for this resource.
- */
- public String getResourceSubType() {
- return resourceSubType;
- }
-
- /**
- * The type of resource this allocation setting represents.
- */
- public ResourceType getResourceType() {
- return resourceType;
- }
-
- /**
- * This property specifies the quantity of resources presented to the
- * consumer. For example, when ResourceType=Processor, this property would
- * reflect the number of discrete Processors presented to the virtual
- * computer system. When ResourceType=Memory, this property could reflect the
- * number of MB reported to the virtual computer system. The value of the
- * VirtualQuantity property should be expressed in units as defined by the
- * value of the VirtualQuantityUnits property.
- */
- public BigInteger getVirtualQuantity() {
- return virtualQuantity;
- }
-
- /**
- * This property specifies the units used by the VirtualQuantity property.
- * For example - if ResourceType=Processor, the value of the
- * VirtualQuantityUnits property may be set to "count", indicating that the
- * value of the VirtualQuantity property is expressed as a count. - if
- * ResourceType=Memory, the value of the VirtualQuantityUnits property may be
- * set to "bytes*10^3", indicating that the value of the VirtualQuantity
- * property is expressed in kilobyte. It is expected that profiles constrain
- * the units that apply in context of particular resource types. The value of
- * this property shall be a legal value of the Programmatic Units qualifier
- * as defined in Annex C.1 of DSP0004 V2.5 or later.
- */
- public String getVirtualQuantityUnits() {
- return virtualQuantityUnits;
- }
-
- /**
- * This property specifies a relative priority for this allocation in
- * relation to other allocations from the same ResourcePool. This property
- * has no unit of measure, and is only relevant when compared to other
- * allocations vying for the same host resources.
- */
- public Long getWeight() {
- return weight;
- }
-
- /**
- * The thing to which this resource is connected. For example, a named
- * network or switch port.
- */
- public Set<CimString> getConnections() {
- return ImmutableSet.copyOf(connections);
- }
-
- /**
- * This property exposes specific assignment of resources. Each non-null
- * value of the HostResource property shall be formatted as a URI per RFC3986.
- * If this resource is modeled then a value should be a WBEM URI (DSP0207).
- * If the resource is not modeled then see the appropriate profile. Profiles
- * may further constrain the type of URI. A NULL value or empty array
- * requests the implementation decide the kind of host resource. If the
- * virtual resource is mapped to more than one underlying resource, this
- * property may be left NULL. If NULL, the DeviceAllocatedFromPool or
- * ResourceAllocationFromPool associations may be used to determine the pool
- * of host resources this virtual resource may use. If specific assignment is
- * utilized, all underlying resources used by this virtual resource should be
- * listed.The kind of dependency is specified by the ConsumerVisibility and
- * the MappingBehavior properties. Typically the array contains one item,
- * however multiple host resources may be specified. A client may set the
- * value(s) to indicate that the requested virtual resource allocation be
- * based on host resources that are identified by element values.
- */
- public Set<CimString> getHostResources() {
- return ImmutableSet.copyOf(hostResources);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("elementName", elementName)
- .add("instanceID", instanceID)
- .add("caption", caption)
- .add("description", description)
- .add("address", address)
- .add("addressOnParent", addressOnParent)
- .add("allocationUnits", allocationUnits)
- .add("automaticAllocation", automaticAllocation)
- .add("automaticDeallocation", automaticDeallocation)
- .add("connections", connections)
- .add("consumerVisibility", consumerVisibility)
- .add("hostResources", hostResources)
- .add("limit", limit)
- .add("mappingBehavior", mappingBehavior)
- .add("otherResourceType", otherResourceType)
- .add("parent", parent)
- .add("poolID", poolID)
- .add("reservation", reservation)
- .add("resourceSubType", resourceSubType)
- .add("resourceType", resourceType)
- .add("virtualQuantity", virtualQuantity)
- .add("virtualQuantityUnits", virtualQuantityUnits)
- .add("weight", weight);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(elementName, instanceID, caption, description,
- address, addressOnParent, allocationUnits,
- automaticAllocation, automaticDeallocation, connections,
- consumerVisibility, hostResources, limit, mappingBehavior,
- otherResourceType, parent, poolID, reservation, resourceSubType,
- resourceType, virtualQuantity, virtualQuantityUnits, weight);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ResourceAllocationSettingData that = ResourceAllocationSettingData.class.cast(obj);
- return equal(this.elementName, that.elementName) &&
- equal(this.instanceID, that.instanceID) &&
- equal(this.caption, that.caption) &&
- equal(this.description, that.description) &&
- equal(this.address, that.address) &&
- equal(this.addressOnParent, that.addressOnParent) &&
- equal(this.allocationUnits, that.allocationUnits) &&
- equal(this.automaticAllocation, that.automaticAllocation) &&
- equal(this.automaticDeallocation, that.automaticDeallocation) &&
- equal(this.connections, that.connections) &&
- equal(this.consumerVisibility, that.consumerVisibility) &&
- equal(this.hostResources, that.hostResources) &&
- equal(this.limit, that.limit) &&
- equal(this.mappingBehavior, that.mappingBehavior) &&
- equal(this.otherResourceType, that.otherResourceType) &&
- equal(this.parent, that.parent) &&
- equal(this.poolID, that.poolID) &&
- equal(this.reservation, that.reservation) &&
- equal(this.resourceSubType, that.resourceSubType) &&
- equal(this.resourceType, that.resourceType) &&
- equal(this.virtualQuantity, that.virtualQuantity) &&
- equal(this.virtualQuantityUnits, that.virtualQuantityUnits) &&
- equal(this.weight, that.weight);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java
deleted file mode 100644
index c246a0f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java
+++ /dev/null
@@ -1,28 +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.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class VirtualSystemCaption extends CimString {
-
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java
deleted file mode 100644
index dffd2f2..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java
+++ /dev/null
@@ -1,28 +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.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class VirtualSystemChangeableType extends CimUnsignedShort {
-
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
deleted file mode 100644
index 7039b92..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
+++ /dev/null
@@ -1,719 +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.dmtf.cim;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.CIM_VSSD_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * VirtualSystemSettingData defines the virtual aspects of a virtual system through a set of
- * virtualization specific properties.
- *
- * VirtualSystemSettingData is also used as the top level class of virtual system configurations.
- * Virtual system configurations model configuration information about virtual systems and their
- * components. A virtual system configuration consists of one top-level instance of class
- * VirtualSystemSettingData that aggregates a number of instances of class
- * {@link ResourceAllocationSettingData}, using association {@link ConcreteComponent).
- * <p>
- * Virtual system configurations may for example be used to reflect configurations of:
- * <ul>
- * <li>virtual systems that are defined at a virtualization platform
- * <li>virtual systems that are currently active
- * <li>input requests to create new virtual systems
- * <li>input requests to modify existing virtual systems
- * <li>snapshots of virtual systems
- * </ul>
- *
- * @see <a href="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_VirtualSystemSettingData.xsd">CIM_VirtualSystemSettingData</a>
- */
-@XmlType(name = "CIM_VirtualSystemSettingData_Type", namespace = OVF_NS,
- propOrder = {
- "automaticRecoveryAction",
- "automaticShutdownAction",
- "automaticStartupAction",
- "automaticStartupActionDelay",
- "automaticStartupActionSequenceNumber",
- "caption",
- "configurationDataRoot",
- "configurationFile",
- "configurationID",
- "creationTime",
- "description",
- "elementName",
- "instanceID",
- "logDataRoot",
- "notes",
- "recoveryFile",
- "snapshotDataRoot",
- "suspendDataRoot",
- "swapFileDataRoot",
- "virtualSystemIdentifier",
- "virtualSystemType"
- }
-)
-public class VirtualSystemSettingData {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromVirtualSystemSettingData(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> {
-
- private String elementName;
- private String instanceID;
- private String caption;
- private String description;
- private AutomaticRecoveryAction automaticRecoveryAction;
- private AutomaticShutdownAction automaticShutdownAction;
- private AutomaticStartupAction automaticStartupAction;
- private BigInteger automaticStartupActionDelay;
- private Long automaticStartupActionSequenceNumber;
- private String configurationDataRoot;
- private String configurationFile;
- private String configurationID;
- private Date creationTime;
- private String logDataRoot;
- private String recoveryFile;
- private String snapshotDataRoot;
- private String suspendDataRoot;
- private String swapFileDataRoot;
- private String virtualSystemIdentifier;
- private String virtualSystemType;
- private String notes;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- public B elementName(String elementName) {
- this.elementName = elementName;
- return self();
- }
-
- public B instanceID(String instanceID) {
- this.instanceID = instanceID;
- return self();
- }
-
- public B caption(String caption) {
- this.caption = caption;
- return self();
- }
-
- public B description(String description) {
- this.description = description;
- return self();
- }
-
- public B automaticRecoveryAction(AutomaticRecoveryAction automaticRecoveryAction) {
- this.automaticRecoveryAction = automaticRecoveryAction;
- return self();
- }
-
- public B automaticShutdownAction(AutomaticShutdownAction automaticShutdownAction) {
- this.automaticShutdownAction = automaticShutdownAction;
- return self();
- }
-
- public B automaticStartupAction(AutomaticStartupAction automaticStartupAction) {
- this.automaticStartupAction = automaticStartupAction;
- return self();
- }
-
- public B automaticStartupActionDelay(BigInteger automaticStartupActionDelay) {
- this.automaticStartupActionDelay = automaticStartupActionDelay;
- return self();
- }
-
- public B automaticStartupActionSequenceNumber(Long automaticStartupActionSequenceNumber) {
- this.automaticStartupActionSequenceNumber = automaticStartupActionSequenceNumber;
- return self();
- }
-
- public B configurationDataRoot(String configurationDataRoot) {
- this.configurationDataRoot = configurationDataRoot;
- return self();
- }
-
- public B configurationFile(String configurationFile) {
- this.configurationFile = configurationFile;
- return self();
- }
-
- public B configurationID(String configurationID) {
- this.configurationID = configurationID;
- return self();
- }
-
- public B creationTime(Date creationTime) {
- this.creationTime = creationTime;
- return self();
- }
-
- public B logDataRoot(String logDataRoot) {
- this.logDataRoot = logDataRoot;
- return self();
- }
-
- public B recoveryFile(String recoveryFile) {
- this.recoveryFile = recoveryFile;
- return self();
- }
-
- public B snapshotDataRoot(String snapshotDataRoot) {
- this.snapshotDataRoot = snapshotDataRoot;
- return self();
- }
-
- public B suspendDataRoot(String suspendDataRoot) {
- this.suspendDataRoot = suspendDataRoot;
- return self();
- }
-
- public B swapFileDataRoot(String swapFileDataRoot) {
- this.swapFileDataRoot = swapFileDataRoot;
- return self();
- }
-
- public B virtualSystemIdentifier(String virtualSystemIdentifier) {
- this.virtualSystemIdentifier = virtualSystemIdentifier;
- return self();
- }
-
- public B virtualSystemType(String virtualSystemType) {
- this.virtualSystemType = virtualSystemType;
- return self();
- }
-
- public B notes(String notes) {
- this.notes = notes;
- return self();
- }
-
- public VirtualSystemSettingData build() {
- return new VirtualSystemSettingData(this);
- }
-
- public B fromVirtualSystemSettingData(VirtualSystemSettingData in) {
- return elementName(in.getElementName())
- .instanceID(in.getInstanceID())
- .caption(in.getCaption())
- .description(in.getDescription())
- .automaticRecoveryAction(in.getAutomaticRecoveryAction())
- .automaticShutdownAction(in.getAutomaticShutdownAction())
- .automaticStartupAction(in.getAutomaticStartupAction())
- .automaticStartupActionDelay(in.getAutomaticStartupActionDelay())
- .automaticStartupActionSequenceNumber(in.getAutomaticStartupActionSequenceNumber())
- .configurationDataRoot(in.getConfigurationDataRoot())
- .configurationFile(in.getConfigurationFile())
- .configurationID(in.getConfigurationID())
- .creationTime(in.getCreationTime())
- .logDataRoot(in.getLogDataRoot())
- .recoveryFile(in.getRecoveryFile())
- .snapshotDataRoot(in.getSnapshotDataRoot())
- .suspendDataRoot(in.getSuspendDataRoot())
- .swapFileDataRoot(in.getSwapFileDataRoot())
- .virtualSystemIdentifier(in.getVirtualSystemIdentifier())
- .virtualSystemType(in.getVirtualSystemType())
- .notes(in.getNotes());
- }
-
- }
-
- /**
- * Action to take for the virtual system when the software executed by the virtual system fails.
- *
- * Failures in this case means a failure that is detectable by the host platform, such as a
- * non-interruptible wait state condition.
- */
- @XmlType
- @XmlEnum(Integer.class)
- public static enum AutomaticRecoveryAction {
-
- @XmlEnumValue("2") NONE(2),
- @XmlEnumValue("3") RESTART(3),
- @XmlEnumValue("4") REVERT_TO_SNAPSHOT(4);
-
- protected final int code;
-
- AutomaticRecoveryAction(int code) {
- this.code = code;
- }
-
- public String value() {
- return Integer.toString(code);
- }
-
- protected static final Map<Integer, AutomaticRecoveryAction> AUTOMATIC_RECOVERY_ACTION_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(AutomaticRecoveryAction.values()), new Function<AutomaticRecoveryAction, Integer>() {
- @Override
- public Integer apply(AutomaticRecoveryAction input) {
- return input.code;
- }
- });
-
- public static AutomaticRecoveryAction fromValue(String automaticRecoveryAction) {
- return AUTOMATIC_RECOVERY_ACTION_BY_ID.get(Integer.valueOf(checkNotNull(automaticRecoveryAction, "automaticRecoveryAction")));
- }
- }
-
- /**
- * Action to take for the virtual system when the host is shut down.
- */
- @XmlType
- @XmlEnum(Integer.class)
- public static enum AutomaticShutdownAction {
-
- @XmlEnumValue("2") TURN_OFF(2),
- @XmlEnumValue("3") SAVE_STATE(3),
- @XmlEnumValue("4") SHUTDOWN(4);
-
- protected final int code;
-
- AutomaticShutdownAction(int code) {
- this.code = code;
- }
-
- public String value() {
- return Integer.toString(code);
- }
-
- protected static final Map<Integer, AutomaticShutdownAction> AUTOMATIC_SHUTDOWN_ACTION_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(AutomaticShutdownAction.values()), new Function<AutomaticShutdownAction, Integer>() {
- @Override
- public Integer apply(AutomaticShutdownAction input) {
- return input.code;
- }
- });
-
- public static AutomaticShutdownAction fromValue(String automaticShutdownAction) {
- return AUTOMATIC_SHUTDOWN_ACTION_BY_ID.get(Integer.valueOf(checkNotNull(automaticShutdownAction, "automaticShutdownAction")));
- }
- }
-
- /**
- * Action to take for the virtual system when the host is started.
- */
- @XmlType
- @XmlEnum(Integer.class)
- public static enum AutomaticStartupAction {
-
- @XmlEnumValue("2") NONE(2),
- @XmlEnumValue("3") RESTART_IF_PREVIOUSLY_ACTIVE(3),
- @XmlEnumValue("4") ALWAYS_STARTUP(4);
-
- protected final int code;
-
- AutomaticStartupAction(int code) {
- this.code = code;
- }
-
- public String value() {
- return Integer.toString(code);
- }
-
- protected static final Map<Integer, AutomaticStartupAction> AUTOMATIC_STARTUP_ACTION_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(AutomaticStartupAction.values()), new Function<AutomaticStartupAction, Integer>() {
- @Override
- public Integer apply(AutomaticStartupAction input) {
- return input.code;
- }
- });
-
- public static AutomaticStartupAction fromValue(String automaticStartupAction) {
- return AUTOMATIC_STARTUP_ACTION_BY_ID.get(Integer.valueOf(checkNotNull(automaticStartupAction, "automaticStartupAction")));
- }
- }
-
- @XmlElement(name = "ElementName", namespace = CIM_VSSD_NS)
- private String elementName;
- @XmlElement(name = "InstanceID", namespace = CIM_VSSD_NS)
- private String instanceID;
- @XmlElement(name = "Caption", namespace = CIM_VSSD_NS)
- private String caption;
- @XmlElement(name = "Description", namespace = CIM_VSSD_NS)
- private String description;
- @XmlElement(name = "VirtualSystemIdentifier", namespace = CIM_VSSD_NS)
- private String virtualSystemIdentifier;
- @XmlElement(name = "VirtualSystemType", namespace = CIM_VSSD_NS)
- private String virtualSystemType;
- @XmlElement(name = "AutomaticRecoveryAction", namespace = CIM_VSSD_NS)
- private AutomaticRecoveryAction automaticRecoveryAction;
- @XmlElement(name = "AutomaticShutdownAction", namespace = CIM_VSSD_NS)
- private AutomaticShutdownAction automaticShutdownAction;
- @XmlElement(name = "AutomaticStartupAction", namespace = CIM_VSSD_NS)
- private AutomaticStartupAction automaticStartupAction;
- @XmlElement(name = "AutomaticStartupActionDelay", namespace = CIM_VSSD_NS)
- private BigInteger automaticStartupActionDelay;
- @XmlElement(name = "AutomaticStartupActionSequenceNumber", namespace = CIM_VSSD_NS)
- private Long automaticStartupActionSequenceNumber;
- @XmlElement(name = "ConfigurationDataRoot", namespace = CIM_VSSD_NS)
- private String configurationDataRoot;
- @XmlElement(name = "ConfigurationFile", namespace = CIM_VSSD_NS)
- private String configurationFile;
- @XmlElement(name = "ConfigurationID", namespace = CIM_VSSD_NS)
- private String configurationID;
- @XmlElement(name = "CreationTime", namespace = CIM_VSSD_NS)
- private Date creationTime;
- @XmlElement(name = "LogDataRoot", namespace = CIM_VSSD_NS)
- private String logDataRoot;
- @XmlElement(name = "RecoveryFile", namespace = CIM_VSSD_NS)
- private String recoveryFile;
- @XmlElement(name = "SnapshotDataRoot", namespace = CIM_VSSD_NS)
- private String snapshotDataRoot;
- @XmlElement(name = "SuspendDataRoot", namespace = CIM_VSSD_NS)
- private String suspendDataRoot;
- @XmlElement(name = "SwapFileDataRoot", namespace = CIM_VSSD_NS)
- private String swapFileDataRoot;
- @XmlElement(name = "Notes", namespace = CIM_VSSD_NS)
- private String notes;
-
- private VirtualSystemSettingData(Builder<?> builder) {
- this.elementName = builder.elementName;
- this.instanceID = builder.instanceID;
- this.caption = builder.caption;
- this.description = builder.description;
- this.automaticRecoveryAction = builder.automaticRecoveryAction;
- this.automaticShutdownAction = builder.automaticShutdownAction;
- this.automaticStartupAction = builder.automaticStartupAction;
- this.automaticStartupActionDelay = builder.automaticStartupActionDelay;
- this.automaticStartupActionSequenceNumber = builder.automaticStartupActionSequenceNumber;
- this.configurationDataRoot = builder.configurationDataRoot;
- this.configurationFile = builder.configurationFile;
- this.configurationID = builder.configurationID;
- this.creationTime = builder.creationTime;
- this.logDataRoot = builder.logDataRoot;
- this.recoveryFile = builder.recoveryFile;
- this.snapshotDataRoot = builder.snapshotDataRoot;
- this.suspendDataRoot = builder.suspendDataRoot;
- this.swapFileDataRoot = builder.swapFileDataRoot;
- this.virtualSystemIdentifier = builder.virtualSystemIdentifier;
- this.virtualSystemType = builder.virtualSystemType;
- this.notes = builder.notes;
- }
-
- private VirtualSystemSettingData(String elementName, String instanceID, String caption, String description,
- AutomaticRecoveryAction automaticRecoveryAction, AutomaticShutdownAction automaticShutdownAction,
- AutomaticStartupAction automaticStartupAction, BigInteger automaticStartupActionDelay,
- Long automaticStartupActionSequenceNumber, String configurationDataRoot, String configurationFile,
- String configurationID, Date creationTime, String logDataRoot, String recoveryFile, String snapshotDataRoot,
- String suspendDataRoot, String swapFileDataRoot, String virtualSystemIdentifier,
- String virtualSystemType, String notes) {
- this.elementName = elementName;
- this.instanceID = instanceID;
- this.caption = caption;
- this.description = description;
- this.automaticRecoveryAction = automaticRecoveryAction;
- this.automaticShutdownAction = automaticShutdownAction;
- this.automaticStartupAction = automaticStartupAction;
- this.automaticStartupActionDelay = automaticStartupActionDelay;
- this.automaticStartupActionSequenceNumber = automaticStartupActionSequenceNumber;
- this.configurationDataRoot = configurationDataRoot;
- this.configurationFile = configurationFile;
- this.configurationID = configurationID;
- this.creationTime = creationTime;
- this.logDataRoot = logDataRoot;
- this.recoveryFile = recoveryFile;
- this.snapshotDataRoot = snapshotDataRoot;
- this.suspendDataRoot = suspendDataRoot;
- this.swapFileDataRoot = swapFileDataRoot;
- this.virtualSystemIdentifier = virtualSystemIdentifier;
- this.virtualSystemType = virtualSystemType;
- this.notes = notes;
- }
-
- private VirtualSystemSettingData() {
- // for JAXB
- }
-
- /**
- * The user-friendly name for this instance of SettingData. In addition, the user-friendly name
- * can be used as an index property for a search or query. (Note: The name does not have to be
- * unique within a namespace.)
- */
- public String getElementName() {
- return elementName;
- }
-
- /**
- * Within the scope of the instantiating Namespace, InstanceID opaquely and uniquely identifies
- * an instance of this class.
- */
- public String getInstanceID() {
- return instanceID;
- }
-
- /**
- * The Caption property is a short textual description (one- line string) of the object.
- */
- public String getCaption() {
- return caption;
- }
-
- /**
- * The Description property provides a textual description of the object.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Action to take for the virtual system when the software executed by the virtual system fails.
- * Failures in this case means a failure that is detectable by the host platform, such as a
- * non-interruptible wait state condition.
- */
- public AutomaticRecoveryAction getAutomaticRecoveryAction() {
- return automaticRecoveryAction;
- }
-
- /**
- * Action to take for the virtual system when the host is shut down.
- */
- public AutomaticShutdownAction getAutomaticShutdownAction() {
- return automaticShutdownAction;
- }
-
- /**
- * Action to take for the virtual system when the host is started.
- */
- public AutomaticStartupAction getAutomaticStartupAction() {
- return automaticStartupAction;
- }
-
- /**
- * Delay applicable to startup action. The value shall be in the interval variant of the datetime
- * datatype.
- */
- public BigInteger getAutomaticStartupActionDelay() {
- return automaticStartupActionDelay;
- }
-
- /**
- * Number indicating the relative sequence of virtual system activation when the host system is
- * started. A lower number indicates earlier activation. If one or more configurations show the
- * same value, the sequence is implementation dependent. A value of 0 indicates that the sequence
- * is implementation dependent.
- */
- public Long getAutomaticStartupActionSequenceNumber() {
- return automaticStartupActionSequenceNumber;
- }
-
- /**
- * Filepath of a directory where information about the virtual system configuration is
- * stored.
- *
- * Format shall be String based on RFC-2079.
- */
- public String getConfigurationDataRoot() {
- return configurationDataRoot;
- }
-
- /**
- * Filepath of a file where information about the virtual system configuration is stored.
- *
- * A relative path appends to the value of the {@link #getConfigurationDataRoot()} property.
- * <p>
- * Format shall be String based on RFC-2079.
- */
- public String getConfigurationFile() {
- return configurationFile;
- }
-
- /**
- * Unique id of the virtual system configuration. Note that the ConfigurationID is different from
- * the InstanceID as it is assigned by the implementation to a virtual system or a virtual system
- * configuration. It is not a key, and the same value may occur within more than one instance.
- */
- public String getConfigurationID() {
- return configurationID;
- }
-
- /**
- * Time when the virtual system configuration was created.
- */
- public Date getCreationTime() {
- return creationTime;
- }
-
- /**
- * Filepath of a directory where log information about the virtual system is stored.
- *
- * A relative path appends to the value of the {@link #getConfigurationDataRoot()} property.
- * <p>
- * Format shall be String based on RFC-2079.
- */
- public String getLogDataRoot() {
- return logDataRoot;
- }
-
- /**
- * Filepath of a file where recovery related information of the virtual system is stored.
- *
- * Format shall be String based on RFC-2079.
- */
- public String getRecoveryFile() {
- return recoveryFile;
- }
-
- /**
- * Filepath of a directory where information about virtual system snapshots is stored.
- *
- * A relative path appends to the value of the {@link #getConfigurationDataRoot()} property.
- * <p>
- * Format shall be String based on RFC-2079.
- */
- public String getSnapshotDataRoot() {
- return snapshotDataRoot;
- }
-
- /**
- * Filepath of a directory where suspend related information about the virtual system is stored.
- *
- * A relative path appends to the value of the {@link #getConfigurationDataRoot()} property.
- * <p>
- * Format shall be String based on RFC-2079.
- */
- public String getSuspendDataRoot() {
- return suspendDataRoot;
- }
-
- /**
- * Filepath of a directory where swapfiles of the virtual system are stored.
- *
- * A relative path appends to the value of the {@link #getConfigurationDataRoot()} property.
- * <p>
- * Format shall be String based on RFC-2079.
- */
- public String getSwapFileDataRoot() {
- return swapFileDataRoot;
- }
-
- /**
- * VirtualSystemIdentifier shall reflect a unique name for the system as it is used within the
- * virtualization platform.
- *
- * Note that the VirtualSystemIdentifier is not the hostname assigned to
- * the operating system instance running within the virtual system, nor is it an IP address or
- * MAC address assigned to any of its network ports. On create requests VirtualSystemIdentifier
- * may contain implementation specific rules (like simple patterns or regular expression) that
- * may be interpreted by the implementation when assigning a VirtualSystemIdentifier.
- */
- public String getVirtualSystemIdentifier() {
- return virtualSystemIdentifier;
- }
-
- /**
- * VirtualSystemType shall reflect a particular type of virtual system.
- */
- public String getVirtualSystemType() {
- return virtualSystemType;
- }
-
- /**
- * End-user supplied notes that are related to the virtual system.
- */
- public String getNotes() {
- return notes;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(elementName, instanceID, caption, description, virtualSystemIdentifier, virtualSystemType);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- VirtualSystemSettingData that = VirtualSystemSettingData.class.cast(obj);
- return equal(this.elementName, that.elementName)
- && equal(this.instanceID, that.instanceID)
- && equal(this.caption, that.caption)
- && equal(this.description, that.description)
- && equal(this.automaticRecoveryAction, that.automaticRecoveryAction)
- && equal(this.automaticShutdownAction, that.automaticShutdownAction)
- && equal(this.automaticStartupAction, that.automaticStartupAction)
- && equal(this.automaticStartupActionDelay, that.automaticStartupActionDelay)
- && equal(this.automaticStartupActionSequenceNumber, that.automaticStartupActionSequenceNumber)
- && equal(this.configurationDataRoot, that.configurationDataRoot)
- && equal(this.configurationFile, that.configurationFile)
- && equal(this.configurationID, that.configurationID)
- && equal(this.creationTime, that.creationTime)
- && equal(this.logDataRoot, that.logDataRoot)
- && equal(this.recoveryFile, that.recoveryFile)
- && equal(this.snapshotDataRoot, that.snapshotDataRoot)
- && equal(this.suspendDataRoot, that.suspendDataRoot)
- && equal(this.swapFileDataRoot, that.swapFileDataRoot)
- && equal(this.virtualSystemIdentifier, that.virtualSystemIdentifier)
- && equal(this.virtualSystemType, that.virtualSystemType);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("elementName", elementName)
- .add("instanceID", instanceID)
- .add("caption", caption)
- .add("description", description)
- .add("automaticRecoveryAction", automaticRecoveryAction)
- .add("automaticShutdownAction", automaticShutdownAction)
- .add("automaticStartupAction", automaticStartupAction)
- .add("automaticStartupActionDelay", automaticStartupActionDelay)
- .add("automaticStartupActionSequenceNumber", automaticStartupActionSequenceNumber)
- .add("configurationDataRoot", configurationDataRoot)
- .add("configurationFile", configurationFile)
- .add("configurationID", configurationID)
- .add("creationTime", creationTime)
- .add("logDataRoot", logDataRoot)
- .add("recoveryFile", recoveryFile)
- .add("snapshotDataRoot", snapshotDataRoot)
- .add("suspendDataRoot", suspendDataRoot)
- .add("swapFileDataRoot", swapFileDataRoot)
- .add("virtualSystemIdentifier", virtualSystemIdentifier)
- .add("virtualSystemType", virtualSystemType)
- .toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/functions/HardwareBuilderFromResourceAllocations.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/functions/HardwareBuilderFromResourceAllocations.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/functions/HardwareBuilderFromResourceAllocations.java
deleted file mode 100644
index cea2526..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/functions/HardwareBuilderFromResourceAllocations.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.dmtf.cim.functions;
-
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.find;
-import static com.google.common.collect.Iterables.transform;
-
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.domain.Processor;
-import org.jclouds.compute.domain.Volume;
-import org.jclouds.compute.domain.internal.VolumeImpl;
-import org.jclouds.dmtf.CIMPredicates;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData.ResourceType;
-
-import com.google.common.base.Function;
-
-@Singleton
-public class HardwareBuilderFromResourceAllocations implements
- Function<Iterable<? extends ResourceAllocationSettingData>, HardwareBuilder> {
- @Override
- public HardwareBuilder apply(Iterable<? extends ResourceAllocationSettingData> from) {
- HardwareBuilder builder = new HardwareBuilder();
- builder.volumes(transform(filter(from, CIMPredicates.resourceTypeIn(ResourceType.DISK_DRIVE,
- ResourceType.BASE_PARTITIONABLE_UNIT, ResourceType.PARTITIONABLE_UNIT)),
- new Function<ResourceAllocationSettingData, Volume>() {
-
- @Override
- public Volume apply(ResourceAllocationSettingData from) {
- return HardwareBuilderFromResourceAllocations.this.apply(from);
- }
-
- }));
-
- builder.ram((int) find(from, CIMPredicates.resourceTypeIn(ResourceType.MEMORY)).getVirtualQuantity().longValue());
-
- builder.processors(transform(filter(from, CIMPredicates.resourceTypeIn(ResourceType.PROCESSOR)),
- new Function<ResourceAllocationSettingData, Processor>() {
-
- @Override
- public Processor apply(ResourceAllocationSettingData arg0) {
- return new Processor(arg0.getVirtualQuantity().longValue(), 1);
- }
- }));
- return builder;
- }
-
- public Volume apply(ResourceAllocationSettingData from) {
- return new VolumeImpl(from.getAddressOnParent() + "", Volume.Type.LOCAL, from.getVirtualQuantity() == null ? null
- : from.getVirtualQuantity().longValue() / (float) (1024 * 1024), null, "0".equals(from.getAddressOnParent())
- || ResourceType.BASE_PARTITIONABLE_UNIT.equals(from.getResourceType()), true);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/package-info.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/package-info.java
deleted file mode 100644
index d531ada..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/package-info.java
+++ /dev/null
@@ -1,39 +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.
- */
-@XmlSchema(namespace = CIM_NS, elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "cim", namespaceURI = CIM_NS),
- @XmlNs(prefix = "ovf", namespaceURI = OVF_NS),
- @XmlNs(prefix = "vssd", namespaceURI = CIM_VSSD_NS),
- @XmlNs(prefix = "rasd", namespaceURI = CIM_RASD_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.dmtf.cim;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-import static org.jclouds.dmtf.DMTFConstants.CIM_RASD_NS;
-import static org.jclouds.dmtf.DMTFConstants.CIM_VSSD_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
deleted file mode 100644
index 3dc2474..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
+++ /dev/null
@@ -1,146 +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.dmtf.ovf;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "Configuration", namespace = OVF_NS, propOrder = {
- "label", "description"
-})
-public class Configuration {
- public static Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
- private String id;
- private boolean isDefault;
- private String label;
- private String description;
-
- /**
- * @see Configuration#getId
- */
- public Builder id(String id) {
- this.id = id;
- return this;
- }
-
- /**
- * @see Configuration#getLabel
- */
- public Builder label(String label) {
- this.label = label;
- return this;
- }
-
- /**
- * @see Configuration#getDescription
- */
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * @see Configuration#isDefault
- */
- public Builder isDefault(boolean isDefault) {
- this.isDefault = isDefault;
- return this;
- }
-
- public Configuration build() {
- return new Configuration(id, isDefault, label, description);
- }
-
- public Builder fromConfiguration(Configuration in) {
- return id(in.getId()).description(in.getDescription()).label(in.getLabel());
- }
- }
-
- @XmlAttribute
- private String id;
- @XmlAttribute(name = "default")
- private boolean isDefault;
- @XmlElement(name = "Label")
- private String label;
- @XmlElement(name = "Description")
- private String description;
-
- public Configuration(String id, boolean isDefault, String label, String description) {
- this.id = id;
- this.label = label;
- this.description = description;
- this.isDefault = isDefault;
- }
-
- public Configuration() {
- // for JAXB
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, label, description);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Configuration other = (Configuration) obj;
- return Objects.equal(id, other.id)
- && Objects.equal(label, other.label)
- && Objects.equal(description, other.description);
- }
-
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
- }
-
- public String getId() {
- return id;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getLabel() {
- return label;
- }
-
- public boolean isDefault() {
- return isDefault;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
deleted file mode 100644
index 198556b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
+++ /dev/null
@@ -1,121 +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.dmtf.ovf;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The DeploymentOptionSection specifies a discrete set of intended resource configurations. The
- * author of an OVF package can include sizing metadata for different configurations. A consumer of
- * the OVF shall select a configuration, for example, by prompting the user. The selected
- * configuration is visible in the OVF environment, enabling guest software to adapt to the selected
- * configuration.
- */
-@XmlRootElement(name = "DeploymentOptionSection")
-@XmlType(name = "DeploymentOptionSection_Type")
-public class DeploymentOptionSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromDeploymentOptionSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
- private Set<Configuration> configurations = Sets.newLinkedHashSet();
-
- /**
- * @see DeploymentOptionSection#getConfigurations
- */
- public B configuration(Configuration configuration) {
- this.configurations.add(checkNotNull(configuration, "configuration"));
- return self();
- }
-
- /**
- * @see DeploymentOptionSection#getConfigurations
- */
- public B configurations(Iterable<Configuration> configurations) {
- this.configurations = ImmutableSet.<Configuration>copyOf(checkNotNull(configurations, "configurations"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DeploymentOptionSection build() {
- return new DeploymentOptionSection(this);
- }
-
- public B fromDeploymentOptionSection(DeploymentOptionSection in) {
- return fromSectionType(in).configurations(in.getConfigurations());
- }
- }
-
- @XmlElement(name = "Configuration")
- protected Set<Configuration> configurations;
-
- private DeploymentOptionSection(Builder<?> builder) {
- super(builder);
- this.configurations = ImmutableSet.copyOf(builder.configurations);
- }
-
- private DeploymentOptionSection() {
- // For JAXB
- }
-
- public Set<Configuration> getConfigurations() {
- return Collections.unmodifiableSet(configurations);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), configurations);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (!super.equals(obj)) return false;
- if (getClass() != obj.getClass()) return false;
-
- DeploymentOptionSection other = (DeploymentOptionSection) obj;
- return super.equals(other) && Objects.equal(configurations, other.configurations);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string().add("configurations", configurations);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Disk.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Disk.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Disk.java
deleted file mode 100644
index 41f96ac..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Disk.java
+++ /dev/null
@@ -1,237 +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.dmtf.ovf;
-
-import java.net.URI;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Disk")
-public class Disk implements Comparable<Disk>{
- public static Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
- private String id;
- private Long capacity;
- private String parentRef;
- private String fileRef;
- private URI format;
- private Long populatedSize;
- private String capacityAllocationUnits;
-
- /**
- * @see Disk#getId
- */
- public Builder id(String id) {
- this.id = id;
- return this;
- }
-
- /**
- * @see Disk#getCapacity
- */
- public Builder capacity(Long capacity) {
- this.capacity = capacity;
- return this;
- }
-
- /**
- * @see Disk#getParentRef
- */
- public Builder parentRef(String parentRef) {
- this.parentRef = parentRef;
- return this;
- }
-
- /**
- * @see Disk#getFileRef
- */
- public Builder fileRef(String fileRef) {
- this.fileRef = fileRef;
- return this;
- }
-
- /**
- * @see Disk#getFormat
- */
- public Builder format(URI format) {
- this.format = format;
- return this;
- }
-
- /**
- * @see Disk#getPopulatedSize
- */
- public Builder populatedSize(Long populatedSize) {
- this.populatedSize = populatedSize;
- return this;
- }
-
- /**
- * @see Disk#getCapacityAllocationUnits
- */
- public Builder capacityAllocationUnits(String capacityAllocationUnits) {
- this.capacityAllocationUnits = capacityAllocationUnits;
- return this;
- }
-
- public Disk build() {
- return new Disk(id, capacity, parentRef, fileRef, format, populatedSize, capacityAllocationUnits);
- }
-
- public Builder fromDisk(Disk in) {
- return id(in.getId()).capacity(in.getCapacity()).parentRef(in.getParentRef()).fileRef(in.getFileRef()).format(
- in.getFormat()).populatedSize(in.getPopulatedSize()).capacityAllocationUnits(
- in.getCapacityAllocationUnits());
- }
- }
-
- private String id;
- private Long capacity;
- private String parentRef;
- private String fileRef;
- private URI format;
- private Long populatedSize;
- private String capacityAllocationUnits;
-
- private Disk(String id, Long capacity, String parentRef, String fileRef, URI format, Long populatedSize,
- String capacityAllocationUnits) {
- this.id = id;
- this.capacity = capacity;
- this.parentRef = parentRef;
- this.fileRef = fileRef;
- this.format = format;
- this.populatedSize = populatedSize;
- this.capacityAllocationUnits = capacityAllocationUnits;
- }
-
- private Disk() {
- // For Jaxb
- }
-
- /**
- * Each virtual disk is represented by a Disk element that shall be given a identifier using the
- * {@code id} attribute, the identifier shall be unique within the {@link DiskSection}.
- */
- public String getId() {
- return id;
- }
-
- /**
- * The capacity of a virtual disk shall be specified by the {@code capacity} attribute with an
- * xs:long integer value. The default unit of allocation shall be bytes.
- */
- public Long getCapacity() {
- return capacity;
- }
-
- /**
- * OVF allows a disk image to be represented as a set of modified blocks in comparison to a
- * parent image. The use of parent disks can often significantly reduce the size of an OVF
- * package, if it contains multiple disks with similar content. For a Disk element, a parent disk
- * may optionally be specified using the {@code parentRef} attribute, which shall contain a valid
- * ovf:id reference to a different Disk element. If a disk block does not exist locally, lookup
- * for that disk block then occurs in the parent disk. In {@link DiskSection}, parent Disk
- * elements shall occur before child Disk elements that refer to them.
- */
- public String getParentRef() {
- return parentRef;
- }
-
- /**
- * The ovf:fileRef attribute denotes the virtual disk content by identifying an existing File
- * element in the References element, the File element is identified by matching its {@code id}
- * attribute value with the {@code fileRef} attribute value. Omitting the {@code fileRef}
- * attribute shall indicate an empty disk. In this case, the disk shall be created and the entire
- * disk content zeroed at installation time. The guest software will typically format empty disks
- * in some file system format.
- */
- public String getFileRef() {
- return fileRef;
- }
-
- /**
- * The format URI of a non-empty virtual disk shall be specified by the {@code format} attribute.
- */
- public URI getFormat() {
- return format;
- }
-
- /**
- * For non-empty disks, the actual used size of the disk may optionally be specified using the
- * {@code populatedSize} attribute. The unit of this attribute is always bytes. {@code
- * populatedSize} is allowed to be an estimate of used disk size but shall not be larger than
- * {@code capacity}.
- */
- public Long getPopulatedSize() {
- return populatedSize;
- }
-
- /**
- * The optional string attribute {@code ovf:capacityAllocationUnits} may be used to specify a
- * particular unit of allocation. Values for {@code ovf:capacityAllocationUnits} shall match the
- * format for programmatic units defined in DSP0004.
- */
- public String getCapacityAllocationUnits() {
- return capacityAllocationUnits;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Disk other = (Disk) obj;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return String
- .format(
- "[id=%s, capacity=%s, capacityAllocationUnits=%s, fileRef=%s, format=%s, parentRef=%s, populatedSize=%s]",
- id, capacity, capacityAllocationUnits, fileRef, format, parentRef, populatedSize);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int compareTo(Disk o) {
- if (id == null)
- return -1;
- return (this == o) ? 0 : id.compareTo(o.id);
- }
-}
[30/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
deleted file mode 100644
index 5d17fc0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
+++ /dev/null
@@ -1,126 +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.dmtf.ovf;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * A DiskSection describes meta-information about virtual disks in the OVF package. Virtual disks
- * and their metadata are described outside the virtual hardware to facilitate sharing between
- * virtual machines within an OVF package.
- */
-@XmlRootElement(name = "DiskSection")
-@XmlType(propOrder = {
- "disks"
-})
-public class DiskSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromDiskSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
- private Set<Disk> disks = Sets.newLinkedHashSet();
-
- /**
- * @see DiskSection#getDisks
- */
- public B disk(Disk disk) {
- this.disks.add(checkNotNull(disk, "disk"));
- return self();
- }
-
- /**
- * @see DiskSection#getDisks
- */
- public B disks(Iterable<Disk> disks) {
- this.disks = ImmutableSet.<Disk>copyOf(checkNotNull(disks, "disks"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DiskSection build() {
- return new DiskSection(this);
- }
-
- public B fromDiskSection(DiskSection in) {
- return disks(in.getDisks()).info(in.getInfo());
- }
- }
-
- @XmlElement(name = "Disk")
- private Set<Disk> disks;
-
- protected DiskSection(Builder<?> builder) {
- super(builder);
- this.disks = ImmutableSet.<Disk>copyOf(checkNotNull(builder.disks, "disks"));
- }
-
- protected DiskSection() {
- // for JAXB
- }
-
- /**
- * All disks referred to from Connection elements in all {@link VirtualHardwareSection} elements
- * shall be defined in the DiskSection.
- *
- * @return
- */
- public Set<Disk> getDisks() {
- return disks;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), disks);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- DiskSection other = (DiskSection) obj;
- return super.equals(other) && Objects.equal(disks, other.disks);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string().add("disks", disks);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
deleted file mode 100644
index 8901a0d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
+++ /dev/null
@@ -1,192 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Maps;
-
-/**
- * Java class for anonymous complex type.
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- * <attribute name="startDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- * <attribute name="waitingForGuest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="stopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- * <attribute name="startAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOn" />
- * <attribute name="stopAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOff" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType
-@XmlSeeAlso({
- StartupSectionItem.class
-})
-public class Item {
-
- // TODO Builder
-
- @XmlAttribute(required = true)
- protected String id;
- @XmlAttribute(required = true)
- @XmlSchemaType(name = "unsignedShort")
- protected int order;
- @XmlAttribute
- @XmlSchemaType(name = "unsignedShort")
- protected Integer startDelay;
- @XmlAttribute
- protected Boolean waitingForGuest;
- @XmlAttribute
- @XmlSchemaType(name = "unsignedShort")
- protected Integer stopDelay;
- @XmlAttribute
- protected String startAction;
- @XmlAttribute
- protected String stopAction;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the id property.
- */
- public String getId() {
- return id;
- }
-
- /**
- * Gets the value of the order property.
- */
- public int getOrder() {
- return order;
- }
-
- /**
- * Gets the value of the startDelay property.
- */
- public int getStartDelay() {
- if (startDelay == null) {
- return 0;
- } else {
- return startDelay;
- }
- }
-
- /**
- * Gets the value of the waitingForGuest property.
- */
- public boolean isWaitingForGuest() {
- if (waitingForGuest == null) {
- return false;
- } else {
- return waitingForGuest;
- }
- }
-
- /**
- * Gets the value of the stopDelay property.
- */
- public int getStopDelay() {
- if (stopDelay == null) {
- return 0;
- } else {
- return stopDelay;
- }
- }
-
- /**
- * Gets the value of the startAction property.
- */
- public String getStartAction() {
- if (startAction == null) {
- return "powerOn";
- } else {
- return startAction;
- }
- }
-
- /**
- * Gets the value of the stopAction property.
- */
- public String getStopAction() {
- if (stopAction == null) {
- return "powerOff";
- } else {
- return stopAction;
- }
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, order, startDelay, waitingForGuest, stopDelay, startAction, stopAction);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Item that = Item.class.cast(obj);
- return equal(this.id, that.id) &&
- equal(this.order, that.order) &&
- equal(this.startDelay, that.startDelay) &&
- equal(this.waitingForGuest, that.waitingForGuest) &&
- equal(this.stopDelay, that.stopDelay) &&
- equal(this.startAction, that.startAction) &&
- equal(this.stopAction, that.stopAction);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("id", id)
- .add("order", order)
- .add("startDelay", startDelay)
- .add("waitingForGuest", waitingForGuest)
- .add("stopDelay", stopDelay)
- .add("startAction", startAction)
- .add("stopAction", stopAction)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
deleted file mode 100644
index ef6b29b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
+++ /dev/null
@@ -1,141 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Type for localizable string.
- *
- * Default string value
- *
- * <pre>
- * <complexType name="Msg_Type" />
- * </pre>
- */
-@XmlType(name = "Msg_Type")
-public class MsgType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromMsgType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> {
-
- protected String value;
- protected String msgid;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see MsgType#getValue()
- */
- public B value(String value) {
- this.value = value;
- return self();
- }
-
- /**
- * @see MsgType#getMsgid()
- */
- public B msgid(String msgid) {
- this.msgid = msgid;
- return self();
- }
-
- public MsgType build() {
- return new MsgType(this);
- }
-
- public B fromMsgType(MsgType in) {
- return value(in.getValue()).msgid(in.getMsgid());
- }
- }
-
- @XmlValue
- protected String value;
- @XmlAttribute
- protected String msgid;
-
- private MsgType() {
- // JAXB
- }
-
- private MsgType(Builder<?> builder) {
- this.value = builder.value;
- this.msgid = builder.msgid;
- }
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Gets the value of the msgid property.
- */
- public String getMsgid() {
- if (msgid == null) {
- return "";
- } else {
- return msgid;
- }
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(value, msgid);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- MsgType that = MsgType.class.cast(obj);
- return equal(this.value, that.value) &&
- equal(this.msgid, that.msgid);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("value", value).add("msgid", msgid).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java
deleted file mode 100644
index 0bf0a9d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Network.java
+++ /dev/null
@@ -1,111 +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.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Network")
-public class Network {
- public static Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
- protected String name;
- protected String description;
-
- /**
- * @see Network#getName
- */
- public Builder name(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * @see Network#getDescription
- */
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- public Network build() {
- return new Network(name, description);
- }
-
- public Builder fromNetwork(Network in) {
- return name(in.getName()).description(in.getDescription());
- }
- }
-
- private String name;
- private String description;
-
- protected Network(String name, String description) {
- this.name = name;
- this.description = description;
- }
-
- protected Network() {
- // for JAXB
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((description == null) ? 0 : description.hashCode());
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Network other = (Network) obj;
- if (description == null) {
- if (other.description != null)
- return false;
- } else if (!description.equals(other.description))
- return false;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "[name=" + name + ", description=" + description + "]";
- }
-
- public String getName() {
- return name;
- }
-
- public String getDescription() {
- return description;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
deleted file mode 100644
index a9df5d0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
+++ /dev/null
@@ -1,123 +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.dmtf.ovf;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The NetworkSection element shall list all logical networks used in the OVF package.
- */
-@XmlRootElement(name = "NetworkSection")
-@XmlType(name = "NetworkSection_Type")
-public class NetworkSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromNetworkSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
- protected Set<Network> networks = Sets.newLinkedHashSet();
-
- /**
- * @see NetworkSection#getNetworks
- */
- public B network(Network network) {
- this.networks.add(checkNotNull(network, "network"));
- return self();
- }
-
- /**
- * @see NetworkSection#getNetworks
- */
- public B networks(Iterable<Network> networks) {
- this.networks = ImmutableSet.<Network> copyOf(checkNotNull(networks, "networks"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public NetworkSection build() {
- return new NetworkSection(this);
- }
-
- public B fromNetworkSection(NetworkSection in) {
- return networks(in.getNetworks()).info(in.getInfo());
- }
- }
-
- private Set<Network> networks;
-
- private NetworkSection(Builder<?> builder) {
- super(builder);
- this.networks = ImmutableSet.copyOf(checkNotNull(networks, "networks"));
- }
-
- private NetworkSection() {
- // for JAXB
- }
-
- /**
- * All networks referred to from Connection elements in all {@link VirtualHardwareSection}
- * elements shall be defined in the NetworkSection.
- */
- public Set<Network> getNetworks() {
- return networks;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), networks);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- NetworkSection other = (NetworkSection) obj;
- return super.equals(other)
- && Objects.equal(networks, other.networks);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("networks", networks);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
deleted file mode 100644
index dde69ce..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
-import com.google.common.base.Objects;
-
-/**
- * An OperatingSystemSection specifies the operating system installed on a virtual machine.
- */
-public class OperatingSystemSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromOperatingSystemSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private int id;
- private String description;
- private String version;
-
- /**
- * @see OperatingSystemSection#getId()
- */
- public B id(int id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getVersion()
- */
- public B version(String version) {
- this.version = version;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getDescription
- */
- public B description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public OperatingSystemSection build() {
- return new OperatingSystemSection(this);
- }
-
- public B fromOperatingSystemSection(OperatingSystemSection in) {
- return fromSectionType(in)
- .id(in.getId())
- .version(in.getVersion())
- .description(in.getDescription());
- }
- }
-
- @XmlAttribute(namespace = OVF_NS, required = true)
- protected int id;
- @XmlAttribute(namespace = OVF_NS)
- protected String version;
- @XmlElement(name = "Description")
- protected String description;
-
- public OperatingSystemSection(Builder<?> builder) {
- super(builder);
- this.id = builder.id;
- this.description = builder.description;
- this.version = builder.version;
- }
-
- protected OperatingSystemSection() {
- // For Builders and JAXB
- }
-
- /**
- * Gets the OVF id
- *
- * @see org.jclouds.vcloud.director.v1_5.domain.cim.OSType#getCode()
- */
- public int getId() {
- return id;
- }
-
- /**
- * Gets the version
- */
- public String getVersion() {
- return version;
- }
-
- /**
- * Gets the description or null
- */
- public String getDescription() {
- return description;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), id, version, description);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- OperatingSystemSection that = (OperatingSystemSection) obj;
- return super.equals(that)
- && equal(this.id, that.id)
- && equal(this.version, that.version)
- && equal(this.description, that.description);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("id", id)
- .add("version", version)
- .add("description", description);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
deleted file mode 100644
index 8b4c5d6..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
+++ /dev/null
@@ -1,299 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.cim.CimString;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The ProductSection element specifies product-information for an appliance, such as product name,
- * version, and vendor.
- */
-@XmlRootElement(name = "ProductSection")
-@XmlType(name = "ProductSection_Type")
-public class ProductSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromProductSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private MsgType product;
- private MsgType vendor;
- private CimString version;
- private CimString fullVersion;
- private CimString productUrl;
- private CimString vendorUrl;
- private CimString appUrl;
- protected Set<ProductSectionProperty> properties = Sets.newLinkedHashSet();
-
- @Override
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see ProductSection#getProduct()
- */
- public B product(MsgType product) {
- this.product = product;
- return self();
- }
-
- /**
- * @see ProductSection#getVendor()
- */
- public B vendor(MsgType vendor) {
- this.vendor = vendor;
- return self();
- }
-
- /**
- * @see ProductSection#getVersion()
- */
- public B version(CimString version) {
- this.version = version;
- return self();
- }
-
- /**
- * @see ProductSection#geFullVersion()
- */
- public B fullVersion(CimString fullVersion) {
- this.fullVersion = fullVersion;
- return self();
- }
-
- /**
- * @see ProductSection#getProductUrl()
- */
- public B productUrl(CimString productUrl) {
- this.productUrl = productUrl;
- return self();
- }
-
- /**
- * @see ProductSection#getProductUrl()
- */
- public B productUrl(String productUrl) {
- this.productUrl = new CimString(productUrl);
- return self();
- }
-
- /**
- * @see ProductSection#getVendorUrl()
- */
- public B vendorUrl(CimString vendorUrl) {
- this.vendorUrl = vendorUrl;
- return self();
- }
-
- /**
- * @see ProductSection#getAppUrl()
- */
- public B appUrl(CimString appUrl) {
- this.appUrl = appUrl;
- return self();
- }
-
- /**
- * @see ProductSection#getProperties()
- */
- public B property(ProductSectionProperty property) {
- this.properties.add(checkNotNull(property, "property"));
- return self();
- }
-
- /**
- * @see ProductSection#getProperties
- */
- public B properties(Iterable<ProductSectionProperty> properties) {
- this.properties = ImmutableSet.copyOf(checkNotNull(properties, "properties"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ProductSection build() {
- return new ProductSection(this);
- }
-
- public B fromProductSection(ProductSection in) {
- return fromSectionType(in)
- .product(in.getProduct())
- .vendor(in.getVendor())
- .version(in.getVersion())
- .fullVersion(in.getFullVersion())
- .productUrl(in.getProductUrl())
- .vendorUrl(in.getVendorUrl())
- .appUrl(in.getAppUrl())
- .properties(Sets.newLinkedHashSet(in.getProperties()));
- }
- }
-
- private ProductSection(Builder<?> builder) {
- super(builder);
- this.product = builder.product;
- this.vendor = builder.vendor;
- this.version = builder.version;
- this.fullVersion = builder.fullVersion;
- this.productUrl = builder.productUrl;
- this.vendorUrl = builder.vendorUrl;
- this.appUrl = builder.appUrl;
- this.properties = builder.properties != null ? ImmutableSet.copyOf(checkNotNull(builder.properties, "properties")) : ImmutableSet.<ProductSectionProperty>of();
- }
-
- private ProductSection() {
- // For JAXB
- }
-
- @XmlElement(name = "Product")
- private MsgType product;
- @XmlElement(name = "Vendor")
- private MsgType vendor;
- @XmlElement(name = "Version", namespace = CIM_NS)
- private CimString version;
- @XmlElement(name = "FullVersion", namespace = CIM_NS)
- private CimString fullVersion;
- @XmlElement(name = "ProductUrl", namespace = CIM_NS)
- private CimString productUrl;
- @XmlElement(name = "VendorUrl", namespace = CIM_NS)
- private CimString vendorUrl;
- @XmlElement(name = "AppUrl", namespace = CIM_NS)
- private CimString appUrl;
- @XmlElement(name = "Property")
- private Set<ProductSectionProperty> properties = Sets.newLinkedHashSet();
-
- /**
- * Name of product.
- */
- public MsgType getProduct() {
- return product;
- }
-
- /**
- * Name of product vendor.
- */
- public MsgType getVendor() {
- return vendor;
- }
-
- /**
- * Product version, short form.
- */
- public CimString getVersion() {
- return version;
- }
-
- /**
- * Product version, long form.
- */
- public CimString getFullVersion() {
- return fullVersion;
- }
-
- /**
- * URL resolving to product description.
- */
- public CimString getProductUrl() {
- return productUrl;
- }
-
- /**
- * URL resolving to vendor description.
- */
- public CimString getVendorUrl() {
- return vendorUrl;
- }
-
- /**
- * Experimental: URL resolving to deployed product instance.
- */
- public CimString getAppUrl() {
- return appUrl;
- }
-
- // TODO Set<Icon>
-
- /**
- * Properties for application-level customization.
- */
- public Set<ProductSectionProperty> getProperties() {
- return properties;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), product, vendor, version, fullVersion, productUrl, vendorUrl, appUrl, properties);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (!super.equals(obj)) return false;
- if (getClass() != obj.getClass()) return false;
-
- ProductSection that = ProductSection.class.cast(obj);
- return super.equals(that) &&
- equal(this.product, that.product) &&
- equal(this.vendor, that.vendor) &&
- equal(this.version, that.version) &&
- equal(this.fullVersion, that.fullVersion) &&
- equal(this.productUrl, that.productUrl) &&
- equal(this.vendorUrl, that.vendorUrl) &&
- equal(this.appUrl, that.appUrl) &&
- equal(this.properties, that.properties);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("product", product)
- .add("vendor", vendor)
- .add("version", version)
- .add("fullVersion", fullVersion)
- .add("productUrl", productUrl)
- .add("vendorUrl", vendorUrl)
- .add("appUrl", appUrl)
- .add("properties", properties);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
deleted file mode 100644
index 318a2bb..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
+++ /dev/null
@@ -1,34 +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.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Property element
- *
- * <pre>
- * <element name="Property" />
- * </pre>
- */
-@XmlType(name = "")
-@XmlRootElement(name = "Property")
-public class ProductSectionProperty extends Property {
- // TODO hashCode, equals, toString
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
deleted file mode 100644
index c404694..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
+++ /dev/null
@@ -1,301 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-@XmlType(name = "Property")
-@XmlSeeAlso({ ProductSectionProperty.class })
-public class Property {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromProperty(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> {
-
- protected String key;
- protected Set<PropertyConfigurationValueType> values = Sets.newLinkedHashSet();
- protected MsgType label;
- protected MsgType description;
- protected String type;
- protected String qualifiers;
- protected Boolean userConfigurable;
- protected String defaultValue = "";
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see Property#getKey()
- */
- public B key(String key) {
- this.key = key;
- return self();
- }
-
- /**
- * @see Property#getValues()
- */
- public B values(Set<PropertyConfigurationValueType> values) {
- this.values = checkNotNull(values, "values");
- return self();
- }
-
- /**
- * @see Property#getValues()
- */
- public B value(PropertyConfigurationValueType value) {
- this.values.add(checkNotNull(value, "value"));
- return self();
- }
-
- /**
- * @see Property#getLabel()
- */
- public B label(MsgType label) {
- this.label = label;
- return self();
- }
-
- /**
- * @see Property#getDescription()
- */
- public B description(MsgType description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see Property#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Property#getQualifiers()
- */
- public B qualifiers(String qualifiers) {
- this.qualifiers = qualifiers;
- return self();
- }
-
- /**
- * @see Property#getQualifiers()
- */
- public B qualifiers(Iterable<String> qualifiers) {
- this.qualifiers = Joiner.on(',').join(qualifiers);
- return self();
- }
-
- /**
- * @see Property#getQualifiers()
- */
- public B qualifiers(String...qualifiers) {
- this.qualifiers = Joiner.on(',').join(qualifiers);
- return self();
- }
-
- /**
- * @see Property#isUserConfigurable()
- */
- public B isUserConfigurable(Boolean userConfigurable) {
- this.userConfigurable = userConfigurable;
- return self();
- }
-
- /**
- * @see Property#isUserConfigurable()
- */
- public B userConfigurable() {
- this.userConfigurable = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see Property#isUserConfigurable()
- */
- public B notUserConfigurable() {
- this.userConfigurable = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see Property#getDefaultValue()
- */
- public B defaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- return self();
- }
-
- public Property build() {
- return new Property(this);
- }
-
- public B fromProperty(Property in) {
- return key(in.getKey()).values(in.getValues()).description(in.getDescription()).label(in.getLabel())
- .type(in.getType()).qualifiers(in.getQualifiers()).isUserConfigurable(in.isUserConfigurable()).defaultValue(in.getDefaultValue());
- }
- }
-
- @XmlAttribute
- private String key;
- @XmlElement(name = "Value")
- private Set<PropertyConfigurationValueType> values;
- @XmlElement(name = "Label")
- private MsgType label;
- @XmlElement(name = "Description")
- private MsgType description;
- @XmlAttribute(required = true)
- private String type;
- @XmlAttribute(required = true)
- private String qualifiers;
- @XmlAttribute
- private Boolean userConfigurable;
- @XmlAttribute(name = "value")
- private String defaultValue;
-
- protected Property(Builder<?> builder) {
- this.key = builder.key;
- this.values = builder.values;
- this.label = builder.label;
- this.description = builder.description;
- this.type = builder.type;
- this.qualifiers = builder.qualifiers;
- this.userConfigurable = builder.userConfigurable;
- this.defaultValue = builder.defaultValue;
- }
-
- protected Property() {
- // for JAXB
- }
-
- /**
- * Property identifier.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Description of property.
- */
- public MsgType getDescription() {
- return description;
- }
-
- /**
- * Short description of property.
- */
- public MsgType getLabel() {
- return label;
- }
-
- /**
- * Alternative default property values for different configuration
- */
- public Set<PropertyConfigurationValueType> getValues() {
- return values;
- }
-
- /**
- * Property type.
- */
- public String getType() {
- return type;
- }
-
- /**
- * A comma-separated set of type qualifiers.
- */
- public String getQualifiers() {
- return qualifiers;
- }
-
- /**
- * Determines whether the property value is configurable during installation.
- */
- public Boolean isUserConfigurable() {
- return userConfigurable;
- }
-
- /**
- * A Default value for property.
- */
- public String getDefaultValue() {
- if (defaultValue == null) {
- return "";
- } else {
- return defaultValue;
- }
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(key, values, label, description, type, qualifiers, userConfigurable, defaultValue);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Property that = Property.class.cast(obj);
- return equal(this.key, that.key) &&
- equal(this.values, that.values) &&
- equal(this.label, that.label) &&
- equal(this.description, that.description) &&
- equal(this.type, that.type) &&
- equal(this.qualifiers, that.qualifiers) &&
- equal(this.userConfigurable, that.userConfigurable) &&
- equal(this.defaultValue, that.defaultValue);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("key", key).add("values", values).add("label", label).add("description", description)
- .add("type", type).add("qualifiers", qualifiers).add("userConfigurable", userConfigurable).add("defaultValue", defaultValue)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
deleted file mode 100644
index 7efb08e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
+++ /dev/null
@@ -1,54 +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.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Type for alternative default values for properties when DeploymentOptionSection is used
- *
- * <pre>
- * <complexType name="PropertyConfigurationValue_Type">
- * </pre>
- */
-@XmlType(name = "PropertyConfigurationValue_Type")
-public class PropertyConfigurationValueType {
-
- // TODO Builder
-
- @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true)
- protected String value;
- @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1")
- protected String configuration;
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Gets the value of the configuration property.
- */
- public String getConfiguration() {
- return configuration;
- }
-
- // TODO hashCode, equals, toString
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
deleted file mode 100644
index cc532a7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
+++ /dev/null
@@ -1,141 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Metadata about a virtual machine or grouping of them.
- *
- * Base type for Sections, subclassing this is the most common form of extensibility. Subtypes define more specific elements.
- */
-@XmlType(name = "Section_Type")
-public abstract class SectionType {
-
- public abstract static class Builder<B extends Builder<B>> {
- private String info;
- private Boolean required;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- public abstract SectionType build();
-
- /**
- * @see SectionType#getInfo()
- */
- public B info(String info) {
- this.info = info;
- return self();
- }
-
- /**
- * @see SectionType#isRequired()
- */
- public B required(Boolean required) {
- this.required = required;
- return self();
- }
-
- /**
- * @see SectionType#isRequired()
- */
- public B required() {
- this.required = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see SectionType#isRequired()
- */
- public B notRequired() {
- this.required = Boolean.FALSE;
- return self();
- }
-
- public B fromSectionType(SectionType in) {
- return info(in.getInfo()).required(in.isRequired());
- }
- }
-
- @XmlElement(name = "Info", required = true)
- private String info;
- @XmlAttribute(namespace = OVF_NS)
- private Boolean required;
-
- protected SectionType(Builder<?> builder) {
- this.info = builder.info;
- this.required = builder.required;
- }
-
- protected SectionType() {
- // For JAXB
- }
-
- /**
- * Info element describes the meaning of the Section, this is typically shown if the Section is not understood by an application
- *
- * @return ovf info
- */
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public Boolean isRequired() {
- return required;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(info, required);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- SectionType other = (SectionType) obj;
- return equal(this.info, other.info) && equal(this.required, other.required);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("info", info).add("required", required);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
deleted file mode 100644
index fecdfa3..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
+++ /dev/null
@@ -1,123 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-/**
- * Specifies the order in which entities in a VirtualSystemCollection are powered on and shut down
- *
- * <pre>
- * <complexType name="StartupSection_Type" />
- * </pre>
- */
-@XmlRootElement(name = "StartupSection")
-@XmlType(name = "StartupSection_Type")
-public class StartupSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromStartupSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private List<StartupSectionItem> items = Lists.newArrayList();
-
- /**
- * @see StartupSection#getItem()
- */
- public B items(List<StartupSectionItem> items) {
- this.items = checkNotNull(items, "items");
- return self();
- }
-
- /**
- * @see StartupSection#getItem()
- */
- public B item(StartupSectionItem item) {
- this.items.add(checkNotNull(item, "item"));
- return self();
- }
-
- @Override
- public StartupSection build() {
- return new StartupSection(this);
- }
-
- public B fromStartupSection(StartupSection in) {
- return fromSectionType(in).items(in.getItems());
- }
- }
-
- @XmlElement(name = "Item")
- private List<StartupSectionItem> items = Lists.newArrayList();
-
- protected StartupSection() {
- // For JAXB
- }
-
- public StartupSection(Builder<?> builder) {
- super(builder);
- this.items = (items != null) ? ImmutableList.<StartupSectionItem>copyOf(builder.items) : ImmutableList.<StartupSectionItem>of();
- }
-
- /**
- * Gets the value of the item property.
- */
- public List<StartupSectionItem> getItems() {
- return items;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- StartupSection that = StartupSection.class.cast(o);
- return super.equals(that) && equal(this.items, that.items);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), items);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("items", items);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
deleted file mode 100644
index e1cd012..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.dmtf.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for Item element declaration.
- *
- * <pre>
- * <element name="Item">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- * <attribute name="startDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- * <attribute name="waitingForGuest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="stopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- * <attribute name="startAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOn" />
- * <attribute name="stopAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOff" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
- * </pre>
- */
-@XmlType
-@XmlRootElement(name = "Item")
-public class StartupSectionItem extends Item {
-
- // TODO Builder
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- StartupSectionItem that = StartupSectionItem.class.cast(obj);
- return super.equals(that);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
deleted file mode 100644
index 864d153..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
+++ /dev/null
@@ -1,198 +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.dmtf.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.VirtualSystemSettingData;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The virtual hardware required by a virtual machine is specified in VirtualHardwareSection.
- *
- * This specification supports abstract or incomplete hardware descriptions in which only the major
- * devices are described. The hypervisor is allowed to create additional virtual hardware
- * controllers and devices, as long as the required devices listed in the descriptor are realized.
- */
-public class VirtualHardwareSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromVirtualHardwareSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private VirtualSystemSettingData virtualSystem;
- private String transport;
- private Set<ResourceAllocationSettingData> items = Sets.newLinkedHashSet();
-
- /**
- * @see VirtualHardwareSection#getSystem()
- */
- public B system(VirtualSystemSettingData virtualSystem) {
- this.virtualSystem = virtualSystem;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getTransport()
- */
- public B transport(String transport) {
- this.transport = transport;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getTransport()
- */
- public B transport(Iterable<String> transports) {
- this.transport = Joiner.on(',').join(transports);
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getTransport()
- */
- public B transport(String...transports) {
- this.transport = Joiner.on(',').join(transports);
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getItems()
- */
- public B item(ResourceAllocationSettingData item) {
- this.items.add(checkNotNull(item, "item"));
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getItems()
- */
- public B items(Iterable<? extends ResourceAllocationSettingData> items) {
- this.items = Sets.newLinkedHashSet(checkNotNull(items, "items"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public VirtualHardwareSection build() {
- return new VirtualHardwareSection(this);
- }
-
- public B fromVirtualHardwareSection(VirtualHardwareSection in) {
- return fromSectionType(in)
- .items(in.getItems())
- .transport(in.getTransport())
- .system(in.getSystem());
- }
- }
-
- @XmlElement(name = "System")
- protected VirtualSystemSettingData virtualSystem;
- @XmlAttribute(name = "transport")
- protected String transport;
- @XmlElement(name = "Item")
- protected Set<? extends ResourceAllocationSettingData> items = Sets.newLinkedHashSet();
-
- protected VirtualHardwareSection(Builder<?> builder) {
- super(builder);
- this.virtualSystem = builder.virtualSystem;
- this.transport = builder.transport;
- this.items = builder.items != null ? ImmutableSet.copyOf(builder.items) : Sets.<ResourceAllocationSettingData>newLinkedHashSet();
- }
-
- protected VirtualHardwareSection() {
- // For JAXB
- }
-
- /**
- * Comma-separated list of supported transports types for the OVF descriptor.
- *
- * Transport types define methods by which the environment document is communicated from the
- * deployment platform to the guest software.
- * <p>
- * To enable interoperability, this specification defines an "iso" transport type which all
- * implementations that support CD-ROM devices are required to support. The iso transport
- * communicates the environment 1346 document by making a dynamically generated ISO image
- * available to the guest software. To support the iso transport type, prior to booting a virtual
- * machine, an implementation shall make an ISO 9660 read-only disk image available as backing
- * for a disconnected CD-ROM. If the iso transport is selected for a VirtualHardwareSection, at
- * least one disconnected CD-ROM device shall be present in this section.
- * <p>
- * Support for the "iso" transport type is not a requirement for virtual hardware architectures
- * or guest 1351 operating systems which do not have CD-ROM device support.
- *
- * @return
- */
- public String getTransport() {
- return transport;
- }
-
- public VirtualSystemSettingData getSystem() {
- return virtualSystem;
- }
-
- public Set<? extends ResourceAllocationSettingData> getItems() {
- return ImmutableSet.copyOf(items);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), transport, virtualSystem, items);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
- VirtualHardwareSection that = VirtualHardwareSection.class.cast(obj);
- return super.equals(that)
- && equal(this.transport, that.transport)
- && equal(this.virtualSystem, that.virtualSystem)
- && equal(this.items, that.items);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("transport", transport)
- .add("virtualSystem", virtualSystem)
- .add("items", items);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
deleted file mode 100644
index aeedeaf..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
+++ /dev/null
@@ -1,91 +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.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * Container of sections for a specific entity
- *
- * <pre>
- * <complexType name="Entity_Type">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "Entity_Type")
-public class EntityType {
-
- @XmlElementRef(name = "Section", namespace = OVF_ENV_NS)
- protected Set<SectionType<?>> sections = Sets.newLinkedHashSet();
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
- @XmlAttribute(namespace = OVF_ENV_NS, required = true)
- protected String id;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
- /**
- * Gets the value of the sections property.
- */
- public Set<SectionType<?>> getSection() {
- return sections;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- /**
- * Gets the value of the id property.
- */
- public String getId() {
- return id;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
deleted file mode 100644
index ee15f55..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * Type for root OVF environment
- *
- * <pre>
- * <complexType name="Environment_Type">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="Entity" type="{http://schemas.dmtf.org/ovf/environment/1}Entity_Type" maxOccurs="unbounded" minOccurs="0"/>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "Environment_Type")
-public class EnvironmentType {
-
- @XmlElementRef(name = "Section", namespace = OVF_ENV_NS)
- protected Set<SectionType<?>> sections = Sets.newLinkedHashSet();
- @XmlElement(name = "Entity")
- protected Set<EntityType> entities = Sets.newLinkedHashSet();
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
- @XmlAttribute(namespace = OVF_ENV_NS)
- protected String id;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
- /**
- * Entity independent meta-data sections Gets the value of the sections property.
- */
- public Set<SectionType<?>> getSections() {
- return sections;
- }
-
- /**
- * Gets the value of the entities property.
- */
- public Set<EntityType> getEntities() {
- return entities;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- /**
- * Gets the value of the id property.
- */
- public String getId() {
- if (id == null) {
- return "";
- } else {
- return id;
- }
- }
-
- /**
- * Sets the value of the id property.
- */
- public void setId(String value) {
- this.id = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
deleted file mode 100644
index fd56577..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
+++ /dev/null
@@ -1,140 +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.dmtf.ovf.environment;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.cim.CimString;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-/**
- * Information about deployment platform
- *
- * <pre>
- * <complexType name="PlatformSection_Type">
- * <complexContent>
- * <extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- * <sequence>
- * <element name="Kind" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Version" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Vendor" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Locale" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Timezone" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlRootElement(name = "PlatformSection")
-@XmlType(name = "PlatformSection_Type")
-public class PlatformSectionType extends SectionType<PlatformSectionType> {
-
- @XmlElement(name = "Kind")
- protected CimString kind;
- @XmlElement(name = "Version")
- protected CimString version;
- @XmlElement(name = "Vendor")
- protected CimString vendor;
- @XmlElement(name = "Locale")
- protected CimString locale;
- @XmlElement(name = "Timezone")
- protected Integer timezone;
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the kind property.
- */
- public CimString getKind() {
- return kind;
- }
-
- /**
- * Gets the value of the version property.
- */
- public CimString getVersion() {
- return version;
- }
-
- /**
- * Gets the value of the vendor property.
- */
- public CimString getVendor() {
- return vendor;
- }
-
- /**
- * Gets the value of the locale property.
- */
- public CimString getLocale() {
- return locale;
- }
-
- /**
- * Gets the value of the timezone property.
- */
- public Integer getTimezone() {
- return timezone;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), version, vendor, timezone, locale, kind, any);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- PlatformSectionType that = (PlatformSectionType) obj;
- return super.equals(that) &&
- Objects.equal(this.version, that.version) &&
- Objects.equal(this.vendor, that.vendor) &&
- Objects.equal(this.timezone, that.timezone) &&
- Objects.equal(this.locale, that.locale) &&
- Objects.equal(this.kind, that.kind) &&
- Objects.equal(this.any, that.any);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("version", version).add("vendor", vendor).add("timezone", timezone)
- .add("locale", locale).add("kind", kind).add("any", any);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
deleted file mode 100644
index 2baf2bd..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
+++ /dev/null
@@ -1,78 +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.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class Property {
-
- @XmlAttribute(namespace = OVF_ENV_NS, required = true)
- protected String key;
- @XmlAttribute(namespace = OVF_ENV_NS, required = true)
- protected String value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the key property.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the value of the key property.
- */
- public void setKey(String value) {
- this.key = value;
- }
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * Gets a map that contains attributes that aren't bound to any typed property on this class.
- */
- public Map<QName, String> getOtherAttributes() {
- return otherAttributes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
deleted file mode 100644
index 1d88afd..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
+++ /dev/null
@@ -1,103 +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.dmtf.ovf.environment;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-/**
- * Key/value pairs of assigned properties for an entity
- *
- * <pre>
- * <complexType name="PropertySection_Type">
- * <complexContent>
- * <extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- * <sequence>
- * <element name="Property" maxOccurs="unbounded" minOccurs="0">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlRootElement(name = "PropertySection")
-@XmlType(name = "PropertySection_Type")
-public class PropertySectionType extends SectionType<PropertySectionType> {
-
- @XmlElement(name = "Property")
- protected Set<Property> properties = Sets.newLinkedHashSet();
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the properties property.
- */
- public Set<Property> getProperties() {
- return properties;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), properties, any);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- PropertySectionType that = (PropertySectionType) obj;
- return super.equals(that) &&
- Objects.equal(this.properties, that.properties) &&
- Objects.equal(this.any, that.any);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("properties", properties).add("any", any);
- }
-}
[25/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
deleted file mode 100644
index 9e786d1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
+++ /dev/null
@@ -1,310 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.dmtf.ovf.DeploymentOptionSection;
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * A vApp Template can be in one of these statues:
- * <ul>
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#FAILED_CREATION
- * FAILED_CREATION(-1)} - Transient entity state, e.g., model object is addd but the
- * corresponding VC backing does not exist yet. This is further sub-categorized in the respective
- * entities.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#UNRESOLVED
- * UNRESOLVED(0)} - Entity is whole, e.g., VM creation is complete and all the required model
- * objects and VC backings are addd.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#RESOLVED
- * RESOLVED(1)} - Entity is resolved.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#UNKNOWN
- * UNKNOWN(6)} - Entity state could not be retrieved from the inventory, e.g., VM power state is
- * null.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#POWERED_OFF
- * POWERED_OFF(8)} - All VMs of the vApp template are powered off.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#MIXED MIXED(10)}
- * - vApp template status is set to {@code MIXED} when the VMs in the vApp are in different power
- * states.
- * </ul>
- */
-@XmlRootElement(name = "VAppTemplate")
-public class VAppTemplate extends ResourceEntity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVAppTemplate(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ResourceEntity.Builder<B> {
- private Owner owner;
- private Set<Vm> children = Sets.newLinkedHashSet();
- private Set<SectionType> sections = Sets.newLinkedHashSet();
- private String vAppScopedLocalId;
- private Boolean ovfDescriptorUploaded;
- private Boolean goldMaster;
-
- /**
- * @see VAppTemplate#getOwner()
- */
- public B owner(Owner owner) {
- this.owner = owner;
- return self();
- }
-
- /**
- * @see VAppTemplate#getChildren()
- */
- public B children(Iterable<Vm> children) {
- this.children = Sets.newLinkedHashSet(checkNotNull(children, "children"));
- return self();
- }
-
- /**
- * @see VAppTemplate#getSections()
- */
- public B sections(Iterable<? extends SectionType> sections) {
- this.sections = Sets.newLinkedHashSet(checkNotNull(sections, "sections"));
- return self();
- }
-
- /**
- * @see VAppTemplate#getVAppScopedLocalId()
- */
- public B vAppScopedLocalId(String vAppScopedLocalId) {
- this.vAppScopedLocalId = vAppScopedLocalId;
- return self();
- }
-
- /**
- * @see VAppTemplate#isOvfDescriptorUploaded()
- */
- public B ovfDescriptorUploaded(Boolean ovfDescriptorUploaded) {
- this.ovfDescriptorUploaded = ovfDescriptorUploaded;
- return self();
- }
-
- /**
- * @see VAppTemplate#isGoldMaster()
- */
- public B goldMaster(Boolean goldMaster) {
- this.goldMaster = goldMaster;
- return self();
- }
-
- @Override
- public VAppTemplate build() {
- return new VAppTemplate(this);
- }
-
- public B fromVAppTemplate(VAppTemplate in) {
- return fromResourceEntityType(in)
- .owner(in.getOwner())
- .children(in.getChildren())
- .sections(in.getSections())
- .vAppScopedLocalId(in.getVAppScopedLocalId())
- .ovfDescriptorUploaded(in.isOvfDescriptorUploaded())
- .goldMaster(in.isGoldMaster());
- }
- }
-
- @XmlElement(name = "Owner")
- private Owner owner;
- @XmlElementWrapper(name = "Children")
- @XmlElement(name = "Vm")
- private Set<Vm> children = Sets.newLinkedHashSet();
- @XmlElementRefs({
- @XmlElementRef(type = VirtualHardwareSection.class),
- @XmlElementRef(type = LeaseSettingsSection.class),
-// @XmlElementRef(type = EulaSection.class),
- @XmlElementRef(type = RuntimeInfoSection.class),
-// @XmlElementRef(type = AnnotationSection.class),
- @XmlElementRef(type = DeploymentOptionSection.class),
- @XmlElementRef(type = StartupSection.class),
-// @XmlElementRef(type = ResourceAllocationSection.class),
- @XmlElementRef(type = NetworkConnectionSection.class),
- @XmlElementRef(type = CustomizationSection.class),
- @XmlElementRef(type = ProductSection.class),
- @XmlElementRef(type = GuestCustomizationSection.class),
- @XmlElementRef(type = OperatingSystemSection.class),
- @XmlElementRef(type = NetworkConfigSection.class),
- @XmlElementRef(type = NetworkSection.class),
-// @XmlElementRef(type = InstallSection.class),
- @XmlElementRef(type = DiskSection.class)
- })
- private Set<SectionType> sections = Sets.newLinkedHashSet();
- @XmlElement(name = "VAppScopedLocalId")
- private String vAppScopedLocalId;
- @XmlAttribute
- private Boolean ovfDescriptorUploaded;
- @XmlAttribute
- private Boolean goldMaster;
-
- protected VAppTemplate(Builder<?> builder) {
- super(builder);
- this.owner = builder.owner;
- this.children = builder.children.isEmpty() ? ImmutableSet.<Vm>of() : ImmutableSet.copyOf(builder.children);
- this.sections = builder.sections.isEmpty() ? null : ImmutableSet.copyOf(builder.sections);
- this.vAppScopedLocalId = builder.vAppScopedLocalId;
- this.ovfDescriptorUploaded = builder.ovfDescriptorUploaded;
- this.goldMaster = builder.goldMaster;
- }
-
- protected VAppTemplate() {
- // For JAXB
- }
-
- /**
- * Gets the value of the owner property.
- */
- public Owner getOwner() {
- return owner;
- }
-
- /**
- * Gets the value of the children property.
- */
- public Set<Vm> getChildren() {
- return children;
- }
-
- /**
- * Contains ovf sections for vApp template.
- *
- * Objects of the following type(s) are allowed in the list:
- * <ul>
- * <li>{@link VirtualHardwareSectionType}
- * <li>{@link LeaseSettingsSectionType}
- * <li>{@link EulaSectionType}
- * <li>{@link RuntimeInfoSectionType}
- * <li>{@link AnnotationSectionType}
- * <li>{@link DeploymentOptionSectionType}
- * <li>{@link StartupSectionType}
- * <li>{@link ResourceAllocationSectionType}
- * <li>{@link NetworkConnectionSectionType}
- * <li>{@link CustomizationSectionType}
- * <li>{@link ProductSectionType}
- * <li>{@link GuestCustomizationSectionType}
- * <li>{@link OperatingSystemSectionType}
- * <li>{@link NetworkConfigSectionType}
- * <li>{@link NetworkSectionType}
- * <li>{@link DiskSectionType}
- * <li>{@link InstallSectionType}
- * </ul>
- */
- public Set<SectionType> getSections() {
- return sections != null ? ImmutableSet.copyOf(sections) : ImmutableSet.<SectionType>of();
- }
-
- /**
- * Gets the value of the vAppScopedLocalId property.
- */
- public String getVAppScopedLocalId() {
- return vAppScopedLocalId;
- }
-
- /**
- * Gets the value of the ovfDescriptorUploaded property.
- */
- public Boolean isOvfDescriptorUploaded() {
- return ovfDescriptorUploaded;
- }
-
- /**
- * Gets the value of the goldMaster property.
- */
- public boolean isGoldMaster() {
- if (goldMaster == null) {
- return false;
- } else {
- return goldMaster;
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VAppTemplate that = VAppTemplate.class.cast(o);
- return super.equals(that) &&
- equal(owner, that.owner) &&
- equal(children, that.children) &&
- equal(sections, that.sections) &&
- equal(vAppScopedLocalId, that.vAppScopedLocalId) &&
- equal(ovfDescriptorUploaded, that.ovfDescriptorUploaded) &&
- equal(goldMaster, that.goldMaster);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- owner,
- children,
- sections,
- vAppScopedLocalId,
- ovfDescriptorUploaded,
- goldMaster);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper(super.toString())
- .add("owner", owner)
- .add("children", children)
- .add("sections", sections)
- .add("vAppScopedLocalId", vAppScopedLocalId)
- .add("ovfDescriptorUploaded", ovfDescriptorUploaded)
- .add("goldMaster", goldMaster).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
deleted file mode 100644
index a237c33..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
+++ /dev/null
@@ -1,99 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "VMWareTools")
-@XmlType(name = "VMWareTools")
-public class VMWareTools {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromVMWareTools(this);
- }
-
- public static class Builder {
-
- private String version;
-
- /**
- * @see VMWareTools#getVersion()
- */
- public Builder version(String version) {
- this.version = version;
- return this;
- }
-
- public VMWareTools build() {
- VMWareTools vmWareTools = new VMWareTools(version);
- return vmWareTools;
- }
-
- public Builder fromVMWareTools(VMWareTools in) {
- return version(in.getVersion());
- }
- }
-
- @XmlAttribute(required = true)
- protected String version;
-
- protected VMWareTools() {
- // For JAXB and builder use
- }
-
- public VMWareTools(String version) {
- this.version = version;
- }
-
- /**
- * Gets the value of the version property.
- */
- public String getVersion() {
- return version;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VMWareTools that = VMWareTools.class.cast(o);
- return equal(this.version, that.version);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(version);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("version", version).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
deleted file mode 100644
index 65b1ff8..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
+++ /dev/null
@@ -1,358 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a virtual data center (vDC).
- */
-@XmlRootElement(name = "Vdc")
-@XmlType(name = "VdcType")
-@XmlSeeAlso({ AdminVdc.class })
-public class Vdc extends Entity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVdc(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
- private String allocationModel;
- private CapacityWithUsage storageCapacity;
- private ComputeCapacity computeCapacity;
- private Set<Reference> resourceEntities = Sets.newLinkedHashSet();
- private Set<Reference> availableNetworks = Sets.newLinkedHashSet();
- private Capabilities capabilities;
- private Integer nicQuota;
- private Integer networkQuota;
- private Integer vmQuota;
- private Boolean isEnabled;
- private Integer status;
-
- /**
- * @see Vdc#getAllocationModel()
- */
- public B allocationModel(String allocationModel) {
- this.allocationModel = allocationModel;
- return self();
- }
-
- /**
- * @see Vdc#getStorageCapacity()
- */
- public B storageCapacity(CapacityWithUsage storageCapacity) {
- this.storageCapacity = storageCapacity;
- return self();
- }
-
- /**
- * @see Vdc#getComputeCapacity()
- */
- public B computeCapacity(ComputeCapacity computeCapacity) {
- this.computeCapacity = computeCapacity;
- return self();
- }
-
- /**
- * @see Vdc#getResourceEntities()
- */
- public B resourceEntities(Set<Reference> resourceEntities) {
- this.resourceEntities = Sets.newLinkedHashSet(checkNotNull(resourceEntities, "resourceEntities"));
- return self();
- }
-
- /**
- * @see Vdc#getResourceEntities()
- */
- public B resourceEntity(Reference resourceEntity) {
- this.resourceEntities.add(checkNotNull(resourceEntity, "resourceEntity"));
- return self();
- }
-
- /**
- * @see Vdc#getAvailableNetworks()
- */
- public B availableNetworks(Set<Reference> availableNetworks) {
- this.availableNetworks = Sets.newLinkedHashSet(checkNotNull(availableNetworks, "availableNetworks"));
- return self();
- }
-
- /**
- * @see Vdc#getAvailableNetworks()
- */
- public B network(Reference availableNetwork) {
- this.availableNetworks.add(checkNotNull(availableNetwork, "availableNetwork"));
- return self();
- }
-
- /**
- * @see Vdc#getCapabilities()
- */
- public B capabilities(Capabilities capabilities) {
- this.capabilities = capabilities;
- return self();
- }
-
- /**
- * @see Vdc#getNicQuota()
- */
- public B nicQuota(Integer nicQuota) {
- this.nicQuota = nicQuota;
- return self();
- }
-
- /**
- * @see Vdc#getNetworkQuota()
- */
- public B networkQuota(Integer networkQuota) {
- this.networkQuota = networkQuota;
- return self();
- }
-
- /**
- * @see Vdc#getVmQuota()
- */
- public B vmQuota(Integer vmQuota) {
- this.vmQuota = vmQuota;
- return self();
- }
-
- /**
- * @see Vdc#isEnabled()
- */
- public B isEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled;
- return self();
- }
-
- /**
- * @see Vdc#getStatus()
- */
- public B status(Integer status) {
- this.status = status;
- return self();
- }
-
- @Override
- public Vdc build() {
- return new Vdc(this);
- }
-
- public B fromVdc(Vdc in) {
- return fromEntityType(in)
- .allocationModel(in.getAllocationModel())
- .storageCapacity(in.getStorageCapacity())
- .computeCapacity(in.getComputeCapacity())
- .resourceEntities(Sets.newLinkedHashSet(in.getResourceEntities()))
- .availableNetworks(Sets.newLinkedHashSet(in.getAvailableNetworks()))
- .capabilities(in.getCapabilities())
- .nicQuota(in.getNicQuota())
- .networkQuota(in.getNetworkQuota())
- .vmQuota(in.getVmQuota())
- .isEnabled(in.isEnabled())
- .status(in.getStatus());
- }
- }
-
- protected Vdc() {
- // For JAXB
- }
-
- public Vdc(Builder<?> builder) {
- super(builder);
- this.allocationModel = builder.allocationModel;
- this.storageCapacity = builder.storageCapacity;
- this.computeCapacity = builder.computeCapacity;
- this.resourceEntities = builder.resourceEntities == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.resourceEntities);
- this.availableNetworks = builder.availableNetworks == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.availableNetworks);
- this.capabilities = builder.capabilities;
- this.nicQuota = builder.nicQuota;
- this.networkQuota = builder.networkQuota;
- this.vmQuota = builder.vmQuota;
- this.isEnabled = builder.isEnabled;
- this.status = builder.status;
- }
-
- @XmlElement(name = "AllocationModel", required = true)
- private String allocationModel;
- @XmlElement(name = "StorageCapacity", required = true)
- private CapacityWithUsage storageCapacity;
- @XmlElement(name = "ComputeCapacity", required = true)
- private ComputeCapacity computeCapacity;
- @XmlElementWrapper(name = "ResourceEntities")
- @XmlElement(name = "ResourceEntity")
- private Set<Reference> resourceEntities = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "AvailableNetworks")
- @XmlElement(name = "Network")
- protected Set<Reference> availableNetworks = Sets.newLinkedHashSet();
- @XmlElement(name = "Capabilities")
- private Capabilities capabilities;
- @XmlElement(name = "NicQuota")
- private Integer nicQuota;
- @XmlElement(name = "NetworkQuota")
- private Integer networkQuota;
- @XmlElement(name = "VmQuota")
- private Integer vmQuota;
- @XmlElement(name = "IsEnabled")
- private Boolean isEnabled;
- @XmlAttribute
- private Integer status;
-
- /**
- * Gets the value of the allocationModel property.
- */
- public String getAllocationModel() {
- return allocationModel;
- }
-
- /**
- * Gets the value of the storageCapacity property.
- */
- public CapacityWithUsage getStorageCapacity() {
- return storageCapacity;
- }
-
- /**
- * Gets the value of the computeCapacity property.
- */
- public ComputeCapacity getComputeCapacity() {
- return computeCapacity;
- }
-
- /**
- * Gets the value of the resourceEntities property.
- */
- public Set<Reference> getResourceEntities() {
- return resourceEntities;
- }
-
- /**
- * Gets the value of the availableNetworks property.
- */
- public Set<Reference> getAvailableNetworks() {
- return availableNetworks;
- }
-
- /**
- * Gets the value of the capabilities property.
- */
- public Capabilities getCapabilities() {
- return capabilities;
- }
-
- /**
- * Gets the value of the nicQuota property.
- */
- public Integer getNicQuota() {
- return nicQuota;
- }
-
- /**
- * Gets the value of the networkQuota property.
- */
- public Integer getNetworkQuota() {
- return networkQuota;
- }
-
- /**
- * Gets the value of the vmQuota property.
- */
- public Integer getVmQuota() {
- return vmQuota;
- }
-
- /**
- * Gets the value of the isEnabled property.
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Gets the value of the status property.
- */
- public Integer getStatus() {
- return status;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Vdc that = Vdc.class.cast(o);
- return super.equals(that) &&
- equal(this.allocationModel, that.allocationModel) &&
- equal(this.storageCapacity, that.storageCapacity) &&
- equal(this.computeCapacity, that.computeCapacity) &&
- equal(this.resourceEntities, that.resourceEntities) &&
- equal(this.availableNetworks, that.availableNetworks) &&
- equal(this.capabilities, that.capabilities) &&
- equal(this.nicQuota, that.nicQuota) &&
- equal(this.networkQuota, that.networkQuota) &&
- equal(this.vmQuota, that.vmQuota) &&
- equal(this.isEnabled, that.isEnabled) &&
- equal(this.status, that.status);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), allocationModel, storageCapacity, computeCapacity, resourceEntities, availableNetworks,
- capabilities, nicQuota, networkQuota, vmQuota, isEnabled, status);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("allocationModel", allocationModel)
- .add("storageCapacity", storageCapacity)
- .add("computeCapacity", computeCapacity)
- .add("resourceEntities", resourceEntities)
- .add("availableNetworks", availableNetworks)
- .add("capabilities", capabilities)
- .add("nicQuota", nicQuota)
- .add("networkQuota", networkQuota)
- .add("vmQuota", vmQuota)
- .add("isEnabled", isEnabled)
- .add("status", status);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
deleted file mode 100644
index db100e4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
+++ /dev/null
@@ -1,172 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.environment.EnvironmentType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents a virtual machine.
- */
-@XmlRootElement(name = "Vm")
-@XmlType(name = "VmType")
-public class Vm extends AbstractVApp {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVm(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends AbstractVApp.Builder<B> {
-
- private String vAppScopedLocalId;
- private EnvironmentType environment;
- private Boolean needsCustomization;
-
- /**
- * @see Vm#getVAppScopedLocalId()
- */
- public B vAppScopedLocalId(String vAppScopedLocalId) {
- this.vAppScopedLocalId = vAppScopedLocalId;
- return self();
- }
-
- /**
- * @see Vm#getEnvironment()
- */
- public B environment(EnvironmentType environment) {
- this.environment = environment;
- return self();
- }
-
- /**
- * @see Vm#getNeedsCustomization()
- */
- public B isNeedsCustomization(Boolean needsCustomization) {
- this.needsCustomization = needsCustomization;
- return self();
- }
-
- /**
- * @see Vm#getNeedsCustomization()
- */
- public B needsCustomization() {
- this.needsCustomization = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see Vm#getNeedsCustomization()
- */
- public B notNeedsCustomization() {
- this.needsCustomization = Boolean.FALSE;
- return self();
- }
-
- @Override
- public Vm build() {
- Vm vm = new Vm(this);
- return vm;
- }
-
- public B fromVm(Vm in) {
- return fromAbstractVAppType(in).vAppScopedLocalId(in.getVAppScopedLocalId()).environment(in.getEnvironment()).isNeedsCustomization(in.isNeedsCustomization());
- }
- }
-
- protected Vm() {
- // for JAXB and Builders
- }
-
- protected Vm(Builder<?> builder) {
- super(builder);
- this.vAppScopedLocalId = builder.vAppScopedLocalId;
- this.environment = builder.environment;
- this.needsCustomization = builder.needsCustomization;
- }
-
- @XmlElement(name = "VAppScopedLocalId")
- protected String vAppScopedLocalId;
- @XmlElement(name = "Environment", namespace = "http://schemas.dmtf.org/ovf/environment/1")
- protected EnvironmentType environment;
- @XmlAttribute
- protected Boolean needsCustomization;
-
- /**
- * Gets the value of the vAppScopedLocalId property.
- *
- * @return possible object is {@link String }
- */
- public String getVAppScopedLocalId() {
- return vAppScopedLocalId;
- }
-
- /**
- * OVF environment section
- *
- * @return possible object is {@link Environment }
- */
- public EnvironmentType getEnvironment() {
- return environment;
- }
-
- /**
- * Gets the value of the needsCustomization property.
- *
- * @return possible object is {@link Boolean }
- */
- public Boolean isNeedsCustomization() {
- return needsCustomization;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Vm that = Vm.class.cast(o);
- return super.equals(that) &&
- equal(this.vAppScopedLocalId, that.vAppScopedLocalId) && equal(this.environment, that.environment) && equal(this.needsCustomization, that.needsCustomization);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), vAppScopedLocalId, environment, needsCustomization);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("vAppScopedLocalId", vAppScopedLocalId).add("environment", environment).add("needsCustomization", needsCustomization);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
deleted file mode 100644
index 109592d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
+++ /dev/null
@@ -1,149 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents a question which vSphere issued for a VM in a stuck state(WAITING_FOR_INPUT). It has a question element, a question ID
- * element, and a list of choices with at least one element.
- */
-@XmlType(name = "VmPendingQuestion")
-public class VmPendingQuestion extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVmPendingQuestion(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private String question;
- private String questionId;
- private List<VmQuestionAnswerChoice> choices;
-
- /**
- * @see VmPendingQuestion#getQuestion()
- */
- public B question(String question) {
- this.question = question;
- return self();
- }
-
- /**
- * @see VmPendingQuestion#getQuestionId()
- */
- public B questionId(String questionId) {
- this.questionId = questionId;
- return self();
- }
-
- /**
- * @see VmPendingQuestion#getChoices()
- */
- public B choices(List<VmQuestionAnswerChoice> choices) {
- this.choices = choices;
- return self();
- }
-
- @Override
- public VmPendingQuestion build() {
- VmPendingQuestion vmPendingQuestion = new VmPendingQuestion(this);
- return vmPendingQuestion;
- }
-
- public B fromVmPendingQuestion(VmPendingQuestion in) {
- return fromResource(in).question(in.getQuestion()).questionId(in.getQuestionId()).choices(in.getChoices());
- }
- }
-
- @XmlElement(name = "Question", required = true)
- private String question;
- @XmlElement(name = "QuestionId", required = true)
- private String questionId;
- @XmlElement(name = "Choices", required = true)
- private List<VmQuestionAnswerChoice> choices;
-
- protected VmPendingQuestion() {
- // For JAXB and B use
- }
-
- public VmPendingQuestion(Builder<?> builder) {
- super(builder);
- this.question = builder.question;
- this.questionId = builder.questionId;
- this.choices = builder.choices;
- }
-
- /**
- * Gets the value of the question property.
- */
- public String getQuestion() {
- return question;
- }
-
- /**
- * Gets the value of the questionId property.
- */
- public String getQuestionId() {
- return questionId;
- }
-
- /**
- * Gets the value of the choices property.
- */
- public List<VmQuestionAnswerChoice> getChoices() {
- return choices;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VmPendingQuestion that = VmPendingQuestion.class.cast(o);
- return super.equals(that) &&
- equal(this.question, that.question) && equal(this.questionId, that.questionId) && equal(this.choices, that.choices);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), question, questionId, choices);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("question", question).add("questionId", questionId).add("choices", choices);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
deleted file mode 100644
index 48a8488..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
+++ /dev/null
@@ -1,126 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents a VM answer to a question when the VM is in a stuck
- * {@link ResourceEntity.Status#WAITING_FOR_INPUT} state.
- */
-@XmlType(name = "VmQuestionAnswer", propOrder = {
- "choiceId",
- "questionId"
-})
-public class VmQuestionAnswer {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return builder().fromVmQuestionAnswer(this);
- }
-
- public static class Builder {
- private int choiceId;
- private String questionId;
-
- /**
- * @see VmQuestionAnswer#getChoiceId()
- */
- public Builder choiceId(int choiceId) {
- this.choiceId = choiceId;
- return this;
- }
-
- /**
- * @see VmQuestionAnswer#getQuestionId()
- */
- public Builder questionId(String questionId) {
- this.questionId = questionId;
- return this;
- }
-
- public VmQuestionAnswer build() {
- return new VmQuestionAnswer(choiceId, questionId);
- }
-
- public Builder fromVmQuestionAnswer(VmQuestionAnswer in) {
- return choiceId(in.getChoiceId()).questionId(in.getQuestionId());
- }
- }
-
- @XmlElement(name = "ChoiceId")
- private int choiceId;
- @XmlElement(name = "QuestionId", required = true)
- private String questionId;
-
- protected VmQuestionAnswer() {
- // For JAXB
- }
-
- public VmQuestionAnswer(int choiceId, String questionId) {
- this.choiceId = choiceId;
- this.questionId = questionId;
- }
-
- /**
- * Gets the value of the choiceId property.
- *
- */
- public int getChoiceId() {
- return choiceId;
- }
-
- /**
- * Gets the value of the questionId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getQuestionId() {
- return questionId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VmQuestionAnswer that = VmQuestionAnswer.class.cast(o);
- return equal(this.choiceId, that.choiceId) && equal(this.questionId, that.questionId);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(choiceId, questionId);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
deleted file mode 100644
index dd95c97..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
+++ /dev/null
@@ -1,126 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents a pair of ID and text of an answer choice of a VM question.
- */
-@XmlType(name = "VmQuestionAnswerChoice", propOrder = {
- "id",
- "text"
-})
-public class VmQuestionAnswerChoice {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return builder().fromVmQuestionAnswerChoice(this);
- }
-
- public static class Builder {
- private int id;
- private String text;
-
- /**
- * @see VmQuestionAnswer#getChoiceId()
- */
- public Builder id(int id) {
- this.id = id;
- return this;
- }
-
- /**
- * @see VmQuestionAnswer#getQuestionId()
- */
- public Builder text(String text) {
- this.text = text;
- return this;
- }
-
- public VmQuestionAnswerChoice build() {
- return new VmQuestionAnswerChoice(id, text);
- }
-
- public Builder fromVmQuestionAnswerChoice(VmQuestionAnswerChoice in) {
- return id(in.getId()).text(in.getText());
- }
- }
-
- protected VmQuestionAnswerChoice() {
- // For JAXB
- }
-
- public VmQuestionAnswerChoice(int id, String text) {
- this.id = id;
- this.text = text;
- }
-
- @XmlElement(name = "Id")
- private int id;
- @XmlElement(name = "Text")
- private String text;
-
- /**
- * Gets the value of the id property.
- *
- */
- public int getId() {
- return id;
- }
-
- /**
- * Gets the value of the text property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getText() {
- return text;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VmQuestionAnswerChoice that = VmQuestionAnswerChoice.class.cast(o);
- return equal(this.id, that.id) && equal(this.text, that.text);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, text);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("id", id).add("text", text).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java
deleted file mode 100644
index c6ac48c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.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.vcloud.director.v1_5.domain.dmtf;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.dmtf.ovf.internal.BaseEnvelope;
-
-@XmlRootElement(name = "Envelope", namespace = OVF_NS)
-public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> {
-
- @SuppressWarnings("rawtypes")
- public static Builder<?> builder() {
- return new Builder();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Builder<?> toBuilder() {
- return builder().fromEnvelope(this);
- }
-
- public static class Builder<B extends Builder<B>> extends BaseEnvelope.Builder<B, VirtualSystem, Envelope> {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Envelope build() {
- return new Envelope(this);
- }
- }
-
- protected Envelope(Builder<?> builder) {
- super(builder);
- }
-
- protected Envelope() {
- // For JaxB
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
deleted file mode 100644
index 5c83ebf..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
+++ /dev/null
@@ -1,186 +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.vcloud.director.v1_5.domain.dmtf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * A vCloud specific {@link ResourceAllocationSettingData} extension.
- */
-@XmlRootElement(name = "Item", namespace = VCLOUD_1_5_NS)
-public class RasdItem extends ResourceAllocationSettingData {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromRasdItem(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends ResourceAllocationSettingData.Builder<Builder<B>>{
-
- private URI href;
- private String type;
- private Set<Link> links = Sets.newLinkedHashSet();
-
- @Override
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see ResourceAllocationSettingData#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return self();
- }
-
- /**
- * @see ResourceAllocationSettingData#getLinks()
- */
- public B link(Link link) {
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- @Override
- public RasdItem build() {
- return new RasdItem(this);
- }
-
- public B fromRasdItem(RasdItem in) {
- return fromResourceAllocationSettingData(in)
- .type(in.getType())
- .href(in.getHref())
- .links(in.getLinks());
- }
- }
-
- @XmlAttribute(name = "type", namespace = VCLOUD_1_5_NS)
- private String type;
- @XmlAttribute(name = "href", namespace = VCLOUD_1_5_NS)
- @XmlSchemaType(name = "anyURI")
- private URI href;
- @XmlElement(name = "Link", namespace = VCLOUD_1_5_NS)
- private Set<Link> links = Sets.newLinkedHashSet();
-
- protected RasdItem(Builder<?> builder) {
- super(builder);
- this.type = builder.type;
- this.href = builder.href;
- this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
- }
-
- protected RasdItem() {
- // for JAXB
- }
-
- /**
- * Contains the URI to the entity.
- *
- * @see ResourceType#getHref()
- */
- public String getType() {
- return type;
- }
-
- /**
- * Contains the type of the the entity.
- *
- * @see ResourceType#getType()
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Set of optional links to an entity or operation associated with this object.
- *
- * @see ResourceType#getLinks()
- */
- public Set<Link> getLinks() {
- return links != null ? ImmutableSet.copyOf(links) : Sets.<Link>newLinkedHashSet();
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("type", type)
- .add("href", href)
- .add("links", links);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), type, href, links);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- RasdItem that = RasdItem.class.cast(obj);
- return super.equals(that)
- && equal(this.type, that.type)
- && equal(this.href, that.href)
- && equal(this.links, that.links);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
deleted file mode 100644
index 3c42188..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
+++ /dev/null
@@ -1,145 +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.vcloud.director.v1_5.domain.dmtf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.dmtf.ovf.internal.BaseVirtualSystem;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "VirtualSystem", namespace = OVF_NS)
-public class VirtualSystem extends BaseVirtualSystem {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromVirtualSystem(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends BaseVirtualSystem.Builder<B> {
-
- private OperatingSystemSection operatingSystem;
- private Set<VirtualHardwareSection> virtualHardwareSections = Sets.newLinkedHashSet();
-
-
- /**
- * @see BaseVirtualSystem#getOperatingSystemSection()
- */
- public B operatingSystemSection(OperatingSystemSection operatingSystem) {
- this.operatingSystem = operatingSystem;
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getVirtualHardwareSections()
- */
- public B virtualHardwareSection(VirtualHardwareSection virtualHardwareSection) {
- this.virtualHardwareSections.add(checkNotNull(virtualHardwareSection, "virtualHardwareSection"));
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getVirtualHardwareSections()
- */
- public B virtualHardwareSections(Iterable<? extends VirtualHardwareSection> virtualHardwareSections) {
- this.virtualHardwareSections = Sets.newLinkedHashSet(checkNotNull(virtualHardwareSections, "virtualHardwareSections"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public VirtualSystem build() {
- return new VirtualSystem(this);
- }
-
- public B fromVirtualSystem(VirtualSystem in) {
- return fromBaseVirtualSystem(in)
- .operatingSystemSection(in.getOperatingSystemSection())
- .virtualHardwareSections(in.getVirtualHardwareSections());
- }
- }
-
- @XmlElement(name = "OperatingSystemSection", namespace = OVF_NS)
- private OperatingSystemSection operatingSystem;
- @XmlElement(name = "VirtualHardwareSection", namespace = OVF_NS)
- private Set<? extends VirtualHardwareSection> virtualHardwareSections;
-
- private VirtualSystem(Builder<?> builder) {
- super(builder);
- this.operatingSystem = checkNotNull(builder.operatingSystem, "operatingSystem");
- this.virtualHardwareSections = ImmutableSet.copyOf(checkNotNull(builder.virtualHardwareSections, "virtualHardwareSections"));
- }
-
- private VirtualSystem() {
- // for JAXB
- }
-
- public OperatingSystemSection getOperatingSystemSection() {
- return operatingSystem;
- }
-
- /**
- * Each VirtualSystem element may contain one or more VirtualHardwareSection elements, each of
- * which describes the virtual virtualHardwareSections required by the virtual system.
- */
- public Set<? extends VirtualHardwareSection> getVirtualHardwareSections() {
- return virtualHardwareSections;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), operatingSystem, virtualHardwareSections);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- VirtualSystem other = (VirtualSystem) obj;
- return super.equals(other)
- && equal(operatingSystem, other.operatingSystem)
- && equal(virtualHardwareSections, other.virtualHardwareSections);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("operatingSystem", operatingSystem)
- .add("virtualHardwareSections", virtualHardwareSections);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java
deleted file mode 100644
index 38968ac..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.dmtf;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
deleted file mode 100644
index 7314721..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
+++ /dev/null
@@ -1,146 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "DhcpService")
-@XmlType(propOrder = {
- "defaultLeaseTime",
- "maxLeaseTime",
- "ipRange"
-})
-public class DhcpService extends NetworkService<DhcpService> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromDhcpService(this);
- }
-
- public static class Builder extends NetworkService.Builder<DhcpService> {
- private int defaultLeaseTime;
- private int maxLeaseTime;
- private IpRange ipRange;
-
- public Builder defaultLeaseTime(int defaultLeaseTime) {
- this.defaultLeaseTime = defaultLeaseTime;
- return this;
- }
-
- public Builder maxLeaseTime(int maxLeaseTime) {
- this.maxLeaseTime = maxLeaseTime;
- return this;
- }
-
- public Builder ipRange(IpRange ipRange) {
- this.ipRange = ipRange;
- return this;
- }
-
- @Override
- public DhcpService build() {
- return new DhcpService(isEnabled, defaultLeaseTime, maxLeaseTime, ipRange);
- }
-
- public Builder fromDhcpService(DhcpService in) {
- return fromNetworkService(in).defaultLeaseTime(in.getDefaultLeaseTime()).maxLeaseTime(in.getMaxLeaseTime())
- .ipRange(in.getIpRange());
- }
-
- public Builder fromNetworkService(NetworkService<DhcpService> in) {
- return Builder.class.cast(super.fromNetworkServiceType(in));
- }
-
- @Override
- public Builder enabled(boolean enabled) {
- this.isEnabled = enabled;
- return this;
- }
- }
-
- @XmlElement(name = "DefaultLeaseTime")
- private int defaultLeaseTime;
- @XmlElement(name = "MaxLeaseTime")
- private int maxLeaseTime;
- @XmlElement(name = "IpRange")
- private IpRange ipRange;
-
- private DhcpService(boolean enabled, int defaultLeaseTime, int maxLeaseTime, IpRange ipRange) {
- super(enabled);
- this.defaultLeaseTime = defaultLeaseTime;
- this.maxLeaseTime = maxLeaseTime;
- this.ipRange = ipRange;
- }
-
- private DhcpService() {
- // for JAXB
- }
-
- /**
- * @return default lease in seconds for DHCP addresses.
- */
- public int getDefaultLeaseTime() {
- return defaultLeaseTime;
- }
-
- /**
- * @return Max lease in seconds for DHCP addresses.
- */
- public int getMaxLeaseTime() {
- return maxLeaseTime;
- }
-
- /**
- * @return IP range for DHCP addresses.
- */
- public IpRange getIpRange() {
- return ipRange;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- DhcpService that = DhcpService.class.cast(o);
- return super.equals(that)
- && equal(defaultLeaseTime, that.defaultLeaseTime)
- && equal(maxLeaseTime, that.maxLeaseTime)
- && equal(ipRange, that.ipRange);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), defaultLeaseTime, maxLeaseTime, ipRange);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string().add("defaultLeastTime", defaultLeaseTime).add("maxLeaseTime", maxLeaseTime).add("ipRange", ipRange);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
deleted file mode 100644
index 9800a03..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
+++ /dev/null
@@ -1,115 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "ExternalNetwork")
-@XmlType(propOrder = {
- "providerInfo"
-})
-public class ExternalNetwork extends Network {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromExternalNetwork(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> extends Network.Builder<T> {
- private String providerInfo;
-
- /**
- * @see ExternalNetwork#getProviderInfo()
- */
- public T providerInfo(String providerInfo) {
- this.providerInfo = providerInfo;
- return self();
- }
-
- @Override
- public ExternalNetwork build() {
- return new ExternalNetwork(this);
- }
-
- public T fromExternalNetwork(ExternalNetwork in) {
- return fromNetwork(in)
- .providerInfo(in.getProviderInfo());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private ExternalNetwork() {
- // For JAXB
- }
-
- private ExternalNetwork(Builder<?> b) {
- super(b);
- providerInfo = b.providerInfo;
- }
-
- @XmlElement(name = "ProviderInfo", required = true)
- protected String providerInfo;
-
- /**
- * Gets the value of the providerInfo property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getProviderInfo() {
- return providerInfo;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ExternalNetwork that = ExternalNetwork.class.cast(o);
- return super.equals(that) && equal(providerInfo, that.providerInfo);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), providerInfo);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("providerInfo", providerInfo);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
deleted file mode 100644
index 13b2e7c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
+++ /dev/null
@@ -1,341 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "FirewallRule", propOrder = {
- "isEnabled",
- "description",
- "policy",
- "protocols",
- "port",
- "destinationIp",
- "sourcePort",
- "sourceIp",
- "direction",
- "enableLogging"
-})
-public class FirewallRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromFirewallRule(this);
- }
-
- public static class Builder {
-
- private Boolean isEnabled;
- private String description;
- private String policy;
- private FirewallRuleProtocols protocols;
- private Integer port;
- private String destinationIp;
- private Integer sourcePort;
- private String sourceIp;
- private String direction;
- private Boolean enableLogging;
-
- /**
- * @see FirewallRule#isEnabled()
- */
- public Builder isEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
-
- /**
- * @see FirewallRule#getDescription()
- */
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * @see FirewallRule#getPolicy()
- */
- public Builder policy(String policy) {
- this.policy = policy;
- return this;
- }
-
- /**
- * @see FirewallRule#getProtocols()
- */
- public Builder protocols(FirewallRuleProtocols protocols) {
- this.protocols = protocols;
- return this;
- }
-
- /**
- * @see FirewallRule#getPort()
- */
- public Builder port(int port) {
- this.port = port;
- return this;
- }
-
- /**
- * @see FirewallRule#getDestinationIp()
- */
- public Builder destinationIp(String destinationIp) {
- this.destinationIp = destinationIp;
- return this;
- }
-
- /**
- * @see FirewallRule#getSourcePort()
- */
- public Builder sourcePort(int sourcePort) {
- this.sourcePort = sourcePort;
- return this;
- }
-
- /**
- * @see FirewallRule#getSourceIp()
- */
- public Builder sourceIp(String sourceIp) {
- this.sourceIp = sourceIp;
- return this;
- }
-
- /**
- * @see FirewallRule#getDirection()
- */
- public Builder direction(String direction) {
- this.direction = direction;
- return this;
- }
-
- /**
- * @see FirewallRule#isEnableLogging()
- */
- public Builder enableLogging(Boolean enableLogging) {
- this.enableLogging = enableLogging;
- return this;
- }
-
- public FirewallRule build() {
- return new FirewallRule(
- isEnabled, description, policy, protocols, port, destinationIp, sourcePort, sourceIp, direction, enableLogging);
- }
-
- public Builder fromFirewallRule(FirewallRule in) {
- return isEnabled(in.isEnabled())
- .description(in.getDescription())
- .policy(in.getPolicy())
- .protocols(in.getProtocols())
- .port(in.getPort())
- .destinationIp(in.getDestinationIp())
- .sourcePort(in.getSourcePort())
- .sourceIp(in.getSourceIp())
- .direction(in.getDirection())
- .enableLogging(in.isEnableLogging());
- }
- }
-
- private FirewallRule(Boolean enabled, String description, String policy, FirewallRuleProtocols protocols, Integer port,
- String destinationIp, Integer sourcePort, String sourceIp, String direction, Boolean enableLogging) {
- isEnabled = enabled;
- this.description = description;
- this.policy = policy;
- this.protocols = protocols;
- this.port = port;
- this.destinationIp = destinationIp;
- this.sourcePort = sourcePort;
- this.sourceIp = sourceIp;
- this.direction = direction;
- this.enableLogging = enableLogging;
- }
-
- private FirewallRule() {
- // For JAXB
- }
-
- @XmlElement(name = "IsEnabled")
- protected Boolean isEnabled;
- @XmlElement(name = "Description")
- protected String description;
- @XmlElement(name = "Policy")
- protected String policy;
- @XmlElement(name = "Protocols")
- protected FirewallRuleProtocols protocols;
- @XmlElement(name = "Port")
- protected Integer port;
- @XmlElement(name = "DestinationIp", required = true)
- protected String destinationIp;
- @XmlElement(name = "SourcePort")
- protected Integer sourcePort;
- @XmlElement(name = "SourceIp", required = true)
- protected String sourceIp;
- @XmlElement(name = "Direction")
- protected String direction;
- @XmlElement(name = "EnableLogging")
- protected Boolean enableLogging;
-
- /**
- * Gets the value of the isEnabled property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Gets the value of the description property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Gets the value of the policy property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getPolicy() {
- return policy;
- }
-
- /**
- * Gets the value of the protocols property.
- *
- * @return possible object is
- * {@link FirewallRuleProtocols }
- */
- public FirewallRuleProtocols getProtocols() {
- return protocols;
- }
-
- /**
- * Gets the value of the port property.
- */
- public int getPort() {
- return port;
- }
-
- /**
- * Gets the value of the destinationIp property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDestinationIp() {
- return destinationIp;
- }
-
- /**
- * Gets the value of the sourcePort property.
- */
- public int getSourcePort() {
- return sourcePort;
- }
-
- /**
- * Gets the value of the sourceIp property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getSourceIp() {
- return sourceIp;
- }
-
- /**
- * Gets the value of the direction property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDirection() {
- return direction;
- }
-
- /**
- * Gets the value of the enableLogging property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isEnableLogging() {
- return enableLogging;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- FirewallRule that = FirewallRule.class.cast(o);
- return equal(isEnabled, that.isEnabled) &&
- equal(description, that.description) &&
- equal(policy, that.policy) &&
- equal(protocols, that.protocols) &&
- equal(port, that.port) &&
- equal(destinationIp, that.destinationIp) &&
- equal(sourcePort, that.sourcePort) &&
- equal(sourceIp, that.sourceIp) &&
- equal(direction, that.direction) &&
- equal(enableLogging, that.enableLogging);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(isEnabled,
- description,
- policy,
- protocols,
- port,
- destinationIp,
- sourcePort,
- sourceIp,
- direction,
- enableLogging);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("isEnabled", isEnabled)
- .add("description", description)
- .add("policy", policy)
- .add("protocols", protocols)
- .add("port", port)
- .add("destinationIp", destinationIp)
- .add("sourcePort", sourcePort)
- .add("sourceIp", sourceIp)
- .add("direction", direction)
- .add("enableLogging", enableLogging).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
deleted file mode 100644
index ade1e18..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
+++ /dev/null
@@ -1,163 +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.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(propOrder = {
- "tcp",
- "udp",
- "icmp",
- "any"
-})
-public class FirewallRuleProtocols {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromProtocols(this);
- }
-
- public static class Builder {
- private Boolean tcp;
- private Boolean udp;
- private Boolean icmp;
- private Boolean any;
-
- public Builder tcp(Boolean tcp) {
- this.tcp = tcp;
- return this;
- }
-
- public Builder udp(Boolean udp) {
- this.udp = udp;
- return this;
- }
-
- public Builder icmp(Boolean icmp) {
- this.icmp = icmp;
- return this;
- }
-
- public Builder any(Boolean any) {
- this.any = any;
- return this;
- }
-
- public Builder fromProtocols(FirewallRuleProtocols in) {
- return tcp(in.isTcp()).udp(in.isUdp()).icmp(in.isIcmp()).any(in.isAny());
- }
-
- public FirewallRuleProtocols build() {
- return new FirewallRuleProtocols(tcp, udp, icmp, any);
- }
- }
-
- @XmlElement(name = "Tcp")
- private Boolean tcp;
- @XmlElement(name = "Udp")
- private Boolean udp;
- @XmlElement(name = "Icmp")
- private Boolean icmp;
- @XmlElement(name = "Any")
- private Boolean any;
-
- private FirewallRuleProtocols(Boolean tcp, Boolean udp, Boolean icmp, Boolean any) {
- this.tcp = tcp;
- this.udp = udp;
- this.icmp = icmp;
- this.any = any;
- }
-
- private FirewallRuleProtocols() {
- // for JAXB
- }
-
- /**
- * Gets the value of the tcp property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isTcp() {
- return tcp;
- }
-
- /**
- * Gets the value of the udp property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isUdp() {
- return udp;
- }
-
- /**
- * Gets the value of the icmp property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isIcmp() {
- return icmp;
- }
-
- /**
- * Gets the value of the any property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isAny() {
- return any;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- FirewallRuleProtocols that = FirewallRuleProtocols.class.cast(o);
- return equal(tcp, that.tcp) &&
- equal(udp, that.udp) &&
- equal(icmp, that.icmp) &&
- equal(any, that.any);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(tcp, udp, icmp, any);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("tcp", tcp)
- .add("udp", udp)
- .add("icmp", icmp)
- .add("any", any).toString();
- }
-}
[08/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiExpectTest.java
deleted file mode 100644
index af0ff6f..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VmApiExpectTest.java
+++ /dev/null
@@ -1,1303 +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.vcloud.director.v1_5.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion;
-import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.MediaInsertOrEjectParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.internal.annotations.Sets;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Multimaps;
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "VmApiExpectTest")
-public class VmApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- private static final String id = "dea05479-d7c1-4710-ba1a-a1a18cd0d455";
- private static final String vmId = "vm-dea05479-d7c1-4710-ba1a-a1a18cd0d455";
- private static final URI vmURI = URI.create(endpoint + "/vApp/" + vmId);
- private static final String vmUrn = "urn:vcloud:vm:" + id;
-
- @BeforeClass
- public void before() {
- }
-
- @Test(enabled = false)//TODO
- public void testGetVm() {
- VCloudDirectorApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId)
- .acceptMedia(VCloudDirectorMediaType.VM)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vm/vm.xml", VCloudDirectorMediaType.VM)
- .httpResponseBuilder().build());
-
- Vm expected = getVm();
-
- assertEquals(api.getVmApi().get(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVm() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId)
- .xmlFilePayload("/vm/editVm.xml", VCloudDirectorMediaType.VM)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vm/modifiedVm.xml", VCloudDirectorMediaType.VM)
- .httpResponseBuilder().build());
-
- Vm modified = getVm();
- modified.setName("new-name");
- modified.setDescription("New Description");
-
- Task expected = editVmTask();
-
- assertEquals(api.getVmApi().edit(vmURI, modified), expected);
- }
-
- @Test(enabled = false)
- public void testRemoveVm() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("DELETE", vmId)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vm/removeVmTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = removeVmTask();
-
- assertEquals(api.getVmApi().remove(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testConsolidateVm() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/consolidate")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vm/consolidateVmTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = consolidateVmTask();
-
- assertEquals(api.getVmApi().consolidate(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testDeploy() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/deploy")
- .xmlFilePayload("/vm/deployParams.xml", VCloudDirectorMediaType.DEPLOY_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/deployTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- DeployVAppParams params = DeployVAppParams.builder()
- .build();
-
- Task expected = deployTask();
-
- assertEquals(api.getVmApi().deploy(vmURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testDiscardSuspendedState() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/discardSuspendedState")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/discardSuspendedStateTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = discardSuspendedStateTask();
-
- assertEquals(api.getVmApi().discardSuspendedState(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testInstallVMwareTools() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/installVMwareTools")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/installVMwareToolsTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = installVMwareToolsTask();
-
- assertEquals(api.getVmApi().installVMwareTools(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testRelocate() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/relocate")
- .xmlFilePayload("/vApp/relocateParams.xml", VCloudDirectorMediaType.RELOCATE_VM_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/relocateTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RelocateParams params = RelocateParams.builder()
- .build();
-
- Task expected = relocateTask();
-
- assertEquals(api.getVmApi().relocate(vmURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testUndeploy() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/undeploy")
- .xmlFilePayload("/vApp/undeployParams.xml", VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/undeployTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- UndeployVAppParams params = UndeployVAppParams.builder()
- .build();
-
- Task expected = undeployTask();
-
- assertEquals(api.getVmApi().undeploy(vmURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testUpgradeHardwareVersion() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/action/upgradeHardwareVersion")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/upgradeHardwareVersionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = upgradeHardwareVersionTask();
-
- assertEquals(api.getVmApi().upgradeHardwareVersion(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testPowerOff() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/power/action/powerOff")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/powerOffTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = powerOffTask();
-
- assertEquals(api.getVmApi().powerOff(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testPowerOn() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/power/action/powerOn")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/powerOnTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = powerOnTask();
-
- assertEquals(api.getVmApi().powerOn(vmURI), expected);
- }
-
- @Test(enabled = true)
- public void testReboot() {
-
- URI vmRebootUri = URI.create(endpoint + "/vApp/" + vmId + "/power/action/reboot");
- HttpRequest vmRebootRequest = HttpRequest.builder()
- .method("POST")
- .endpoint(vmRebootUri)
- .addHeader("Accept", "application/vnd.vmware.vcloud.task+xml")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse vmRebootResponse = HttpResponse.builder()
- .payload(payloadFromResourceWithContentType("/vm/vmRebootTask.xml", VCloudDirectorMediaType.TASK))
- .statusCode(200)
- .build();
-
- VCloudDirectorApi vCloudDirectorApi = requestsSendResponses(
- loginRequest, sessionResponse,
- vmRebootRequest, vmRebootResponse
- );
-
- Task actual = vCloudDirectorApi.getVmApi().reboot(URI.create(endpoint + "/vApp/" + vmId));
-
- Task expected = rebootTask();
-
- assertEquals(actual, expected);
- }
-
- @Test(enabled = false)
- public void testReset() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/power/action/reset")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/resetTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = resetTask();
-
- assertEquals(api.getVmApi().reset(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testShutdown() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/power/action/shutdown")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/shutdownTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = shutdownTask();
-
- assertEquals(api.getVmApi().shutdown(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testSuspend() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/power/action/suspend")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/suspend.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = suspendTask();
-
- assertEquals(api.getVmApi().suspend(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetGuestCustomizationSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/guestCustomizationSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getGuestCustomizationSection.xml", VCloudDirectorMediaType.GUEST_CUSTOMIZATION_SECTION)
- .httpResponseBuilder().build());
-
- GuestCustomizationSection expected = getGuestCustomizationSection();
-
- assertEquals(api.getVmApi().getGuestCustomizationSection(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditGuestCustomizationSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/guestCustomizationSection")
- .xmlFilePayload("/vApp/editGuestCustomizationSection.xml", VCloudDirectorMediaType.GUEST_CUSTOMIZATION_SECTION)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editGuestCustomizationSectionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- GuestCustomizationSection section = getGuestCustomizationSection().toBuilder()
- .build();
-
- Task expected = editGuestCustomizationSectionTask();
-
- assertEquals(api.getVmApi().editGuestCustomizationSection(vmURI, section), expected);
- }
-
- @Test(enabled = false)
- public void testEjectMedia() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/media/action/ejectMedia")
- .xmlFilePayload("/vApp/ejectMediaParams.xml", VCloudDirectorMediaType.MEDIA_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/ejectMediaTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- MediaInsertOrEjectParams params = MediaInsertOrEjectParams.builder()
- .build();
-
- Task expected = ejectMediaTask();
-
- assertEquals(api.getVmApi().ejectMedia(vmURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testInsertMedia() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/media/action/insertMedia")
- .xmlFilePayload("/vApp/insertMediaParams.xml", VCloudDirectorMediaType.MEDIA_PARAMS)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/insertMediaTask.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- MediaInsertOrEjectParams params = MediaInsertOrEjectParams.builder()
- .build();
-
- Task expected = insertMediaTask();
-
- assertEquals(api.getVmApi().insertMedia(vmURI, params), expected);
- }
-
- @Test(enabled = false)
- public void testGetNetworkConnectionSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/networkConnectionSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getNetworkConnectionSection.xml", VCloudDirectorMediaType.NETWORK_CONNECTION_SECTION)
- .httpResponseBuilder().build());
-
- NetworkConnectionSection expected = getNetworkConnectionSection();
-
- assertEquals(api.getVmApi().getNetworkConnectionSection(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditNetworkConnectionSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/networkConnectionSection")
- .xmlFilePayload("/vApp/editNetworkConnectionSection.xml", VCloudDirectorMediaType.NETWORK_CONNECTION_SECTION)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editNetworkConnectionSectionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- NetworkConnectionSection section = getNetworkConnectionSection().toBuilder()
- .build();
-
- Task expected = editNetworkConnectionSectionTask();
-
- assertEquals(api.getVmApi().editNetworkConnectionSection(vmURI, section), expected);
- }
-
- @Test(enabled = false)
- public void testGetOperatingSystemSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/operatingSystemSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getOperatingSystemSection.xml", VCloudDirectorMediaType.OPERATING_SYSTEM_SECTION)
- .httpResponseBuilder().build());
-
- OperatingSystemSection expected = getOperatingSystemSection();
-
- assertEquals(api.getVmApi().getOperatingSystemSection(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditOperatingSystemSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/operatingSystemSection")
- .xmlFilePayload("/vApp/editOperatingSystemSection.xml", VCloudDirectorMediaType.OPERATING_SYSTEM_SECTION)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editOperatingSystemSectionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- OperatingSystemSection section = getOperatingSystemSection().toBuilder()
- .build();
-
- Task expected = editOperatingSystemSectionTask();
-
- assertEquals(api.getVmApi().editOperatingSystemSection(vmURI, section), expected);
- }
-
- @Test(enabled = false)
- public void testGetProductSections() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/productSections")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getProductSections.xml", VCloudDirectorMediaType.PRODUCT_SECTION_LIST)
- .httpResponseBuilder().build());
-
- ProductSectionList expected = getProductSections();
-
- assertEquals(api.getVmApi().getProductSections(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditProductSections() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/productSections")
- .xmlFilePayload("/vApp/editProductSections.xml", VCloudDirectorMediaType.PRODUCT_SECTION_LIST)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editProductSections.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- Task expected = editProductSectionsTask();
-
- assertEquals(api.getVmApi().editProductSections(vmURI, null), expected);
- }
-
- @Test(enabled = false)
- public void testGetPendingQuestion() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/question")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getPendingQuestion.xml", VCloudDirectorMediaType.VM_PENDING_QUESTION)
- .httpResponseBuilder().build());
-
- VmPendingQuestion expected = getPendingQuestion();
-
- assertEquals(api.getVmApi().getPendingQuestion(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testAnswerQuestion() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/question/action/answer")
- .xmlFilePayload("/vApp/answerQuestion.xml", VCloudDirectorMediaType.VM_PENDING_ANSWER)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder().statusCode(204).build());
-
- VmQuestionAnswer answer = null; // = VmQuestionAnswer.builder();
-// .build;
-
- api.getVmApi().answerQuestion(vmURI, answer);
- }
-
- @Test(enabled = false)
- public void testGetRuntimeInfoSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/runtimeInfoSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getRuntimeInfoSection.xml", VCloudDirectorMediaType.RUNTIME_INFO_SECTION)
- .httpResponseBuilder().build());
-
- RuntimeInfoSection expected = getRuntimeInfoSection();
-
- assertEquals(api.getVmApi().getRuntimeInfoSection(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetScreenImage() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/screen")
- .acceptMedia(VCloudDirectorMediaType.ANY_IMAGE)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .httpResponseBuilder()
- .headers(Multimaps.forMap(ImmutableMap.of("Content-Type", "image/png")))
- .message(new String(getScreenImage()))
- .build());
-
- byte[] expected = getScreenImage();
-
- assertEquals(api.getVmApi().getScreenImage(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetScreenTicket() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", vmId + "/screen/action/acquireTicket")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getScreenTicket.xml", VCloudDirectorMediaType.SCREEN_TICKET)
- .httpResponseBuilder().build());
-
- ScreenTicket expected = getScreenTicket();
-
- assertEquals(api.getVmApi().getScreenTicket(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetVirtualHardwareSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/virtualHardwareSection")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getVirtualHardwareSection.xml", VCloudDirectorMediaType.VIRTUAL_HARDWARE_SECTION)
- .httpResponseBuilder().build());
-
- VirtualHardwareSection expected = getVirtualHardwareSection();
-
- assertEquals(api.getVmApi().getVirtualHardwareSection(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVirtualHardwareSection() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/virtualHardwareSection")
- .xmlFilePayload("/vApp/editVirtualHardwareSection.xml", VCloudDirectorMediaType.VIRTUAL_HARDWARE_SECTION)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editVirtualHardwareSectionTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- VirtualHardwareSection section = getVirtualHardwareSection().toBuilder()
- .build();
-
- Task expected = editVirtualHardwareSectionTask();
-
- assertEquals(api.getVmApi().editVirtualHardwareSection(vmURI, section), expected);
- }
-
- @Test(enabled = false)
- public void testGetVirtualHardwareSectionCpu() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/virtualHardwareSection/cpu")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getVirtualHardwareSectionCpu.xml", VCloudDirectorMediaType.OVF_RASD_ITEM)
- .httpResponseBuilder().build());
-
- RasdItem expected = getVirtualHardwareSectionCpu();
-
- assertEquals(api.getVmApi().getVirtualHardwareSectionCpu(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVirtualHardwareSectionCpu() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("", vmId + "/virtualHardwareSection/cpu")
- .xmlFilePayload("/vApp/editVirtualHardwareSectionCpu.xml", VCloudDirectorMediaType.OVF_RASD_ITEM)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editVirtualHardwareSectionCpuTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RasdItem cpu = getVirtualHardwareSectionCpu(); // .toBuilder();
-// .build();
-
- Task expected = editVirtualHardwareSectionCpuTask();
-
- assertEquals(api.getVmApi().editVirtualHardwareSectionCpu(vmURI, cpu), expected);
- }
-
- @Test(enabled = false)
- public void testGetVirtualHardwareSectionDisks() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/virtualHardwareSection/disks")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getVirtualHardwareSectionDisks.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST)
- .httpResponseBuilder().build());
-
- RasdItemsList expected = getVirtualHardwareSectionDisks();
-
- assertEquals(api.getVmApi().getVirtualHardwareSectionDisks(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVirtualHardwareSectionDisks() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/virtualHardwareSection/disks")
- .xmlFilePayload("/vApp/editVirtualHardwareSectionDisks.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editVirtualHardwareSectionDisksTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RasdItemsList disks = getVirtualHardwareSectionDisks().toBuilder()
- .build();
-
- Task expected = editVirtualHardwareSectionDisksTask();
-
- assertEquals(api.getVmApi().editVirtualHardwareSectionDisks(vmURI, disks), expected);
- }
-
- @Test(enabled = false)
- public void testGetVirtualHardwareSectionMedia() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/virtualHardwareSection/media")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getVirtualHardwareSectionMedia.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST)
- .httpResponseBuilder().build());
-
- RasdItemsList expected = getVirtualHardwareSectionMedia();
-
- assertEquals(api.getVmApi().getVirtualHardwareSectionMedia(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testGetVirtualHardwareSectionMemory() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/virtualHardwareSection/memory")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getVirtualHardwareSectionMemory.xml", VCloudDirectorMediaType.OVF_RASD_ITEM)
- .httpResponseBuilder().build());
-
- RasdItem expected = getVirtualHardwareSectionMemory();
-
- assertEquals(api.getVmApi().getVirtualHardwareSectionMemory(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVirtualHardwareSectionMemory() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/virtualHardwareSection/memory")
- .xmlFilePayload("/vApp/editVirtualHardwareSectionMemory.xml", VCloudDirectorMediaType.VAPP)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editVirtualHardwareSectionMemoryTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RasdItem memory = getVirtualHardwareSectionCpu(); // .toBuilder();
-// .build();
-
- Task expected = editVirtualHardwareSectionMemoryTask();
-
- assertEquals(api.getVmApi().editVirtualHardwareSectionMemory(vmURI, memory), expected);
- }
-
- @Test(enabled = false)
- public void testGetVirtualHardwareSectionNetworkCards() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/virtualHardwareSection/networkCards")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getVirtualHardwareSectionNetworkCards.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST)
- .httpResponseBuilder().build());
-
- RasdItemsList expected = getVirtualHardwareSectionNetworkCards();
-
- assertEquals(api.getVmApi().getVirtualHardwareSectionNetworkCards(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVirtualHardwareSectionNetworkCards() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/virtualHardwareSection/networkCards")
- .xmlFilePayload("/vApp/editVirtualHardwareSectionNetworkCards.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editVirtualHardwareSectionNetworkCardsTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RasdItemsList networkCards = getVirtualHardwareSectionNetworkCards().toBuilder()
- .build();
-
- Task expected = editVirtualHardwareSectionNetworkCardsTask();
-
- assertEquals(api.getVmApi().editVirtualHardwareSectionNetworkCards(vmURI, networkCards), expected);
- }
-
- @Test(enabled = false)
- public void testGetVirtualHardwareSectionSerialPorts() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", vmId + "/virtualHardwareSection/serialPorts")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/getVirtualHardwareSectionSerialPorts.xml", VCloudDirectorMediaType.VAPP)
- .httpResponseBuilder().build());
-
- RasdItemsList expected = getVirtualHardwareSectionSerialPorts();
-
- assertEquals(api.getVmApi().getVirtualHardwareSectionSerialPorts(vmURI), expected);
- }
-
- @Test(enabled = false)
- public void testEditVirtualHardwareSectionSerialPorts() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", vmId + "/virtualHardwareSection/serialPorts")
- .xmlFilePayload("/vApp/editVirtualHardwareSectionSerialPorts.xml", VCloudDirectorMediaType.OVF_RASD_ITEMS_LIST)
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/vApp/editVirtualHardwareSectionSerialPortsTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- RasdItemsList serialPorts = getVirtualHardwareSectionSerialPorts().toBuilder()
- .build();
-
- Task expected = editVirtualHardwareSectionSerialPortsTask();
-
- assertEquals(api.getVmApi().editVirtualHardwareSectionSerialPorts(vmURI, serialPorts), expected);
- }
-
- public static Vm getVm() {
- // FIXME Does not match XML
- Vm vm = Vm.builder()
- .href(URI.create("https://mycloud.greenhousedata.com/api/vApp/vm-d0e2b6b9-4381-4ddc-9572-cdfae54059be"))
-// .link(Link.builder()
-// .href(URI.create())
-// .build())
- .build();
-
-// <Link rel="power:powerOn" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/power/action/powerOn"/>
-// <Link rel="deploy" type="application/vnd.vmware.vcloud.deployVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/deploy"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.vAppNetwork+xml" name="orgNet-cloudsoft-External" href="https://mycloud.greenhousedata.com/api/network/2a2e2da4-446a-4ebc-a086-06df7c9570f0"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/controlAccess/"/>
-// <Link rel="controlAccess" type="application/vnd.vmware.vcloud.controlAccess+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/controlAccess"/>
-// <Link rel="recompose" type="application/vnd.vmware.vcloud.recomposeVAppParams+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/action/recomposeVApp"/>
-// <Link rel="up" type="application/vnd.vmware.vcloud.vdc+xml" href="https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"/>
-// <Link rel="edit" type="application/vnd.vmware.vcloud.vApp+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="remove" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.owner+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/owner"/>
-// <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://mycloud.greenhousedata.com/api/vApp/vapp-d0e2b6b9-4381-4ddc-9572-cdfae54059be/metadata"/>
-
- return vm;
- }
-
- public static Task editVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task removeVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task consolidateVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams controlAccessParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static Task deployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task discardSuspendedStateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task installVMwareToolsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task recomposeVmTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task relocateTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task undeployTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task upgradeHardwareVersionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOffTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task powerOnTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task rebootTask() {
- return Task.builder()
- .id("urn:vcloud:task:8d188b18-c2dd-4e29-a1b2-118e5f6a8276")
- .name("task")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/8d188b18-c2dd-4e29-a1b2-118e5f6a8276"))
- .link(Link.builder()
- .rel(Link.Rel.TASK_CANCEL)
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/8d188b18-c2dd-4e29-a1b2-118e5f6a8276/action/cancel"))
- .build())
- .org(Reference.builder()
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/4559b367-8af2-4ee1-8429-a0d39e7df3de"))
- .name("jclouds")
- .type(VCloudDirectorMediaType.ORG)
- .build())
- .operation("Rebooting Virtual Machine ubuntu(dea05479-d7c1-4710-ba1a-a1a18cd0d455)")
- .operationName("vappRebootGuest")
- .progress(0)
- .startTime(dateService.cDateParse("Wed Nov 21 08:51:42 EST 2012"))
- .expiryTime(dateService.cDateParse("Tue Feb 19 08:51:42 EST 2013"))
- .status(Task.Status.RUNNING)
- .type(VCloudDirectorMediaType.TASK)
- .build();
- }
-
- public static Task resetTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task shutdownTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task suspendTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ControlAccessParams getAccessControlParams() {
- ControlAccessParams params = ControlAccessParams.builder()
- .build();
-
- return params;
- }
-
- public static GuestCustomizationSection getGuestCustomizationSection() {
- GuestCustomizationSection section = GuestCustomizationSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editGuestCustomizationSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static LeaseSettingsSection getLeaseSettingsSection() {
- LeaseSettingsSection section = LeaseSettingsSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editLeaseSettingsSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task ejectMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Task insertMediaTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConfigSection getNetworkConfigSection() {
- NetworkConfigSection section = NetworkConfigSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConfigSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkConnectionSection getNetworkConnectionSection() {
- NetworkConnectionSection section = NetworkConnectionSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editNetworkConnectionSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static NetworkSection getNetworkSection() {
- NetworkSection section = NetworkSection.builder()
- .build();
-
- return section;
- }
-
- public static OperatingSystemSection getOperatingSystemSection() {
- OperatingSystemSection section = OperatingSystemSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editOperatingSystemSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static Owner getOwner() {
- Owner owner = Owner.builder()
- .build();
-
- return owner;
- }
-
- public static Task editOwnerTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static ProductSectionList getProductSections() {
- ProductSectionList sectionItems = ProductSectionList.builder()
- .build();
-
- return sectionItems;
- }
-
- public static Task editProductSectionsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VmPendingQuestion getPendingQuestion() {
- VmPendingQuestion question = VmPendingQuestion.builder()
- .build();
-
- return question;
- }
-
- public static VmQuestionAnswer answerQuestion() {
- VmQuestionAnswer answer = null; // = VmQuestionAnswer.builder()
-// .build();
-
- return answer;
- }
-
- public static RuntimeInfoSection getRuntimeInfoSection() {
- RuntimeInfoSection section = RuntimeInfoSection.builder()
- .build();
-
- return section;
- }
-
- public static byte[] getScreenImage() {
- byte[] image = new byte[0];
-
- return image;
- }
-
- public static ScreenTicket getScreenTicket() {
- ScreenTicket ticket = null; // = ScreenTicket.builder();
-// .build();
-
- return ticket;
- }
-
- public static StartupSection getStartupSection() {
- StartupSection section = null; // = StartupSection.builder();
-// .build();
-
- return section;
- }
-
- public static Task editStartupSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static VirtualHardwareSection getVirtualHardwareSection() {
- VirtualHardwareSection section = VirtualHardwareSection.builder()
- .build();
-
- return section;
- }
-
- public static Task editVirtualHardwareSectionTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItem getVirtualHardwareSectionCpu() {
- RasdItem cpu = RasdItem.builder()
- .build();
-
- return cpu;
- }
-
- public static Task editVirtualHardwareSectionCpuTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionDisks() {
- RasdItemsList disks = RasdItemsList.builder()
- .build();
-
- return disks;
- }
-
- public static Task editVirtualHardwareSectionDisksTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionMedia() {
- RasdItemsList media = RasdItemsList.builder()
- .build();
-
- return media;
- }
-
- public static RasdItem getVirtualHardwareSectionMemory() {
- RasdItem memory = RasdItem.builder()
- .build();
-
- return memory;
- }
-
- public static Task editVirtualHardwareSectionMemoryTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionNetworkCards() {
- RasdItemsList networkCards = RasdItemsList.builder()
- .build();
-
- return networkCards;
- }
-
- public static Task editVirtualHardwareSectionNetworkCardsTask() {
- Task task = Task.builder()
- .build();
-
- return task;
- }
-
- public static RasdItemsList getVirtualHardwareSectionSerialPorts() {
- RasdItemsList serialPorts = RasdItemsList.builder()
- .build();
-
- return serialPorts;
- }
-
- public static Task editVirtualHardwareSectionSerialPortsTask() {
- return task("id", "name", "description", "status", "operation", "operationName", "startTime");
- }
-
- /** Used by other methods to add a custom {@link Task} object. */
- private static Task task(String taskId, String name, String description, String status, String operation, String operationName, String startTime) {
- Task task = Task.builder()
- .error(Error.builder().build())
- .org(Reference.builder().build())
- .owner(Reference.builder().build())
- .user(Reference.builder().build())
- .params(null)
- .progress(0)
- .status(status)
- .operation(operation)
- .operationName(operationName)
- .startTime(dateService.iso8601DateParse(startTime))
- .endTime(null)
- .expiryTime(null)
- .tasks(Sets.<Task>newLinkedHashSet())
- .description(description)
- .name(name)
- .id("urn:vcloud:" + taskId)
- .href(URI.create(endpoint + "/task/" + taskId))
- .links(Sets.<Link>newLinkedHashSet())
- .build();
-
- return task;
- }
-}
[14/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java
deleted file mode 100644
index 8dd2080..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java
+++ /dev/null
@@ -1,1493 +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.vcloud.director.v1_5.domain;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CONDITION_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.MAC_ADDRESS_PATTERN;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.MATCHES_STRING_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.MUST_BE_WELL_FORMED_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.MUST_CONTAIN_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_EMPTY_STRING_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_NULL_OBJ_FIELD_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_NULL_OBJ_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_DEL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_ATTRB_REQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_GTE_0;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_GTE_1;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_REQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REQUIRED_VALUE_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REQUIRED_VALUE_OBJECT_FMT;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.VirtualSystemSettingData;
-import org.jclouds.dmtf.ovf.Disk;
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.dmtf.ovf.environment.EnvironmentType;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.VirtualSystem;
-import org.jclouds.vcloud.director.v1_5.domain.network.ExternalNetwork;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRange;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpScope;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkService;
-import org.jclouds.vcloud.director.v1_5.domain.network.RouterInfo;
-import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings;
-import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg;
-import org.jclouds.vcloud.director.v1_5.domain.org.CustomOrgLdapSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.CustomOrgLdapSettings.AuthenticationMechanism;
-import org.jclouds.vcloud.director.v1_5.domain.org.CustomOrgLdapSettings.ConnectorType;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapGroupAttributes;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings.LdapMode;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapUserAttributes;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.query.Container;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecord;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-
-import com.beust.jcommander.internal.Maps;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.net.InetAddresses;
-
-public class Checks {
-
- public static void checkResourceEntityType(ResourceEntity resourceEntity) {
- checkResourceEntityType(resourceEntity, true);
- }
-
- public static void checkResourceEntityType(ResourceEntity resourceEntity, boolean ready) {
- // Check optional fields
- // NOTE status cannot be checked (TODO: doesn't status have a range of valid values?)
- Set<File> files = resourceEntity.getFiles();
- if (files != null && !files.isEmpty()) {
- for (File file : files) checkFile(file, ready);
- }
-
- // Check parent type
- checkEntityType(resourceEntity);
- }
-
- public static void checkEntityType(Entity entity) {
- // Check required fields
- assertNotNull(entity.getName(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Name", "EntityType"));
-
- // Check optional fields
- // NOTE description cannot be checked
- List<Task> tasks = entity.getTasks();
- if (tasks != null && tasks != null && !tasks.isEmpty()) {
- for (Task task : tasks) checkTask(task);
- }
-
- // Check parent type
- checkResource(entity);
- }
-
- /**
- * Assumes the validTypes to be vcloud-specific types.
- *
- * @see #checkReferenceType(Reference, Collection)
- */
- public static void checkReferenceType(Reference reference) {
- checkReferenceType(reference, VCloudDirectorMediaType.ALL);
- }
-
- /**
- * @see #checkReferenceType(Reference, Collection)
- */
- public static void checkReferenceType(Reference reference, String type) {
- checkReferenceType(reference, ImmutableSet.of(type));
- }
-
- public static void checkReferenceType(Reference reference, Collection<String> validTypes) {
- // Check required fields
- assertNotNull(reference.getHref(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Href", "ReferenceType"));
-
- // Check optional fields
- String type = reference.getType();
- if (type != null) checkType(type, validTypes);
- // NOTE name cannot be checked
- }
-
- /**
- * Assumes the validTypes to be vcloud-specific types.
- *
- * @see #checkResource(Resource, Collection)
- */
- public static void checkResource(Resource resource) {
- checkResource(resource, VCloudDirectorMediaType.ALL);
- }
-
- /**
- * @see #checkResource(Resource, Collection)
- */
- public static void checkResource(Resource resource, String type) {
- checkResource(resource, ImmutableSet.of(type));
- }
-
- public static void checkResource(Resource resource, Collection<String> validTypes) {
- // Check optional fields
- URI href = resource.getHref();
- if (href != null) checkHref(href);
- String type = resource.getType();
- if (type != null) checkType(type, validTypes);
- Set<Link> links = resource.getLinks();
- if (links != null && !links.isEmpty()) {
- for (Link link : links) checkLink(link);
- }
- }
-
- public static void checkId(String id) {
- Iterable<String> parts = Splitter.on(':').split(id);
- assertEquals(Iterables.size(parts), 4, String.format(MUST_BE_WELL_FORMED_FMT, "Id", id));
- assertEquals(Iterables.get(parts, 0), "urn", String.format(MUST_CONTAIN_FMT, "Id", "urn", id));
- assertEquals(Iterables.get(parts, 1), "vcloud", String.format(MUST_CONTAIN_FMT, "Id", "vcloud", id));
- try {
- UUID.fromString(Iterables.get(parts, 3));
- } catch (IllegalArgumentException iae) {
- fail(String.format(MUST_BE_WELL_FORMED_FMT, "Id", id));
- }
- }
-
- public static void checkType(String type) {
- checkType(type, VCloudDirectorMediaType.ALL);
- }
-
- public static void checkType(String type, Collection<String> validTypes) {
- assertTrue(validTypes.contains(type), String.format(REQUIRED_VALUE_FMT, "Type", type, Iterables.toString(validTypes)));
- }
-
- // NOTE this does not currently check anything
- public static void checkHref(URI href) {
- String uri = href.toASCIIString();
- String auth = href.getAuthority();
- String host = href.getHost();
- String path = href.getPath();
- // TODO inject the endpoint of the provider here for rudimentary checks as below
- // assertEquals(auth + "://" + host + path, endpoint, "The Href must contain the provider endpoint");
- // assertTrue(uri.startsWith(endpoint), "The Href must contain the provider endpoint");
- }
-
- public static void checkLink(Link link) {
- // Check required fields
- assertNotNull(link.getRel(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Rel", "Link"));
- assertTrue(Link.Rel.ALL.contains(link.getRel()), String.format(REQUIRED_VALUE_OBJECT_FMT, "Rel", "Link", link.getRel(), Iterables.toString(Link.Rel.ALL)));
-
- // Check parent type
- checkReferenceType(link);
- }
-
- public static void checkTask(Task task) {
- // Check required fields
- assertNotNull(task.getStatus(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Status", "Task"));
- assertTrue(Task.Status.ALL.contains(task.getStatus()), String.format(REQUIRED_VALUE_OBJECT_FMT, "Status", "Task", task.getStatus(), Iterables.toString(Task.Status.ALL)));
-
- // Check optional fields
- // NOTE operation cannot be checked
- // NOTE operationName cannot be checked
- // NOTE startTime cannot be checked
- // NOTE endTime cannot be checked
- // NOTE expiryTimecannot be checked
- Reference owner = task.getOwner();
- if (owner != null) checkReferenceType(owner);
- Error error = task.getError();
- if (error != null) checkError(error);
- Reference user = task.getUser();
- if (user != null) checkReferenceType(user);
- Reference org = task.get();
- if (org != null) checkReferenceType(org);
- Integer progress = task.getProgress();
- if (progress != null) checkProgress(progress);
- // NOTE params cannot be checked
-
- // Check parent type
- checkEntityType(task);
- }
-
- public static void checkFile(File file) {
- checkFile(file, true);
- }
-
- public static void checkFile(File file, boolean checkSize) {
- // Check optional fields
- // NOTE checksum be checked
- Long size = file.getSize();
- if (size != null && checkSize) {
- assertTrue(size >= 0, "File size must be greater than or equal to 0, but was " + size);
- }
- Long bytesTransferred = file.getBytesTransferred();
- if (bytesTransferred != null) {
- assertTrue(bytesTransferred >= 0, "Bytes transferred must be greater than or equal to 0");
- }
-
- // Check parent type
- checkEntityType(file);
- }
-
- public static void checkMetadata(Metadata metadata) {
- Set<MetadataEntry> metadataEntries = metadata.getMetadataEntries();
- if (metadataEntries != null && !metadataEntries.isEmpty()) {
- for (MetadataEntry metadataEntry : metadataEntries) {
- checkMetadataEntry(metadataEntry);
- }
- }
-
- // Check parent type
- checkResource(metadata);
- }
-
- public static void checkMetadataEntry(MetadataEntry metadataEntry) {
- // Check required fields
- assertNotNull(metadataEntry.getKey(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Key", "MetadataEntry"));
- assertNotNull(metadataEntry.getValue(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Value", "MetadataEntry"));
-
- // Check parent type
- checkResource(metadataEntry);
- }
-
- public static void checkProgress(Integer progress) {
- assertTrue(progress >= 0 && progress <= 100, String.format(CONDITION_FMT, "Progress", "between 0 and 100", Integer.toString(progress)));
- }
-
- public static void checkError(Error error) {
- // Check required fields
- assertNotNull(error.getMessage(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Message", "Error"));
- assertNotNull(error.getMajorErrorCode(), String.format(NOT_NULL_OBJ_FIELD_FMT, "MajorErrorCode", "Error"));
- assertNotNull(error.getMinorErrorCode(), String.format(NOT_NULL_OBJ_FIELD_FMT, "MinorErrorCode", "Error"));
-
- // NOTE vendorSpecificErrorCode cannot be checked
- // NOTE stackTrace cannot be checked
- }
-
- public static void checkOrg(Org org) {
- // Check required elements and attributes
- assertNotNull(org.getFullName(), String.format(NOT_NULL_OBJ_FIELD_FMT, "FullName", "Org"));
-
- // Check parent type
- checkEntityType(org);
- }
-
- public static void checkAdminOrg(AdminOrg org) {
- // required
- assertNotNull(org.getSettings(), String.format(NOT_NULL_OBJ_FIELD_FMT, "settings", "AdminOrg"));
- checkResource(org, VCloudDirectorMediaType.ADMIN_ORG);
-
- // optional
- for (Reference user : org.getUsers()) {
- checkReferenceType(user, VCloudDirectorMediaType.ADMIN_USER);
- }
- for (Reference group : org.getGroups()) {
- checkReferenceType(group, VCloudDirectorMediaType.GROUP);
- }
- for (Reference catalog : org.getCatalogs()) {
- checkReferenceType(catalog, VCloudDirectorMediaType.ADMIN_CATALOG);
- }
- for (Reference vdc : org.getVdcs()) {
- checkReferenceType(vdc, VCloudDirectorMediaType.VDC);
- }
- for (Reference network : org.getNetworks()) {
- checkReferenceType(network, VCloudDirectorMediaType.ADMIN_NETWORK);
- }
-
- // Check parent type
- checkOrg(org);
- }
-
- public static void checkAdminCatalog(AdminCatalog catalog) {
- // Check parent type
- checkCatalogType(catalog);
- }
-
- public static void checkCatalogType(Catalog catalog) {
- // Check optional elements/attributes
- Owner owner = catalog.getOwner();
- if (owner != null) checkOwner(owner);
- for (Reference catalogItemReference : catalog.getCatalogItems()) {
- checkReferenceType(catalogItemReference, VCloudDirectorMediaType.CATALOG_ITEM);
- }
- // NOTE isPublished cannot be checked
-
- // Check parent type
- checkEntityType(catalog);
- }
-
- public static void checkOwner(Owner owner) {
- // Check optional elements/attributes
- if (owner.getUser() != null) {
- checkReferenceType(owner.getUser());
- }
-
- // Check parent type
- checkResource(owner);
- }
-
- public static void checkCatalogItem(CatalogItem catalogItem) {
- // Check parent type
- checkEntityType(catalogItem);
- }
-
- public static void checkNetwork(Network network) {
- // Check optional fields
- NetworkConfiguration config = network.getConfiguration();
- if (config != null) {
- checkNetworkConfiguration(config);
- }
-
- // Check parent type
- checkEntityType(network);
- }
-
- public static void checkNetworkConfiguration(NetworkConfiguration config) {
- // required
- assertNotNull(config.getFenceMode(), String.format(OBJ_FIELD_REQ,
- "NetworkConfiguration", "fenceMode"));
- assertTrue(Network.FenceMode.ALL.contains(config.getFenceMode()), String.format(REQUIRED_VALUE_OBJECT_FMT,
- "fenceMode", "NetworkConfiguration", config.getFenceMode(), Iterables.toString(Network.FenceMode.ALL)));
-
- // Check optional fields
- // NOTE retainNetInfoAcrossDeployments cannot be checked
- if (config.getIpScope() != null) {
- checkIpScope(config.getIpScope());
- }
- if (config.getParentNetwork() != null) {
- checkReferenceType(config.getParentNetwork());
- }
- if (config.getNetworkFeatures() != null) {
- checkNetworkFeatures(config.getNetworkFeatures());
- }
- if (config.getSyslogServerSettings() != null) {
- checkSyslogServerSettings(config.getSyslogServerSettings());
- }
- if (config.getRouterInfo() != null) {
- checkRouterInfo(config.getRouterInfo());
- }
- }
-
- public static void checkIpScope(IpScope ipScope) {
- // Check required fields
- assertNotNull(ipScope.isInherited(), "isInherited attribute of IpScope must be set");
-
- // Check optional fields
- // NOTE dnsSuffix cannot be checked
- if (ipScope.getGateway() != null) {
- checkIpAddress(ipScope.getGateway());
- }
- if (ipScope.getNetmask() != null) {
- checkIpAddress(ipScope.getNetmask());
- }
- if (ipScope.getDns1() != null) {
- checkIpAddress(ipScope.getDns1());
- }
- if (ipScope.getDns2() != null) {
- checkIpAddress(ipScope.getDns2());
- }
- if (ipScope.getIpRanges() != null) {
- checkIpRanges(ipScope.getIpRanges());
- }
- if (ipScope.getAllocatedIpAddresses() != null) {
- checkIpAddresses(ipScope.getAllocatedIpAddresses());
- }
- }
-
- public static void checkNetworkFeatures(NetworkFeatures features) {
- // Check optional fields
- if (features.getNetworkServices() != null) {
- for (NetworkService<?> service : features.getNetworkServices()) {
- checkNetworkService(service);
- }
- }
- }
-
- public static void checkSyslogServerSettings(SyslogServerSettings settings) {
- // Check optional fields
- if (settings.getSyslogServerIp1() != null) {
- checkIpAddress(settings.getSyslogServerIp1());
- }
- if (settings.getSyslogServerIp2() != null) {
- checkIpAddress(settings.getSyslogServerIp2());
- }
-
- }
-
- public static void checkRouterInfo(RouterInfo routerInfo) {
- // Check required fields
- assertNotNull(routerInfo.getExternalIp(), "The external IP attribute of a Router Info must be set");
- checkIpAddress(routerInfo.getExternalIp());
- }
-
- public static void checkNetworkService(NetworkService service) {
- // NOTE isEnabled cannot be checked
- }
-
- public static void checkIpRanges(IpRanges ipRanges) {
- // Check optional fields
- for (IpRange range : ipRanges.getIpRanges()) {
- checkIpRange(range);
- }
- }
-
- public static void checkIpRange(IpRange range) {
- // Check required fields
- assertNotNull(range.getStartAddress(), "The start address attribute of an IP Range must be set");
- checkIpAddress(range.getStartAddress());
-
- assertNotNull(range.getEndAddress(), "The end address attribute of an IP Range must be set");
- checkIpAddress(range.getEndAddress());
- }
-
- public static void checkIpAddresses(IpAddresses ipAddresses) {
- // Check optional fields
- for (String address : ipAddresses.getIpAddresses()) {
- checkIpAddress(address);
- }
- }
-
- public static void checkIpAddress(String ip) {
- // Check the string is a valid IP address
- assertTrue(InetAddresses.isInetAddress(ip), String.format(CONDITION_FMT, "IpAddress", "a valid IP address", ip));
- }
-
- public static void checkMacAddress(String macAddress) {
- // Check the string is a valid MAC address
- assertNotNull(macAddress, String.format(NOT_EMPTY_STRING_FMT, "macAddress"));
- assertTrue(macAddress.matches(MAC_ADDRESS_PATTERN), String.format(MATCHES_STRING_FMT, "macAddress", MAC_ADDRESS_PATTERN, macAddress));
- }
-
- public static void checkComputeCapacity(ComputeCapacity computeCapacity) {
- // Check required fields
- assertNotNull(computeCapacity.getCpu(), "The cpu attribute of a ComputeCapacity must be set");
- checkCapacityWithUsage(computeCapacity.getCpu());
-
- assertNotNull(computeCapacity.getMemory(), "The memory attribute of a ComputeCapacity must be set");
- checkCapacityWithUsage(computeCapacity.getMemory());
- }
-
- public static void checkCapacityWithUsage(CapacityWithUsage capacityWithUsage) {
- // Check optional fields
- if (capacityWithUsage.getUsed() != null) {
- assertTrue(capacityWithUsage.getUsed() >= 0, "used must be greater than or equal to 0");
- }
- if (capacityWithUsage.getOverhead() != null) {
- assertTrue(capacityWithUsage.getOverhead() >= 0, "overhead must be greater than or equal to 0");
- }
-
- // Check parent type
- checkCapacityType(capacityWithUsage);
- }
-
- public static void checkCapacityType(Capacity<?> capacity) {
- // Check required fields
- assertNotNull(capacity.getUnits(), "The unit attribute of a CapacityWithUsage must be set");
-
- assertNotNull(capacity.getLimit(), "The limit attribute of a CapacityWithUsage must be set");
- assertTrue(capacity.getLimit() >= 0, "Limit must be greater than or equal to 0");
-
- // Check optional fields
- if (capacity.getAllocated() != null) {
- assertTrue(capacity.getAllocated() >= 0, "allocated must be greater than or equal to 0");
- }
- }
-
- public static void checkCapabilities(Capabilities capabilities) {
- // Check optional fields
- for (String supportedHardwareVersion : capabilities.getSupportedHardwareVersions()) {
- // NOTE supportedHardwareVersion cannot be checked?
- }
- }
-
- public static void checkMetadataFor(String api, Metadata metadata) {
- for (MetadataEntry entry : metadata.getMetadataEntries()) {
- // Check required fields
- assertNotNull(entry.getKey(),
- String.format(OBJ_FIELD_ATTRB_REQ, api, "MetadataEntry", entry.getKey(), "key"));
- assertNotNull(entry.getValue(),
- String.format(OBJ_FIELD_ATTRB_REQ, api, "MetadataEntry", entry.getValue(), "value"));
-
- // Check parent type
- checkResource(entry);
- }
-
- // Check parent type
- checkResource(metadata);
- }
-
-
- public static void checkMetadataKeyAbsentFor(String api, Metadata metadata, String key) {
- Map<String, String> metadataMap = metadataToMap(metadata);
- assertFalse(metadataMap.containsKey(key),
- String.format(OBJ_DEL, api + " metadata key", key));
- }
-
- public static void checkMetadataFor(String api, Metadata metadata, Map<String, String> expectedMap) {
- Map<String, String> actualMap = Checks.metadataToMap(metadata);
- assertEquals(actualMap, expectedMap,
- String.format(OBJ_FIELD_EQ, api, "metadata entries", expectedMap, actualMap));
- }
-
- public static Map<String, String> metadataToMap(Metadata metadata) {
- Map<String, String> result = Maps.newLinkedHashMap();
- for (MetadataEntry entry : metadata.getMetadataEntries()) {
- result.put(entry.getKey(), entry.getValue());
- }
- return result;
- }
-
- public static void checkVmPendingQuestion(VmPendingQuestion question) {
- assertNotNull(question, String.format(NOT_NULL_OBJ_FMT, "VmPendingQuestion"));
-
- // Check required fields
- assertNotNull(question.getQuestion(), String.format(OBJ_FIELD_REQ, "VmPendingQuestion", "Question"));
- assertNotNull(question.getQuestionId(), String.format(OBJ_FIELD_REQ, "VmPendingQuestion", "QuestionId"));
- for (VmQuestionAnswerChoice choice : question.getChoices()) {
- checkVmQuestionAnswerChoice(choice);
- }
-
- // Check parent type
- checkResource(question);
- }
-
- public static void checkVmQuestionAnswerChoice(VmQuestionAnswerChoice choice) {
- assertNotNull(choice, String.format(NOT_NULL_OBJ_FMT, "VmQuestionAnswerChoice"));
-
- // NOTE the Id field cannot be checked
- // NOTE the Text field cannot be checked
- }
-
- public static void checkVApp(VApp vApp) {
- // Check optional fields
- Owner owner = vApp.getOwner();
- if (owner != null) checkOwner(owner);
- // NOTE inMaintenanceMode cannot be checked
- VAppChildren children = vApp.getChildren();
- if (children != null) checkVAppChildren(children);
- // NOTE ovfDescriptorUploaded cannot be checked
-
- // Check parent type
- checkAbstractVAppType(vApp);
- }
-
- public static void checkVAppChildren(VAppChildren vAppChildren) {
- // Check optional fields
- for (VApp vApp : vAppChildren.getVApps()) {
- checkVApp(vApp);
- }
- for (Vm vm : vAppChildren.getVms()) {
- checkVm(vm);
- }
- }
-
- public static void checkAbstractVAppType(AbstractVApp abstractVApp) {
- // Check optional fields
- Reference vAppParent = abstractVApp.getVAppParent();
- if (vAppParent != null) checkReferenceType(vAppParent);
- // NOTE deployed cannot be checked
- for (SectionType section : abstractVApp.getSections()) {
- checkSectionType(section);
- }
-
- // Check parent type
- checkResourceEntityType(abstractVApp);
- }
-
- public static void checkVAppTemplate(VAppTemplate template) {
- checkVAppTemplate(template, true);
- }
-
- public static void checkVAppTemplateWhenNotReady(VAppTemplate template) {
- checkVAppTemplate(template, false);
- }
-
- public static void checkVAppTemplate(VAppTemplate template, boolean ready) {
- // Check required fields
- assertNotNull(template.getName(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Name", "VAppTemplate"));
-
- // Check optional fields
- Owner owner = template.getOwner();
- if (owner != null) checkOwner(owner);
- for (Vm child : template.getChildren()) {
- checkVm(child);
- }
- for (SectionType section : template.getSections()) {
- checkSectionType(section);
- }
- if (template.getTasks() != null) {
- for (Task task : template.getTasks()) {
- checkTask(task);
- }
- }
- if (template.getFiles() != null) {
- for (File file : template.getFiles()) {
- checkFile(file, ready);
- }
- }
-
- // NOTE vAppScopedLocalId cannot be checked
- // NOTE ovfDescriptorUploaded cannot be checked
- // NOTE goldMaster cannot be checked
-
- // Check parent type
- checkResourceEntityType(template, ready);
- }
-
- public static void checkVm(Vm vm) {
- // Check optional fields
- EnvironmentType environment = vm.getEnvironment();
- if (environment != null) checkEnvironmentType(environment);
- // NOTE vAppScopedLocalId cannot be checked
- // NOTE needsCustomization cannot be checked
-
- // Check parent type
- checkAbstractVAppType(vm);
- }
-
- public static void checkControlAccessParams(ControlAccessParams params) {
- // Check required fields
- assertNotNull(params.isSharedToEveryone(), String.format(OBJ_FIELD_REQ, "ControlAccessParams", "IsSharedToEveryone"));
-
- // Check optional fields, dependant on IsSharedToEveryone state
- if (params.isSharedToEveryone()) {
- assertNotNull(params.getEveryoneAccessLevel(), String.format(OBJ_FIELD_REQ, "ControlAccessParams", "EveryoneAccessLevel"));
- assertNotNull(params.getAccessSettings(), String.format(OBJ_FIELD_REQ, "ControlAccessParams", "AccessSettings when isSharedToEveryone"));
- } else {
- assertTrue(params.getAccessSettings().size() >= 1, String.format(OBJ_FIELD_GTE_1, "ControlAccessParams", "AccessSettings.size", params.getAccessSettings().size()));
- for (AccessSetting setting : params.getAccessSettings()) {
- checkAccessSetting(setting);
- }
- }
- }
-
- public static void checkAccessSetting(AccessSetting setting) {
- // Check required fields
- assertNotNull(setting.getSubject(), String.format(OBJ_FIELD_REQ, "AccessSetting", "Subject"));
- checkReferenceType(setting.getSubject());
- assertNotNull(setting.getAccessLevel(), String.format(OBJ_FIELD_REQ, "AccessSetting", "AccessLevel"));
- }
-
- public static void checkEnvironmentType(EnvironmentType environment) {
- // TODO
- }
-
- public static void checkSectionType(SectionType section) {
- // Check optional fields
- // NOTE info cannot be checked
- // NOTE required cannot be checked
- }
-
- public static void checkVirtualHardwareSection(VirtualHardwareSection hardware) {
- // Check optional fields
- VirtualSystemSettingData virtualSystem = hardware.getSystem();
- if (virtualSystem != null) checkVirtualSystemSettingData(virtualSystem);
- // NOTE transport cannot be checked
- if (hardware.getItems() != null) {
- for (ResourceAllocationSettingData item : hardware.getItems()) {
- checkResourceAllocationSettingData(item);
- }
- }
-
- // Check parent type
- checkSectionType(hardware);
- }
-
- public static void checkVirtualSystemSettingData(VirtualSystemSettingData virtualSystem) {
- assertNotNull(virtualSystem.getElementName(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "elementName"));
- assertNotNull(virtualSystem.getInstanceID(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "instanceID"));
-// assertNotNull(virtualSystem.getCaption(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "caption"));
-// assertNotNull(virtualSystem.getDescription(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "description"));
-// assertNotNull(virtualSystem.getAutomaticRecoveryAction(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "automaticRecoveryAction"));
-// assertNotNull(virtualSystem.getAutomaticShutdownAction(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "automaticShutdownAction"));
-// assertNotNull(virtualSystem.getAutomaticStartupAction(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "automaticStartupAction"));
-// assertNotNull(virtualSystem.getAutomaticStartupActionDelay(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "automaticStartupActionDelay"));
-// assertNotNull(virtualSystem.getAutomaticStartupActionSequenceNumber(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "automaticStartupActionSequenceNumber"));
-// assertNotNull(virtualSystem.getConfigurationDataRoot(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "configurationDataRoot"));
-// assertNotNull(virtualSystem.getConfigurationFile(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "configurationFile"));
-// assertNotNull(virtualSystem.getConfigurationID(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "configurationID"));
-// assertNotNull(virtualSystem.getCreationTime(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "creationTime"));
-// assertNotNull(virtualSystem.getLogDataRoot(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "logDataRoot"));
-// assertNotNull(virtualSystem.getRecoveryFile(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "recoveryFile"));
-// assertNotNull(virtualSystem.getSnapshotDataRoot(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "snapshotDataRoot"));
-// assertNotNull(virtualSystem.getSuspendDataRoot(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "suspendDataRoot"));
-// assertNotNull(virtualSystem.getSwapFileDataRoot(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "swapFileDataRoot"));
-// assertNotNull(virtualSystem.getVirtualSystemIdentifier(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "virtualSystemIdentifier"));
-// assertNotNull(virtualSystem.getVirtualSystemType(), String.format(OBJ_FIELD_REQ, "VirtualSystemSettingData", "virtualSystemType"));
- }
-
- public static void checkResourceAllocationSettingData(ResourceAllocationSettingData item) {
- // TODO
- }
-
- public static void checkMediaFor(String api, Media media) {
- // required
- assertNotNull(media.getImageType(), String.format(OBJ_FIELD_REQ, api, "imageType"));
- assertTrue(Media.ImageType.ALL.contains(media.getImageType()),
- "The Image type of a Media must be one of the allowed list");
- assertNotNull(media.getSize(), String.format(OBJ_FIELD_REQ, api, "size"));
- assertTrue(media.getSize() >= 0, String.format(OBJ_FIELD_GTE_0, api, "size", media.getSize()));
-
- // parent type
- checkResourceEntityType(media);
- }
-
- public static void checkGroup(Group group) {
- // Check optional fields
- // NOTE nameInSource cannot be checked
- for (Reference user : group.getUsersList()) {
- checkReferenceType(user, VCloudDirectorMediaType.USER);
- }
- if (group.getRole() != null) {
- checkReferenceType(group.getRole(), VCloudDirectorMediaType.ROLE);
- }
-
- // parent type
- checkEntityType(group);
- }
-
- public static void checkOrgSettings(OrgSettings settings) {
- // Check optional fields
- if (settings.getGeneralSettings() != null) {
- checkGeneralSettings(settings.getGeneralSettings());
- }
- if (settings.getVAppLeaseSettings() != null) {
- checkVAppLeaseSettings(settings.getVAppLeaseSettings());
- }
- if (settings.getVAppTemplateLeaseSettings() != null) {
- checkVAppTemplateLeaseSettings(settings.getVAppTemplateLeaseSettings());
- }
- if (settings.getLdapSettings() != null) {
- checkLdapSettings(settings.getLdapSettings());
- }
- if (settings.getEmailSettings() != null) {
- checkEmailSettings(settings.getEmailSettings());
- }
- if (settings.getPasswordPolicy() != null) {
- checkPasswordPolicySettings(settings.getPasswordPolicy());
- }
-
- // parent type
- checkResource(settings);
- }
-
- public static void checkEmailSettings(OrgEmailSettings settings) {
- // required
- assertNotNull(settings.isDefaultSmtpServer(), String.format(OBJ_FIELD_REQ, "OrgEmailSettings", "isDefaultSmtpServer"));
- assertNotNull(settings.isDefaultOrgEmail(), String.format(OBJ_FIELD_REQ, "OrgEmailSettings", "isDefaultOrgEmail"));
- assertNotNull(settings.getFromEmailAddress(), String.format(OBJ_FIELD_REQ, "OrgEmailSettings", "fromEmailAddress"));
- checkEmailAddress(settings.getFromEmailAddress());
- assertNotNull(settings.getDefaultSubjectPrefix(), String.format(OBJ_FIELD_REQ, "OrgEmailSettings", "defaultSubjectPrefix"));
- assertNotNull(settings.isAlertEmailToAllAdmins(), String.format(OBJ_FIELD_REQ, "OrgEmailSettings", "isAlertEmailToAllAdmins"));
-
- // optional
- // NOTE alertEmailsTo cannot be checked
-
- // parent type
- checkResource(settings);
- }
-
- public static void checkEmailAddress(String email) {
- // TODO: validate email addresses
- }
-
- public static void checkGeneralSettings(OrgGeneralSettings settings) {
- // Check optional fields
- // NOTE canPublishCatalogs cannot be checked
- // NOTE useServerBootSequence cannot be checked
- if (settings.getDeployedVMQuota() != null) {
- assertTrue(settings.getDeployedVMQuota() >= 0,
- String.format(OBJ_FIELD_GTE_0, "deployedVMQuota", "port", settings.getDeployedVMQuota()));
- }
- if (settings.getStoredVmQuota() != null) {
- assertTrue(settings.getStoredVmQuota() >= 0,
- String.format(OBJ_FIELD_GTE_0, "storedVmQuota", "port", settings.getStoredVmQuota()));
- }
- if (settings.getDelayAfterPowerOnSeconds() != null) {
- assertTrue(settings.getDelayAfterPowerOnSeconds() >= 0,
- String.format(OBJ_FIELD_GTE_0, "delayAfterPowerOnSeconds", "port", settings.getDelayAfterPowerOnSeconds()));
- }
-
- // parent type
- checkResource(settings);
- }
-
- public static void checkLdapSettings(OrgLdapSettings settings) {
- // Check optional fields
- // NOTE customUsersOu cannot be checked
- if (settings.getLdapMode() != null) {
- assertTrue(LdapMode.ALL.contains(settings.getLdapMode()),
- String.format(REQUIRED_VALUE_OBJECT_FMT, "LdapMode", "OrgLdapSettings", settings.getLdapMode(),
- Iterables.toString(OrgLdapSettings.LdapMode.ALL)));
- }
- if (settings.getCustomOrgLdapSettings() != null) {
- checkCustomOrgLdapSettings(settings.getCustomOrgLdapSettings());
- }
-
- // parent type
- checkResource(settings);
- }
-
- public static void checkCustomOrgLdapSettings(CustomOrgLdapSettings settings) {
- // required
- assertNotNull(settings.getHostName(), String.format(OBJ_FIELD_REQ, "CustomOrgLdapSettings", "hostName"));
- assertNotNull(settings.getPort(), String.format(OBJ_FIELD_REQ, "CustomOrgLdapSettings", "port"));
- assertTrue(settings.getPort() >= 0,
- String.format(OBJ_FIELD_GTE_0, "CustomOrgLdapSettings", "port", settings.getPort()));
- assertNotNull(settings.getAuthenticationMechanism(), String.format(OBJ_FIELD_REQ, "CustomOrgLdapSettings", "authenticationMechanism"));
- assertTrue(AuthenticationMechanism.ALL.contains(settings.getAuthenticationMechanism()),
- String.format(REQUIRED_VALUE_OBJECT_FMT, "AuthenticationMechanism", "CustomOrdLdapSettings", settings.getAuthenticationMechanism(),
- Iterables.toString(CustomOrgLdapSettings.AuthenticationMechanism.ALL)));
- assertNotNull(settings.isGroupSearchBaseEnabled(), String.format(OBJ_FIELD_REQ, "CustomOrgLdapSettings", "isGroupSearchBaseEnabled"));
- assertNotNull(settings.getConnectorType(), String.format(OBJ_FIELD_REQ, "CustomOrgLdapSettings", "connectorType"));
- assertTrue(ConnectorType.ALL.contains(settings.getConnectorType()),
- String.format(REQUIRED_VALUE_OBJECT_FMT, "ConnectorType", "CustomOrdLdapSettings", settings.getConnectorType(),
- Iterables.toString(CustomOrgLdapSettings.ConnectorType.ALL)));
- assertNotNull(settings.getUserAttributes(), String.format(OBJ_FIELD_REQ, "CustomOrgLdapSettings", "userAttributes"));
- checkUserAttributes("CustomOrdLdapSettings", settings.getUserAttributes());
- assertNotNull(settings.getGroupAttributes(), String.format(OBJ_FIELD_REQ, "CustomOrgLdapSettings", "groupAttributes"));
- checkGroupAttributes("CustomOrdLdapSettings", settings.getGroupAttributes());
-
- // optional
- // NOTE isSsl cannot be checked
- // NOTE isSSlAcceptAll cannot be checked
- // NOTE realm cannot be checked
- // NOTE searchBase cannot be checked
- // NOTE userName cannot be checked
- // NOTE password cannot be checked
- // NOTE groupSearchBase cannot be checked
- }
-
- public static void checkUserAttributes(String api, OrgLdapUserAttributes attributes) {
- // required
- assertNotNull(attributes.getObjectClass(), String.format(OBJ_FIELD_REQ, api, "objectClass"));
- assertNotNull(attributes.getObjectIdentifier(), String.format(OBJ_FIELD_REQ, api, "objectIdentifier"));
- assertNotNull(attributes.getUserName(), String.format(OBJ_FIELD_REQ, api, "userName"));
- assertNotNull(attributes.getEmail(), String.format(OBJ_FIELD_REQ, api, "email"));
- assertNotNull(attributes.getFullName(), String.format(OBJ_FIELD_REQ, api, "fullName"));
- assertNotNull(attributes.getGivenName(), String.format(OBJ_FIELD_REQ, api, "givenName"));
- assertNotNull(attributes.getSurname(), String.format(OBJ_FIELD_REQ, api, "surname"));
- assertNotNull(attributes.getTelephone(), String.format(OBJ_FIELD_REQ, api, "telephone"));
- assertNotNull(attributes.getGroupMembershipIdentifier(), String.format(OBJ_FIELD_REQ, api, "groupMembershipIdentifier"));
-
- // optional
- // NOTE groupBackLinkIdentifier cannot be checked
- }
-
- public static void checkGroupAttributes(String api, OrgLdapGroupAttributes attributes) {
- // required
- assertNotNull(attributes.getObjectClass(), String.format(OBJ_FIELD_REQ, api, "objectClass"));
- assertNotNull(attributes.getObjectIdentifier(), String.format(OBJ_FIELD_REQ, api, "objectIdentifier"));
- assertNotNull(attributes.getGroupName(), String.format(OBJ_FIELD_REQ, api, "groupName"));
- assertNotNull(attributes.getMembership(), String.format(OBJ_FIELD_REQ, api, "membership"));
- assertNotNull(attributes.getMembershipIdentifier(), String.format(OBJ_FIELD_REQ, api, "membershipIdentifier"));
-
- // optional
- // NOTE backLinkIdentifier cannot be checked
- }
-
- public static void checkPasswordPolicySettings(OrgPasswordPolicySettings settings) {
- // required
- assertNotNull(settings.isAccountLockoutEnabled(),
- String.format(OBJ_FIELD_REQ, "OrgPasswordPolicySettings", "isAccountLockoutEnabled"));
- assertNotNull(settings.getInvalidLoginsBeforeLockout(),
- String.format(OBJ_FIELD_REQ, "OrgPasswordPolicySettings", "invalidLoginsBeforeLockout"));
- assertTrue(settings.getInvalidLoginsBeforeLockout() >= 0,
- String.format(OBJ_FIELD_GTE_0, "OrgPasswordPolicySettings", "storageLeaseSeconds", settings.getInvalidLoginsBeforeLockout()));
- assertNotNull(settings.getAccountLockoutIntervalMinutes(),
- String.format(OBJ_FIELD_REQ, "OrgPasswordPolicySettings", "accountLockoutIntervalMinutes"));
- assertTrue(settings.getAccountLockoutIntervalMinutes() >= 0,
- String.format(OBJ_FIELD_GTE_0, "OrgPasswordPolicySettings", "accountLockoutIntervalMinutes", settings.getAccountLockoutIntervalMinutes()));
-
- // parent type
- checkResource(settings);
- }
-
- public static void checkVAppLeaseSettings(OrgLeaseSettings settings) {
- // Check optional fields
- // NOTE deleteOnStorageLeaseExpiration cannot be checked
- if (settings.getStorageLeaseSeconds() != null) {
- assertTrue(settings.getStorageLeaseSeconds() >= 0,
- String.format(OBJ_FIELD_GTE_0, "OrgLeaseSettings", "storageLeaseSeconds", settings.getStorageLeaseSeconds()));
- }
- if (settings.getDeploymentLeaseSeconds() != null) {
- assertTrue(settings.getDeploymentLeaseSeconds() >= 0,
- String.format(OBJ_FIELD_GTE_0, "OrgLeaseSettings", "deploymentLeaseSeconds", settings.getDeploymentLeaseSeconds()));
- }
-
- // parent type
- checkResource(settings);
- }
-
- public static void checkVAppTemplateLeaseSettings(OrgVAppTemplateLeaseSettings settings) {
- // Check optional fields
- // NOTE deleteOnStorageLeaseExpiration cannot be checked
- if (settings.getStorageLeaseSeconds() != null) {
- assertTrue(settings.getStorageLeaseSeconds() >= 0,
- String.format(OBJ_FIELD_GTE_0, "OrgVAppTemplateLeaseSettings", "storageLeaseSeconds", settings.getStorageLeaseSeconds()));
- }
-
- // parent type
- checkResource(settings);
- }
-
- public static void checkUser(User user) {
- // Check optional fields
- // NOTE fullName cannot be checked
- // NOTE isEnabled cannot be checked
- // NOTE isLocked cannot be checked
- // NOTE im cannot be checked
- // NOTE nameInSource cannot be checked
- // NOTE isAlertEnabled cannot be checked
- // NOTE alterEmailPrefix cannot be checked
- // NOTE isExternal cannot be checked
- // NOTE isDefaultCached cannot be checked
- // NOTE isGroupRole cannot be checked
- // NOTE password cannot be checked
-
- if (user.getEmailAddress() != null) {
- checkEmailAddress(user.getEmailAddress());
- }
- if (user.getTelephone() != null) {
- checkTelephone(user.getTelephone());
- }
- if (user.getAlertEmail() != null) {
- checkEmailAddress(user.getAlertEmail());
- }
- if (user.getStoredVmQuota() != null) {
- assertTrue(user.getStoredVmQuota() >= 0,
- String.format(OBJ_FIELD_GTE_0, "User", "storedVmQuota", user.getStoredVmQuota()));
- }
- if (user.getDeployedVmQuota() != null) {
- assertTrue(user.getDeployedVmQuota() >= 0,
- String.format(OBJ_FIELD_GTE_0, "User", "deployedVmQuota", user.getDeployedVmQuota()));
- }
- if (user.getRole() != null) {
- checkReferenceType(user.getRole());
- }
- if (user.getGroups() != null) {
- for (Reference group : user.getGroups()) {
- checkReferenceType(group);
- }
- }
-
- // parent type
- checkEntityType(user);
- }
-
- public static void checkTelephone(String number) {
- // TODO regex validate telephone
- }
-
- public static void checkScreenTicket(ScreenTicket ticket) {
- // NOTE the value field cannot be checked
- }
-
- public static void checkCustomizationSection(CustomizationSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "CustomizationSection"));
-
- // Check optional fields
- if (section.getLinks() != null) {
- for (Link link : section.getLinks()) {
- checkLink(link);
- }
- }
- if (section.getType() != null) checkType(section.getType());
- if (section.getHref() != null) checkHref(section.getHref());
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- public static void checkProductSectionList(ProductSectionList sections) {
- assertNotNull(sections, String.format(NOT_NULL_OBJ_FMT, "ProductSectionList"));
-
- for (ProductSection productSection : sections) {
- checkOvfProductSection(productSection);
- }
-
- // Check parent type
- checkResource(sections);
- }
-
- public static void checkGuestCustomizationSection(GuestCustomizationSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "NetworkConfigSection"));
-
- // TODO assertions have failed for returned GuestCustomizationSection.
- // Perhaps "invalid" values are just ignored, rather than guaranteeing they will never be returned?
-// if (!section.isJoinDomainEnabled()) {
-// assertFalse(section.isUseOrgSettings() != null && section.isUseOrgSettings());
-// assertNull(section.getDomainName());
-// assertNull(section.getDomainUserName());
-// assertNull(section.getDomainUserPassword());
-// }
-//
-// if (!section.isAdminPasswordEnabled()) {
-// assertFalse(section.isAdminPasswordAuto() != null && section.isAdminPasswordAuto());
-// assertFalse(section.isResetPasswordRequired() != null && section.isResetPasswordRequired());
-// if (section.isAdminPasswordAuto()) {
-// assertNull(section.getAdminPassword());
-// }
-// }
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- public static void checkLeaseSettingsSection(LeaseSettingsSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "LeaseSettingsSection"));
-
- if (section.getLinks() != null) {
- for (Link link : section.getLinks()) {
- checkLink(link);
- }
- }
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- public static void checkNetworkConfigSection(NetworkConfigSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "NetworkConfigSection"));
-
- if (section.getNetworkConfigs() != null) {
- for (VAppNetworkConfiguration networkConfig : section.getNetworkConfigs()) {
- checkVAppNetworkConfig(networkConfig);
- }
- }
- if (section.getLinks() != null) {
- for (Link link : section.getLinks()) {
- checkLink(link);
- }
- }
- if (section.getHref() != null) {
- checkHref(section.getHref());
- }
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- public static void checkNetworkSection(NetworkSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "NetworkSection"));
-
- // Check optional fields
- if (section.getNetworks() != null) {
- for (org.jclouds.dmtf.ovf.Network network : section.getNetworks()) {
- checkOvfNetwork(network);
- }
- }
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- public static void checkOvfNetwork(org.jclouds.dmtf.ovf.Network network) {
- assertNotNull(network, String.format(NOT_NULL_OBJ_FMT, "Network"));
-
- // Check optional fields
- // NOTE name field cannot be checked
- // NOTE description field cannot be checked
- }
-
- public static void checkOperatingSystemSection(OperatingSystemSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "OperatingSystemSection"));
-
- // Check optional fields
- // NOTE id field cannot be checked
- // NOTE version field cannot be checked
- // NOTE description field cannot be checked
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- public static void checkRuntimeInfoSection(RuntimeInfoSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "RuntimeInfoSection"));
-
- // Check optional fields
- VMWareTools tools = section.getVMWareTools();
- if (tools != null) checkVMWareTools(tools);
-
- // NOTE does this mean anything?
- for (Object any : section.getAny()) {
- assertNotNull(any);
- }
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- public static void checkVMWareTools(VMWareTools tools) {
- assertNotNull(tools, String.format(NOT_NULL_OBJ_FMT, "VMWareTools"));
-
- // Check required fields
- assertNotNull(tools.getVersion(), String.format(NOT_NULL_OBJ_FIELD_FMT, "version", "VMWareTools"));
- assertFalse(tools.getVersion().isEmpty(), String.format(NOT_EMPTY_STRING_FMT, "VMWareTools.version"));
- }
-
- public static void checkStartupSection(StartupSection section) {
- // TODO
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- private static void checkVAppNetworkConfig(VAppNetworkConfiguration val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "VAppNetworkConfiguration"));
-
- // required fields
- assertNotNull(val.getNetworkName(), String.format(NOT_NULL_OBJ_FIELD_FMT, "NetworkName", "VAppNetworkConfiguration"));
- checkNetworkConfiguration(val.getConfiguration());
-
- checkResource(val);
- }
-
- public static void checkNetworkConnectionSection(NetworkConnectionSection val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "VAppConnectionSection"));
-
- // Check optional fields
- if (val.getLinks() != null) {
- for (Link link : val.getLinks()) {
- checkLink(link);
- }
- }
- if (val.getHref() != null) {
- checkHref(val.getHref());
- }
- if (val.getNetworkConnections() != null) {
- for (NetworkConnection networkConnection : val.getNetworkConnections()) {
- checkNetworkConnection(networkConnection);
- }
- }
- if (val.getType() != null) {
- checkType(val.getType());
- }
-
- checkOvfSectionType(val);
- }
-
- private static void checkNetworkConnection(NetworkConnection val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "NetworkConnection"));
-
- // Check required fields
- assertNotNull(val.getNetwork(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Network", "NetworkConnection"));
- assertNotNull(val.getIpAddressAllocationMode(), String.format(NOT_NULL_OBJ_FIELD_FMT, "IpAddressAllocationMode", "NetworkConnection"));
- assertNotEquals(val.getIpAddressAllocationMode(), NetworkConnection.IpAddressAllocationMode.UNRECOGNIZED,
- String.format(REQUIRED_VALUE_OBJECT_FMT, "IpAddressAllocationMode", "NetworkConnection", val.getIpAddressAllocationMode(), Iterables.toString(NetworkConnection.IpAddressAllocationMode.ALL)));
-
- // Check optional fields
- if (val.getIpAddress() != null) {
- checkIpAddress(val.getIpAddress());
- }
- if (val.getExternalIpAddress() != null) {
- checkIpAddress(val.getExternalIpAddress());
- }
-
- if (val.getMACAddress() != null) {
- checkMacAddress(val.getMACAddress());
- }
- }
-
- public static void checkRasdItemsList(RasdItemsList items) {
- // Check fields
- // TODO
-
- for (RasdItem item : items.getItems()) {
- checkResourceAllocationSettingData(item);
- }
- }
-
- public static void checkOvfSectionType(SectionType section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "SectionType"));
- }
-
- public static void checkOvfProductSection(ProductSection val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "ProductSection"));
-
- if (val.getProperties() != null) {
- for (org.jclouds.dmtf.ovf.Property property : val.getProperties()) {
- checkOvfProperty(property);
- }
- }
-
- // Check parent type
- checkOvfSectionType(val);
- }
-
- private static void checkOvfProperty(org.jclouds.dmtf.ovf.Property val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "Property"));
- }
-
- public static void checkOvfNetworkSection(NetworkSection val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "NetworkSection"));
-
- if (val.getNetworks() != null) {
- for (org.jclouds.dmtf.ovf.Network network : val.getNetworks()) {
- checkOvfNetwork(network);
- }
- }
-
- checkOvfSectionType(val);
- }
-
- public static void checkOvfEnvelope(Envelope val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "Envelope"));
-
- if (val.getDiskSections() != null) {
- for (DiskSection diskSection : val.getDiskSections()) {
- checkOvfDiskSection(diskSection);
- }
- }
- if (val.getNetworkSections() != null) {
- for (NetworkSection networkSection : val.getNetworkSections()) {
- checkOvfNetworkSection(networkSection);
- }
- }
- if (val.getVirtualSystem() != null) {
- checkOvfVirtualSystem(val.getVirtualSystem());
- }
- }
-
- private static void checkOvfVirtualSystem(VirtualSystem val) {
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "VirtualSystem"));
-
- if (val.getProductSections() != null) {
- for (ProductSection productSection : val.getProductSections()) {
- checkOvfProductSection(productSection);
- }
- }
- if (val.getVirtualHardwareSections() != null) {
- for (VirtualHardwareSection virtualHardwareSection : val.getVirtualHardwareSections()) {
- checkOvfVirtualHardwareSection(virtualHardwareSection);
- }
- }
- if (val.getOperatingSystemSection() != null) {
- checkOvfOperationSystemSection(val.getOperatingSystemSection());
- }
- }
-
- private static void checkOvfDiskSection(DiskSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "DiskSection"));
-
- if (section.getDisks() != null) {
- for (Disk disk : section.getDisks()) {
- checkOvfDisk(disk);
- }
- }
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- private static void checkOvfDisk(Disk disk) {
- assertNotNull(disk, String.format(NOT_NULL_OBJ_FMT, "Disk"));
- }
-
- private static void checkOvfOperationSystemSection(OperatingSystemSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "OperatingSystemSection"));
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- private static void checkOvfVirtualHardwareSection(VirtualHardwareSection section) {
- assertNotNull(section, String.format(NOT_NULL_OBJ_FMT, "VirtualHardwareSection"));
-
- if (section.getItems() != null) {
- for (ResourceAllocationSettingData item : section.getItems()) {
- checkCimResourceAllocationSettingData((RasdItem) item);
- }
- }
- if (section.getSystem() != null) {
- checkCimVirtualSystemSettingData(section.getSystem());
- }
-
- // Check parent type
- checkOvfSectionType(section);
- }
-
- private static void checkCimVirtualSystemSettingData(VirtualSystemSettingData val) {
- // TODO Could do more assertions...
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "VirtualSystemSettingData"));
- }
-
- private static void checkCimResourceAllocationSettingData(RasdItem val) {
- // TODO Could do more assertions...
- assertNotNull(val, String.format(NOT_NULL_OBJ_FMT, "ResouorceAllocationSettingData"));
- }
-
- public static void checkOrgNetwork(OrgNetwork network) {
- // optional
- Reference networkPoolRef = network.getNetworkPool();
- if (networkPoolRef != null) {
- Checks.checkReferenceType(networkPoolRef);
- }
- IpAddresses allowedExternalIpAddresses = network.getAllowedExternalIpAddresses();
- if (allowedExternalIpAddresses != null) {
- Checks.checkIpAddresses(allowedExternalIpAddresses);
- }
-
- // parent type
- checkNetwork(network);
- }
-
- public static void checkExternalNetwork(ExternalNetwork network) {
- // required
- assertNotNull(network.getProviderInfo(), String.format(OBJ_FIELD_REQ,
- "ExternalNetwork", "providerInfo"));
-
- // parent type
- checkNetwork(network);
- }
-
- public static void checkAdminVdc(AdminVdc vdc) {
- // optional
- // NOTE isThinProvision cannot be checked
- // NOTE usesFastProvisioning cannot be checked
- if (vdc.getResourceGuaranteedMemory() != null) {
- // TODO: between 0 and 1 inc.
- }
- if (vdc.getResourceGuaranteedCpu() != null) {
- // TODO: between 0 and 1 inc.
- }
- if (vdc.getVCpuInMhz() != null) {
- assertTrue(vdc.getVCpuInMhz() >= 0, String.format(OBJ_FIELD_GTE_0,
- "Vdc", "cCpuInMhz", vdc.getVCpuInMhz()));
- }
- if (vdc.getNetworkPoolReference() != null) {
- checkReferenceType(vdc.getNetworkPoolReference());
- }
- if (vdc.getProviderVdcReference() != null) {
- checkReferenceType(vdc.getProviderVdcReference());
- }
-
- // parent type
- checkVdc(vdc);
- }
-
- public static void checkVdc(Vdc vdc) {
- // required
- assertNotNull(vdc.getAllocationModel(), String.format(OBJ_FIELD_REQ, "Vdc", "allocationModel"));
- // one of: AllocationVApp, AllocationPool, ReservationPool
- assertNotNull(vdc.getStorageCapacity(), String.format(OBJ_FIELD_REQ, "Vdc", "storageCapacity"));
- checkCapacityWithUsage(vdc.getStorageCapacity());
- assertNotNull(vdc.getComputeCapacity(), String.format(OBJ_FIELD_REQ, "Vdc", "computeCapacity"));
- checkComputeCapacity(vdc.getComputeCapacity());
- assertNotNull(vdc.getNicQuota(), String.format(OBJ_FIELD_REQ, "Vdc", "nicQuota"));
- assertTrue(vdc.getNicQuota() >= 0, String.format(OBJ_FIELD_GTE_0,
- "Vdc", "nicQuota", vdc.getNicQuota()));
- assertNotNull(vdc.getNetworkQuota(), String.format(OBJ_FIELD_REQ, "Vdc", "networkQuota"));
- assertTrue(vdc.getNetworkQuota() >= 0, String.format(OBJ_FIELD_GTE_0,
- "Vdc", "networkQuota", vdc.getNetworkQuota()));
-
- // optional
- // NOTE isEnabled cannot be checked
- for (Reference resourceEntity : vdc.getResourceEntities()) {
- checkReferenceType(resourceEntity);
- }
- for (Reference availableNetwork : vdc.getAvailableNetworks()) {
- checkReferenceType(availableNetwork);
- }
- if (vdc.getCapabilities() != null) {
- checkCapabilities(vdc.getCapabilities());
- }
- if (vdc.getVmQuota() != null) {
- assertTrue(vdc.getVmQuota() >= 0, String.format(OBJ_FIELD_GTE_0,
- "Vdc", "vmQuota", vdc.getVmQuota()));
- }
-
- // parent type
- checkEntityType(vdc);
- }
-
- public static void checkQueryResultRecord(QueryResultRecord record) {
- checkHref(record.getHref());
- if (record.getLinks() != null) {
- for (Link link : record.getLinks()) {
- checkLink(link);
- }
- }
- if (record.getType() != null) {
- checkType(record.getType());
- }
- }
-
- public static void checkReferences(References references) {
- // optional
- for (Reference reference : references.getReferences()) {
- checkReferenceType(reference);
- }
-
- // parent type
- checkContainerType(references);
- }
-
- public static void checkContainerType(Container container) {
- // optional
- // NOTE name can't be checked
- if (container.getPage() != null) {
- assertTrue(container.getPage() >= 1, "page must be >=1 ");
- }
- if (container.getPageSize() != null) {
- assertTrue(container.getPageSize() >= 1, "pageSize must be >=1 ");
- }
- if (container.getTotal() != null) {
- assertTrue(container.getTotal() >= 0, "total must be >=0 ");
- }
-
- // parent type
- checkResource(container);
- }
-}
[15/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java
deleted file mode 100644
index 048ede7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java
+++ /dev/null
@@ -1,174 +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.vcloud.director.v1_5.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * Predicates for working with {@link EntityType} collections.
- */
-public class EntityPredicates {
-
- /**
- * Matches {@link EntityType entities} with the given id.
- *
- * @param T type of the entity, for example {@link Vm}
- * @param id value of the id attribute of the entity
- * @return predicate that will match entities of the given id
- */
- public static <T extends Entity> Predicate<T> idEquals(final String id) {
- checkNotNull(id, "id must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T entity) {
- return id.equals(entity.getId());
- }
-
- @Override
- public String toString() {
- return "idEquals(" + id + ")";
- }
- };
- }
-
- /**
- * Matches {@link EntityType entities} with the given name.
- *
- * @param T type of the entity, for example {@link Vm}
- * @param name value of the name attribute of the entity
- * @return predicate that will match entities of the given name
- */
- public static <T extends Entity> Predicate<T> nameEquals(final String name) {
- checkNotNull(name, "name must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T entity) {
- return name.equals(entity.getName());
- }
-
- @Override
- public String toString() {
- return "nameEquals(" + name + ")";
- }
- };
- }
-
- /**
- * Matches {@link EntityType entities} with names starting with the given prefix.
- *
- * @param T type of the entity, for example {@link Vm}
- * @param name prefix of the name attribute of the entity
- * @return predicate that will match entities with names starting with the given prefix
- */
- public static <T extends Entity> Predicate<T> nameStartsWith(final String prefix) {
- checkNotNull(prefix, "prefix must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T entity) {
- String name = entity.getName();
- return name != null && name.startsWith(prefix);
- }
-
- @Override
- public String toString() {
- return "nameStartsWith(" + prefix + ")";
- }
- };
- }
-
- /**
- * Matches {@link EntityType entities} with names in the given collection.
- *
- * @param T type of the entity, for example {@link Vm}
- * @param names collection of values for the name attribute of the entity
- * @return predicate that will match entities with names starting with the given prefix
- */
- public static <T extends Entity> Predicate<T> nameIn(final Iterable<String> names) {
- checkNotNull(names, "names must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T entity) {
- String name = entity.getName();
- return Iterables.contains(names, name);
- }
-
- @Override
- public String toString() {
- return "nameIn(" + Iterables.toString(names) + ")";
- }
- };
- }
-
- /**
- * Matches {@link EntityType entities} of the given type.
- *
- * @param T type of the entity, for example {@link Vm}
- * @param type the media type string of the entity, for example {@link VCloudDirectorMediaType#CATALOG}
- * @return predicate that will match entities of the given type
- * @see VCloudDirectorMediaType
- */
- public static <T extends Entity> Predicate<T> typeEquals(final String type) {
- checkNotNull(type, "type must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T entity) {
- return type.equals(entity.getType());
- }
-
- @Override
- public String toString() {
- return "typeEquals(" + type + ")";
- }
- };
- }
-
- /**
- * Matches {@link EntityType entities} with the given {@link URI}.
- *
- * @param T type of the entity, for example {@link Vm}
- * @param href the URI of the entity
- * @return predicate that will match entities with the given URI
- * @see VCloudDirectorMediaType
- */
- public static <T extends Entity> Predicate<T> hrefEquals(final URI href) {
- checkNotNull(href, "href must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T entity) {
- return href.equals(entity.getHref());
- }
-
- @Override
- public String toString() {
- return "hrefEquals(" + href.toASCIIString() + ")";
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java
deleted file mode 100644
index 0eb0024..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Predicate;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-
-/**
- * Predicates handy when working with Links
- */
-
-public class LinkPredicates {
-
- /**
- * matches links of the given relation
- *
- * @param rel from {@code context.getApi().getCurrentSession().get().getLinks()}
- * @return predicate that will match links of the given rel
- */
- public static Predicate<Link> relEquals(final String rel) {
- checkNotNull(rel, "rel must be defined");
-
- return relEquals(Link.Rel.fromValue(rel));
- }
-
- /** @see #relEquals(String) */
- public static Predicate<Link> relEquals(final Link.Rel rel) {
- return LINK_REL_SELECTORS.apply(checkNotNull(rel, "rel must be defined"));
- }
-
- private static final LoadingCache<Link.Rel, Predicate<Link>> LINK_REL_SELECTORS = CacheBuilder.newBuilder()
- .maximumSize(Link.Rel.ALL.size())
- .build(
- new CacheLoader<Link.Rel, Predicate<Link>>() {
- public Predicate<Link> load(final Link.Rel rel) {
- return new Predicate<Link>() {
- @Override
- public boolean apply(Link link) {
- return rel == link.getRel();
- }
-
- @Override
- public String toString() {
- return "relEquals(" + rel.value() + ")";
- }
- };
- }
- });
-
- /**
- * @see ReferenceTypePredicates#nameEquals
- */
- public static Predicate<Link> nameEquals(String name) {
- return MEDIA_NAME_SELECTORS.apply(name);
- }
-
- private static final LoadingCache<String, Predicate<Link>> MEDIA_NAME_SELECTORS = CacheBuilder.newBuilder()
- .maximumSize(VCloudDirectorMediaType.ALL.size())
- .build(
- new CacheLoader<String, Predicate<Link>>() {
- public Predicate<Link> load(String key) {
- return ReferencePredicates.nameEquals(key);
- }
- });
-
- /**
- * @see ReferenceTypePredicates#typeEquals
- */
- public static Predicate<Link> typeEquals(String type) {
- return MEDIA_TYPE_SELECTORS.apply(type);
- }
-
- private static final LoadingCache<String, Predicate<Link>> MEDIA_TYPE_SELECTORS = CacheBuilder.newBuilder()
- .maximumSize(VCloudDirectorMediaType.ALL.size())
- .build(
- new CacheLoader<String, Predicate<Link>>() {
- public Predicate<Link> load(String key) {
- return ReferencePredicates.typeEquals(key);
- }
- });
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java
deleted file mode 100644
index 8f2d243..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java
+++ /dev/null
@@ -1,151 +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.vcloud.director.v1_5.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * Predicates for working with {@link Reference} collections.
- */
-public class ReferencePredicates {
-
- /**
- * Matches {@link Reference}s with the given name.
- *
- * @param T type of the reference, for example {@link Link}
- * @param name value of the name attribute of the referenced object
- * @return predicate that will match references of the given name
- */
- public static <T extends Reference> Predicate<T> nameEquals(final String name) {
- checkNotNull(name, "name must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T reference) {
- return name.equals(reference.getName());
- }
-
- @Override
- public String toString() {
- return "nameEquals(" + name + ")";
- }
- };
- }
-
- /**
- * Matches {@link Reference}s with names starting with the given prefix.
- *
- * @param T type of the reference, for example {@link Link}
- * @param name prefix of the name attribute of the referenced object
- * @return predicate that will match references with names starting with the given prefix
- */
- public static <T extends Reference> Predicate<T> nameStartsWith(final String prefix) {
- checkNotNull(prefix, "prefix must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T reference) {
- String name = reference.getName();
- return name != null && name.startsWith(prefix);
- }
-
- @Override
- public String toString() {
- return "nameStartsWith(" + prefix + ")";
- }
- };
- }
-
- /**
- * Matches {@link Reference}s with names in the given collection.
- *
- * @param T type of the reference, for example {@link Link}
- * @param names collection of values for the name attribute of the referenced object
- * @return predicate that will match references with names starting with the given prefix
- */
- public static <T extends Reference> Predicate<T> nameIn(final Iterable<String> names) {
- checkNotNull(names, "names must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T reference) {
- String name = reference.getName();
- return Iterables.contains(names, name);
- }
-
- @Override
- public String toString() {
- return "nameIn(" + Iterables.toString(names) + ")";
- }
- };
- }
-
- /**
- * Matches {@link Reference}s of the given type.
- *
- * @param T type of the reference, for example {@link Link}
- * @param type the media type string of the referenced object, for example {@link VCloudDirectorMediaType#CATALOG}
- * @return predicate that will match references of the given type
- * @see VCloudDirectorMediaType
- */
- public static <T extends Reference> Predicate<T> typeEquals(final String type) {
- checkNotNull(type, "type must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T reference) {
- return type.equals(reference.getType());
- }
-
- @Override
- public String toString() {
- return "typeEquals(" + type + ")";
- }
- };
- }
-
- /**
- * Matches {@link Reference}s with the given {@link URI}.
- *
- * @param T type of the reference, for example {@link Link}
- * @param href the URI of the reference
- * @return predicate that will match references with the given URI
- * @see VCloudDirectorMediaType
- */
- public static <T extends Reference> Predicate<T> hrefEquals(final URI href) {
- checkNotNull(href, "href must be defined");
-
- return new Predicate<T>() {
- @Override
- public boolean apply(T reference) {
- return href.equals(reference.getHref());
- }
-
- @Override
- public String toString() {
- return "hrefEquals(" + href.toASCIIString() + ")";
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskStatusEquals.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskStatusEquals.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskStatusEquals.java
deleted file mode 100644
index 724f7ac..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskStatusEquals.java
+++ /dev/null
@@ -1,85 +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.vcloud.director.v1_5.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collection;
-import java.util.Set;
-
-import javax.annotation.Resource;
-
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Task.Status;
-import org.jclouds.vcloud.director.v1_5.features.TaskApi;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Test a {@link Task} status is in a particular set of {@link Task.Status statuses}.
- */
-public class TaskStatusEquals implements Predicate<Task> {
-
- private final TaskApi taskApi;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- private Collection<Status> expectedStatuses;
- private Collection<Status> failingStatuses;
-
- public TaskStatusEquals(TaskApi taskApi, Status expectedStatus, Set<Status> failingStatuses) {
- this(taskApi, ImmutableSet.of(expectedStatus), failingStatuses);
- }
-
- public TaskStatusEquals(TaskApi taskApi, Set<Status> expectedStatuses, Set<Status> failingStatuses) {
- this.taskApi = taskApi;
- this.expectedStatuses = expectedStatuses;
- this.failingStatuses = failingStatuses;
- }
-
- /** @see Predicate#apply(Object) */
- @Override
- public boolean apply(Task task) {
- checkNotNull(task, "task");
- logger.trace("looking for status on task %s", task);
-
- // TODO shouldn't we see if it's already done before getting it from API server?
- task = taskApi.get(task.getHref());
-
- // perhaps task isn't available, yet
- if (task == null) return false;
- logger.trace("%s: looking for status %s: currently: %s", task, expectedStatuses, task.getStatus());
-
- if (failingStatuses.contains(task.getStatus())) {
- throw new VCloudDirectorException(task);
- }
- if (expectedStatuses.contains(task.getStatus())) {
- return true;
- }
- return false;
- }
-
- @Override
- public String toString() {
- return "taskStatusEquals(" + Iterables.toString(expectedStatuses) + ")";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskSuccess.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskSuccess.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskSuccess.java
deleted file mode 100644
index 52373ce..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskSuccess.java
+++ /dev/null
@@ -1,72 +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.vcloud.director.v1_5.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.EnumSet;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.logging.Logger;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.features.TaskApi;
-
-import com.google.common.base.Predicate;
-
-/**
- * Test a {@link Task} to see if it has {@link Task.Status#SUCCESS succeeded}.
- */
-@Singleton
-public class TaskSuccess implements Predicate<Task> {
-
- private final TaskApi taskApi;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public TaskSuccess(TaskApi taskApi) {
- this.taskApi = taskApi;
- }
-
- /** @see Predicate#apply(Object) */
- @Override
- public boolean apply(Task task) {
- checkNotNull(task, "task");
- logger.trace("looking for status on task %s", task.getOperationName());
-
- // TODO shouldn't we see if it's already done before getting it from API server?
- task = taskApi.get(task.getHref());
-
- // perhaps task isn't available, yet
- if (task == null) return false;
-
- logger.trace("%s: looking for status %s: currently: %s", task.getOperationName(), Task.Status.SUCCESS, task.getStatus());
- if (EnumSet.of(Task.Status.ERROR, Task.Status.CANCELED, Task.Status.ABORTED).contains(task.getStatus())) {
- throw new VCloudDirectorException(task);
- } else return task.getStatus().equals(Task.Status.SUCCESS);
- }
-
- @Override
- public String toString() {
- return "checkTaskSuccess()";
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorApi.java
deleted file mode 100644
index 85bb25f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorApi.java
+++ /dev/null
@@ -1,143 +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.vcloud.director.v1_5.user;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.io.Closeable;
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import org.jclouds.rest.annotations.Delegate;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-import org.jclouds.vcloud.director.v1_5.domain.Session;
-import org.jclouds.vcloud.director.v1_5.features.CatalogApi;
-import org.jclouds.vcloud.director.v1_5.features.MediaApi;
-import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
-import org.jclouds.vcloud.director.v1_5.features.NetworkApi;
-import org.jclouds.vcloud.director.v1_5.features.OrgApi;
-import org.jclouds.vcloud.director.v1_5.features.QueryApi;
-import org.jclouds.vcloud.director.v1_5.features.TaskApi;
-import org.jclouds.vcloud.director.v1_5.features.UploadApi;
-import org.jclouds.vcloud.director.v1_5.features.VAppApi;
-import org.jclouds.vcloud.director.v1_5.features.VAppTemplateApi;
-import org.jclouds.vcloud.director.v1_5.features.VdcApi;
-import org.jclouds.vcloud.director.v1_5.features.VmApi;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-import com.google.inject.Provides;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VCloudDirectorApi extends Closeable {
-
- /**
- * Redirects to the URL of an entity with the given VCD ID.
- *
- * <pre>
- * GET /entity/{id}
- * </pre>
- */
- @GET
- @Path("/entity/{id}")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- Entity resolveEntity(@PathParam("id") String id);
-
- /**
- * @return the current login session
- */
- @Provides
- Session getCurrentSession();
-
- /**
- * @return synchronous access to query features
- */
- @Delegate
- QueryApi getQueryApi();
-
- /**
- * @return synchronous access to {@link Org} features
- */
- @Delegate
- OrgApi getOrgApi();
-
- /**
- * @return synchronous access to {@link Task} features
- */
- @Delegate
- TaskApi getTaskApi();
-
- /**
- * @return synchronous access to {@link Network} features
- */
- @Delegate
- NetworkApi getNetworkApi();
-
- /**
- * @return synchronous access to {@link Catalog} features
- */
- @Delegate
- CatalogApi getCatalogApi();
-
- /**
- * @return synchronous access to {@link Media} features
- */
- @Delegate
- MediaApi getMediaApi();
-
- /**
- * @return synchronous access to {@link Vdc} features
- */
- @Delegate
- VdcApi getVdcApi();
-
- /**
- * @return synchronous access to upload features
- */
- @Delegate
- UploadApi getUploadApi();
-
- /**
- * @return synchronous access to {@link VApp} features
- */
- @Delegate
- VAppApi getVAppApi();
-
- /**
- * @return synchronous access to {@link VAppTemplate} features
- */
- @Delegate
- VAppTemplateApi getVAppTemplateApi();
-
- /**
- * @return synchronous access to {@link Vm} features
- */
- @Delegate
- VmApi getVmApi();
-
- @Delegate
- MetadataApi getMetadataApi(@EndpointParam URI href);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/vcloud-director/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 262e987..0000000
--- a/vcloud-director/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.vcloud.director.v1_5.VCloudDirectorApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java
deleted file mode 100644
index 0aee156..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java
+++ /dev/null
@@ -1,99 +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.vcloud.director.testng;
-
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.TestListenerAdapter;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicates;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Outputs test status to the {@code jclouds.vcloud.api} logger.
- *
- * Adapted from {@link org.jclouds.test.testng.UnitTestTestNGListener}.
- */
-public class FormatApiResultsListener extends TestListenerAdapter {
-
- public static final Logger logger = LoggerFactory.getLogger("jclouds.vcloud.api");
-
- private static final SimpleDateFormat timestamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- private static final Set<String> apis = ImmutableSet.of("admin", "user");
-
- @Override
- public synchronized void onTestSuccess(ITestResult res) {
- if (methodInApiGroup(res)) {
- String statusLine = resultForState(res, "succeeded");
- logger.info(statusLine);
- }
- }
-
- @Override
- public synchronized void onTestFailure(ITestResult res) {
- if (methodInApiGroup(res)) {
- String statusLine = resultForState(res, "failed");
- logger.info(statusLine);
- }
- }
-
- @Override
- public synchronized void onTestSkipped(ITestResult res) {
- if (methodInApiGroup(res)) {
- String statusLine = resultForState(res, "skipped");
- logger.info(statusLine);
- }
- }
-
- private boolean methodInApiGroup(ITestResult res) {
- return Iterables.any(Arrays.asList(res.getMethod().getGroups()), Predicates.in(apis));
- }
-
- private String resultForState(ITestResult res, String state) {
- return Joiner.on(',').join(getApi(res), getOperation(res), getStart(res), getTest(res), getDuration(res), state);
- }
-
- private String getApi(ITestResult res) {
- Optional<String> found = Iterables.tryFind(Arrays.asList(res.getMethod().getGroups()), Predicates.in(apis));
- return found.isPresent() ? found.get() : "";
- }
-
- private String getOperation(ITestResult res) {
- return Strings.nullToEmpty(res.getMethod().getDescription());
- }
-
- private String getTest(ITestResult res) {
- return Strings.nullToEmpty(res.getName());
- }
-
- private String getStart(ITestResult res) {
- return timestamp.format(res.getStartMillis());
- }
-
- private String getDuration(ITestResult res) {
- return Long.toString(res.getEndMillis() - res.getStartMillis());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppApiLiveTest.java
deleted file mode 100644
index 9ecd55a..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppApiLiveTest.java
+++ /dev/null
@@ -1,415 +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.vcloud.director.v1_5;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.ENTITY_NON_NULL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkGuestCustomizationSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkNetworkConnectionSection;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.List;
-import java.util.Set;
-
-import org.jclouds.dmtf.cim.CimBoolean;
-import org.jclouds.dmtf.cim.CimString;
-import org.jclouds.dmtf.cim.CimUnsignedInt;
-import org.jclouds.dmtf.cim.CimUnsignedLong;
-import org.jclouds.vcloud.director.v1_5.domain.AbstractVApp;
-import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection.IpAddressAllocationMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.features.CatalogApi;
-import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
-import org.jclouds.vcloud.director.v1_5.features.QueryApi;
-import org.jclouds.vcloud.director.v1_5.features.VAppApi;
-import org.jclouds.vcloud.director.v1_5.features.VAppTemplateApi;
-import org.jclouds.vcloud.director.v1_5.features.VdcApi;
-import org.jclouds.vcloud.director.v1_5.features.VmApi;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.predicates.ReferencePredicates;
-import org.jclouds.xml.internal.JAXBParser;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
-import com.google.common.collect.Iterables;
-
-/**
- * Shared code to test the behaviour of {@link VAppApi} and {@link VAppTemplateApi}.
- */
-public abstract class AbstractVAppApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public static final String VAPP = "VApp";
- public static final String VAPP_TEMPLATE = "VAppTemplate";
- public static final String VDC = "Vdc";
- public static final String VM = "Vm";
-
- /*
- * Convenience reference to API apis.
- */
-
- protected CatalogApi catalogApi;
- protected QueryApi queryApi;
- protected VAppApi vAppApi;
- protected VAppTemplateApi vAppTemplateApi;
- protected VdcApi vdcApi;
- protected VmApi vmApi;
- protected MetadataApi metadataApi;
-
- /*
- * Objects shared between tests.
- */
-
- protected Vdc vdc;
- protected Vm vm;
- protected VApp vApp;
- protected VAppTemplate vAppTemplate;
- protected String vmId;
- protected String vAppId;
-
- /**
- * Retrieves the required apis from the REST API context
- *
- * @see BaseVCloudDirectorApiLiveTest#setupRequiredApis()
- */
- @Override
- protected void setupRequiredApis() {
- assertNotNull(context.getApi());
-
- catalogApi = context.getApi().getCatalogApi();
- queryApi = context.getApi().getQueryApi();
- vAppApi = context.getApi().getVAppApi();
- vAppTemplateApi = context.getApi().getVAppTemplateApi();
- vdcApi = context.getApi().getVdcApi();
- vmApi = context.getApi().getVmApi();
- }
-
- /**
- * Sets up the environment. Retrieves the test {@link Vdc} and {@link VAppTemplate} from their
- * configured {@link URI}s. Instantiates a new test VApp.
- */
- @BeforeClass(alwaysRun = true, description = "Retrieves the required apis from the REST API context")
- protected void setupEnvironment() {
- // Get the configured Vdc for the tests
- vdc = lazyGetVdc();
-
- // Get the configured VAppTemplate for the tests
- vAppTemplate = vAppTemplateApi.get(context.resolveIdToHref(vAppTemplateId));
- assertNotNull(vAppTemplate, String.format(ENTITY_NON_NULL, VAPP_TEMPLATE));
-
- // Instantiate a new VApp
- VApp vAppInstantiated = instantiateVApp();
- assertNotNull(vAppInstantiated, String.format(ENTITY_NON_NULL, VAPP));
- vAppId = vAppInstantiated.getId();
-
- // Wait for the task to complete
- Task instantiateTask = Iterables.getOnlyElement(vAppInstantiated.getTasks());
- assertTrue(retryTaskSuccessLong.apply(instantiateTask), String.format(TASK_COMPLETE_TIMELY, "instantiateTask"));
-
- // Get the instantiated VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Get the Vm
- List<Vm> vms = vApp.getChildren().getVms();
- vm = Iterables.getOnlyElement(vms);
- vmId = vm.getId();
- assertFalse(vms.isEmpty(), "The VApp must have a Vm");
- }
-
- protected void getGuestCustomizationSection(final Function<URI, GuestCustomizationSection> getGuestCustomizationSection) {
- // Get URI for child VM
- URI vmHref = Iterables.getOnlyElement(vApp.getChildren().getVms()).getHref();
-
- // The method under test
- try {
- GuestCustomizationSection section = getGuestCustomizationSection.apply(vmHref);
-
- // Check the retrieved object is well formed
- checkGuestCustomizationSection(section);
- } catch (Exception e) {
- Throwables.propagate(e);
- }
- }
-
- protected void getNetworkConnectionSection(final Function<URI, NetworkConnectionSection> getNetworkConnectionSection) {
- // Get URI for child VM
- URI vmHref = Iterables.getOnlyElement(vApp.getChildren().getVms()).getHref();
-
- // The method under test
- try {
- NetworkConnectionSection section = getNetworkConnectionSection.apply(vmHref);
-
- // Check the retrieved object is well formed
- checkNetworkConnectionSection(section);
- } catch (Exception e) {
- Throwables.propagate(e);
- }
- }
-
- @AfterClass(alwaysRun = true, description = "Cleans up the environment by deleting addd VApps")
- protected void cleanUpEnvironment() {
- vdc = vdcApi.get(context.resolveIdToHref(vdcId)); // Refresh
-
- // Find references in the Vdc with the VApp type and in the list of instantiated VApp names
- Iterable<Reference> vApps = Iterables.filter(vdc.getResourceEntities(),
- Predicates.and(ReferencePredicates.<Reference> typeEquals(VCloudDirectorMediaType.VAPP), ReferencePredicates.<Reference> nameIn(vAppNames)));
-
- // If we found any references, remove the VApp they point to
- if (!Iterables.isEmpty(vApps)) {
- for (Reference ref : vApps) {
- cleanUpVApp(context.getApi().getVAppApi().get(ref.getHref())); // NOTE may fail, but should continue deleting
- }
- } else {
- logger.warn("No VApps in list found in Vdc %s (%s)", vdc.getName(), Iterables.toString(vAppNames));
- }
- }
-
- protected static CimBoolean cimBoolean(boolean val) {
- CimBoolean result = new CimBoolean();
- result.setValue(val);
- return result;
- }
-
- protected static CimUnsignedInt cimUnsignedInt(long val) {
- CimUnsignedInt result = new CimUnsignedInt();
- result.setValue(val);
- return result;
- }
-
- protected static CimUnsignedLong cimUnsignedLong(BigInteger val) {
- CimUnsignedLong result = new CimUnsignedLong();
- result.setValue(val);
- return result;
- }
-
- protected static CimString cimString(String value) {
- return new CimString(value);
- }
-
- protected void checkHasMatchingItem(final String context, final RasdItemsList items, final String instanceId, final String elementName) {
- Optional<RasdItem> found = Iterables.tryFind(items.getItems(), new Predicate<RasdItem>() {
- @Override
- public boolean apply(RasdItem item) {
- String itemInstanceId = item.getInstanceID();
- if (itemInstanceId.equals(instanceId)) {
- Assert.assertEquals(item.getElementName(), elementName,
- String.format(OBJ_FIELD_EQ, VAPP, context + "/" + instanceId + "/elementName", elementName, item.getElementName()));
- return true;
- }
- return false;
- }
- });
- assertTrue(found.isPresent(), "no " + context + " item found with id " + instanceId + "; only found " + items);
- }
-
- /**
- * Power on a {@link VApp}.
- */
- protected VApp powerOnVApp(URI vAppHref) {
- VApp test = vAppApi.get(vAppHref);
- Status status = test.getStatus();
- if (status != Status.POWERED_ON) {
- Task powerOn = vAppApi.powerOn(vAppHref);
- assertTaskSucceedsLong(powerOn);
- }
- test = vAppApi.get(vAppHref);
- assertStatus(VAPP, test, Status.POWERED_ON);
- return test;
- }
-
- /**
- * Power on a {@link Vm}.
- */
- protected Vm powerOnVm(URI vmHref) {
- Vm test = vmApi.get(vmHref);
- Status status = test.getStatus();
- if (status != Status.POWERED_ON) {
- Task powerOn = vmApi.powerOn(vmHref);
- assertTaskSucceedsLong(powerOn);
- }
- test = vmApi.get(vmHref);
- assertStatus(VM, test, Status.POWERED_ON);
- return test;
- }
-
- /**
- * Power off a {@link VApp}.
- */
- protected VApp powerOffVApp(URI vAppHref) {
- VApp test = vAppApi.get(vAppHref);
- Status status = test.getStatus();
- if (status != Status.POWERED_OFF) {
- Task powerOff = vAppApi.powerOff(vAppHref);
- assertTaskSucceedsLong(powerOff);
- }
- test = vAppApi.get(vAppHref);
- assertStatus(VAPP, test, Status.POWERED_OFF);
- return test;
- }
-
- /**
- * Power off a {@link Vm}.
- */
- protected Vm powerOffVm(URI vmHref) {
- Vm test = vmApi.get(vmHref);
- Status status = test.getStatus();
- if (status != Status.POWERED_OFF || test.isDeployed()) {
- UndeployVAppParams undeployParams = UndeployVAppParams.builder().build();
- Task shutdownVapp = vmApi.undeploy(vmHref, undeployParams);
- assertTaskSucceedsLong(shutdownVapp);
- }
- test = vmApi.get(vmHref);
- assertStatus(VM, test, Status.POWERED_OFF);
- return test;
- }
-
- /**
- * Suspend a {@link VApp}.
- */
- protected VApp suspendVApp(URI vAppHref) {
- VApp test = vAppApi.get(vAppHref);
- Status status = test.getStatus();
- if (status != Status.SUSPENDED) {
- Task suspend = vAppApi.suspend(vAppHref);
- assertTaskSucceedsLong(suspend);
- }
- test = vAppApi.get(vAppHref);
- assertStatus(VAPP, test, Status.SUSPENDED);
- return test;
- }
-
- /**
- * Suspend a {@link Vm}.
- */
- protected Vm suspendVm(URI vmHref) {
- Vm test = vmApi.get(vmHref);
- Status status = test.getStatus();
- if (status != Status.SUSPENDED) {
- Task suspend = vmApi.suspend(vmHref);
- assertTaskSucceedsLong(suspend);
- }
- test = vmApi.get(vmHref);
- assertStatus(VM, test, Status.SUSPENDED);
- return test;
- }
-
- /**
- * Check the {@link VApp}s current status.
- */
- protected void assertVAppStatus(URI vAppHref, final Status status) {
- VApp testVApp = vAppApi.get(vAppHref);
- assertStatus(VAPP, testVApp, status);
- }
-
- /**
- * Check the {@link Vm}s current status.
- */
- protected void assertVmStatus(URI vmHref, final Status status) {
- Vm testVm = vmApi.get(vmHref);
- assertStatus(VM, testVm, status);
- }
-
- /**
- * Check a {@link VApp} or {@link Vm}s status.
- */
- protected static void assertStatus(final String type, final AbstractVApp testVApp, final Status status) {
- assertEquals(testVApp.getStatus(), status, String.format(OBJ_FIELD_EQ, type, "status", status.toString(), testVApp.getStatus().toString()));
- }
-
- protected void debug(final Object object) {
- JAXBParser parser = new JAXBParser("true");
- try {
- String xml = parser.toXML(object);
- logger.debug(Strings.padStart(Strings.padEnd(" " + object.getClass().toString() + " ", 70, '-'), 80, '-'));
- logger.debug(xml);
- logger.debug(Strings.repeat("-", 80));
- } catch (IOException ioe) {
- Throwables.propagate(ioe);
- }
- }
-
- protected VAppNetworkConfiguration getVAppNetworkConfig(VApp vApp) {
- Set<VAppNetworkConfiguration> vAppNetworkConfigs = vAppApi.getNetworkConfigSection(vApp.getHref()).getNetworkConfigs();
- return Iterables.tryFind(vAppNetworkConfigs, Predicates.notNull()).orNull();
- }
-
- protected boolean vAppHasNetworkConfigured(VApp vApp) {
- return getVAppNetworkConfig(vApp) != null;
- }
-
- protected boolean vmHasNetworkConnectionConfigured(Vm vm) {
- return listNetworkConnections(vm).size() > 0;
- }
-
- protected Set<NetworkConnection> listNetworkConnections(Vm vm) {
- return vmApi.getNetworkConnectionSection(vm.getHref()).getNetworkConnections();
- }
-
- protected Set<VAppNetworkConfiguration> listVappNetworkConfigurations(VApp vApp) {
- Set<VAppNetworkConfiguration> vAppNetworkConfigs = vAppApi.getNetworkConfigSection(vApp.getHref()).getNetworkConfigs();
- return vAppNetworkConfigs;
- }
-
- protected void attachVmToVAppNetwork(Vm vm, String vAppNetworkName) {
- Set<NetworkConnection> networkConnections = vmApi.getNetworkConnectionSection(vm.getHref())
- .getNetworkConnections();
-
- NetworkConnectionSection section = NetworkConnectionSection.builder()
- .info("info")
- .primaryNetworkConnectionIndex(0)
- .build();
-
- for (NetworkConnection networkConnection : networkConnections) {
- NetworkConnection newNetworkConnection = networkConnection.toBuilder()
- .network(vAppNetworkName)
- .isConnected(true)
- .networkConnectionIndex(0)
- .ipAddressAllocationMode(IpAddressAllocationMode.POOL)
- .build();
-
- section = section.toBuilder().networkConnection(newNetworkConnection).build();
- }
- Task configureNetwork = vmApi.editNetworkConnectionSection(vm.getHref(), section);
- assertTaskSucceedsLong(configureNetwork);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExpectTest.java
deleted file mode 100644
index c058ba6..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExpectTest.java
+++ /dev/null
@@ -1,37 +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.vcloud.director.v1_5;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.login.SessionApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "VCloudDirectorApi")
-public class VCloudDirectorApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- //TODO: this inheritance is all wrong!! the base client shouldn't inherit from the admin client tests!!
-
- public void testRestClientModuleWorksProperly() throws Exception {
-
- VCloudDirectorApi apiWhenSessionsExist = requestSendsResponse(loginRequest, sessionResponse);
-
- assertEquals(apiWhenSessionsExist.getCurrentSession(), SessionApiExpectTest.SESSION);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExperimentLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExperimentLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExperimentLiveTest.java
deleted file mode 100644
index e98ab80..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiExperimentLiveTest.java
+++ /dev/null
@@ -1,43 +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.vcloud.director.v1_5;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.vcloud.director.v1_5.domain.Session;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-@Test(groups = "live", testName = "VCloudDirectorApiExperimentLiveTest")
-public class VCloudDirectorApiExperimentLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- public void testImplicitSession() {
- Session session = context.getApi().getCurrentSession();
- assertEquals(session.getHref().toASCIIString(), context.getProviderMetadata().getEndpoint() + "/session/");
- }
-
- /**
- * No operation.
- *
- * @see BaseVCloudDirectorApiLiveTest#setupRequiredApis()
- */
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() { }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiLiveTest.java
deleted file mode 100644
index 253ff26..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiLiveTest.java
+++ /dev/null
@@ -1,47 +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.vcloud.director.v1_5;
-
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkEntityType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests live behavior of {@link VCloudDirectorApi}.
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "VCloudDirectorApiLiveTest")
-public class VCloudDirectorApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- @Test(description = "GET /entity/{id}")
- public void testResolveEntity() {
- for (Reference orgRef : context.getApi().getOrgApi().list()) {
- Org org = context.getApi().getOrgApi().get(orgRef.getHref());
- Entity entity = context.getApi().resolveEntity(org.getId());
- checkEntityType(entity);
- }
- }
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadataTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadataTest.java
deleted file mode 100644
index 201b1db..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadataTest.java
+++ /dev/null
@@ -1,33 +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.vcloud.director.v1_5;
-
-import org.jclouds.View;
-import org.jclouds.apis.internal.BaseApiMetadataTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.TypeToken;
-
-@Test(groups = "unit", testName = "VCloudDirectorApiMetadataTest")
-//TODO: BaseComputeServiceApiMetadataTest
-public class VCloudDirectorApiMetadataTest extends BaseApiMetadataTest {
-
- public VCloudDirectorApiMetadataTest() {
- super(new VCloudDirectorApiMetadata(), ImmutableSet.<TypeToken<? extends View>>of());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorLiveTestConstants.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorLiveTestConstants.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorLiveTestConstants.java
deleted file mode 100644
index f713d8b..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorLiveTestConstants.java
+++ /dev/null
@@ -1,106 +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.vcloud.director.v1_5;
-
-public final class VCloudDirectorLiveTestConstants {
-
- /* regular expressions for pattern matching */
-
- public static final String MAC_ADDRESS_PATTERN = "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$";
-
- /* Error code 200 indicates success. */
-
- public static final String OK = "ERR-200: ok";
-
- /* Error codes from 100 to 199 reflect parsing and other errors in domain object fields and attributes. */
-
- public static final String URN_REQ_LIVE = "ERR-101: %s urn required to perform live tests";
-
- public static final String OBJ_REQ_LIVE = "ERR-102: %s instance required to perform live tests";
-
- public static final String OBJ_FIELD_REQ_LIVE = "ERR-103: %s must have a non-null \"%s\" to perform live tests";
-
- public static final String OBJ_FIELD_REQ = "ERR-103: %s must always have a non-null field \"%s\"";
-
- public static final String OBJ_FIELD_ATTRB_REQ = "ERR-105: %s %s (%s) must always have a non-null field \"%s\"";
-
- public static final String OBJ_FIELD_EQ = "ERR-106: %s %s must have the value \"%s\" (%s)";
-
- public static final String OBJ_FIELD_CONTAINS = "ERR-107: %s %s must contain the values \"%s\" (%s)";
-
- public static final String OBJ_FIELD_GTE_0 = "ERR-108: %s field %s must be greater than to equal to 0 (%d)";
-
- public static final String OBJ_FIELD_GTE_1 = "ERR-108: %s field %s must be greater than to equal to 0 (%d)";
-
- public static final String OBJ_FIELD_GTE = "ERR-108: %s field %s must be greater than to equal to %d (%d)";
-
- public static final String GETTER_RETURNS_SAME_OBJ = "ERR-109: %s should return the same %s as %s (%s, %s)";
-
- public static final String OBJ_FIELD_UPDATABLE = "ERR-110: %s field %s should be updatable";
-
- public static final String OBJ_FIELD_ATTRB_DEL = "ERR-111: %s %s (%s) should have deleted field \"%s\" (%s)";
-
- public static final String OBJ_DEL = "ERR-112: %s (%s) should have been deleted";
-
- public static final String TASK_COMPLETE_TIMELY = "ERR-113: Task %s should complete in a timely fashion";
-
- public static final String NOT_NULL_OBJ_FIELD_FMT = "ERR-114: The %s field of the %s must not be null";
-
- public static final String NOT_EMPTY_OBJECT_FMT = "ERR-115: One or more %s fields of the %s must be present";
-
- public static final String REQUIRED_VALUE_OBJECT_FMT = "ERR-116: The %s field of the %s must not be '%s'; allowed values: %s";
-
- public static final String REQUIRED_VALUE_FMT = "ERR-117: The %s field must not be '%s'; allowed values: %s";
-
- public static final String MUST_BE_WELL_FORMED_FMT = "ERR-118: The %s field must be well formed: '%s'";
-
- public static final String MUST_EXIST_FMT = "ERR-119: The '%s' %s must exist";
-
- public static final String MUST_CONTAIN_FMT = "ERR-120: The %s field must contain '%s': '%s'";
-
- public static final String CONDITION_FMT = "ERR-121: The %s field must be %s: '%s'";
-
- public static final String CORRECT_VALUE_OBJECT_FMT = "ERR-122: The %s field of the %s must be '%s': '%s'";
-
- public static final String OBJ_FIELD_CLONE = "ERR-123: %s %s must be a clone of \"%s\" (%s)";
-
- public static final String OBJ_FIELD_EMPTY_TO_DELETE = "ERR-124: %s must have no %s to be deleted (%s)";
-
- public static final String NOT_NULL_OBJ_FMT = "ERR-125: The %s object must not be null";
-
- public static final String NOT_EMPTY_STRING_FMT = "ERR-126: The %s field must not be an empty string";
-
- public static final String MATCHES_STRING_FMT = "ERR-127: The %s field must match the pattern \"%s\" (%s)";
-
- public static final String OBJ_FIELD_LIST_EMPTY = "ERR-128: %s %s must be empty (%d members)";
-
- public static final String OBJ_FIELD_LIST_SIZE_EQ = "ERR-129: %s %s must have %d members (%d members)";
-
- public static final String OBJ_FIELD_LIST_SIZE_GE = "ERR-130: %s %s must have at least %d members (%d members)";
-
- /* Error codes from 300 to 399 reflect entities and their links and relationship errors. */
-
- public static final String ENTITY_NON_NULL = "ERR-301: The %s entity must not be null";
-
- public static final String ENTITY_EQUAL = "ERR-302: The two %s entities must be equal";
-
- public static final String ENTITY_CONDITION = "ERR-303: The %s entity must %s (%s)";
-
- private VCloudDirectorLiveTestConstants() {
- throw new AssertionError("intentionally unimplemented");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadataTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadataTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadataTest.java
deleted file mode 100644
index 1bb41c8..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindMapAsMetadataTest.java
+++ /dev/null
@@ -1,54 +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.vcloud.director.v1_5.binders;
-
-import static org.testng.Assert.assertEquals;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.xml.XMLParser;
-import org.jclouds.xml.internal.JAXBParser;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Tests behavior of {@code BindMapAsMetadata}.
- */
-@Test(groups = "unit", testName = "BindMapAsMetadataTest")
-public class BindMapAsMetadataTest {
- XMLParser xml = new JAXBParser("true");
-
- @Test
- public void testBindMap() {
- BindMapAsMetadata binder = new BindMapAsMetadata(xml);
-
- HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://momma").build();
- request = binder.bindToRequest(request, ImmutableMap.of("foo", "bar"));
- assertEquals(request.getPayload().getRawContent(),
- XMLParser.DEFAULT_XML_HEADER + "\n" +
- "<Metadata xmlns=\"http://www.vmware.com/vcloud/v1.5\">" + "\n" +
- " <MetadataEntry>" + "\n" +
- " <Key>foo</Key>" + "\n" +
- " <Value>bar</Value>" + "\n" +
- " </MetadataEntry>" + "\n" +
- "</Metadata>" + "\n");
- assertEquals(request.getPayload().getContentMetadata().getContentType(), MediaType.APPLICATION_XML);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValueTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValueTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValueTest.java
deleted file mode 100644
index 4f28366..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/binders/BindStringAsMetadataValueTest.java
+++ /dev/null
@@ -1,49 +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.vcloud.director.v1_5.binders;
-
-import static org.testng.Assert.assertEquals;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.xml.XMLParser;
-import org.jclouds.xml.internal.JAXBParser;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code BindStringAsMetadataValue}.
- */
-@Test(groups = "unit", testName = "BindStringAsMetadataValueTest")
-public class BindStringAsMetadataValueTest {
- XMLParser xml = new JAXBParser("true");
-
- @Test
- public void testBindMap() {
- BindStringAsMetadataValue binder = new BindStringAsMetadataValue(xml);
-
- HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://momma").build();
- request = binder.bindToRequest(request, "foo");
- assertEquals(request.getPayload().getRawContent(),
- XMLParser.DEFAULT_XML_HEADER + "\n" +
- "<MetadataValue xmlns=\"http://www.vmware.com/vcloud/v1.5\">" + "\n" +
- " <Value>foo</Value>" + "\n" +
- "</MetadataValue>" + "\n");
- assertEquals(request.getPayload().getContentMetadata().getContentType(), MediaType.APPLICATION_XML);
- }
-
-}
[18/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java
deleted file mode 100644
index 22194a1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java
+++ /dev/null
@@ -1,332 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "VAppRecord")
-@XmlType(name = "QueryResultVAppRecordType")
-public class QueryResultVAppRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultVAppRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String vdc;
- private String vdcName;
- private Boolean isPublic;
- private Boolean isEnabled;
- private Boolean isBusy;
- private Date creationDate;
- private String status;
- private String ownerName;
- private Boolean isDeployed;
- private Boolean isInMaintenanceMode;
-
- /**
- * @see QueryResultVAppRecord#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getVdc()
- */
- public B vdc(String vdc) {
- this.vdc = vdc;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getVdcName()
- */
- public B vdcName(String vdcName) {
- this.vdcName = vdcName;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getIsPublic()
- */
- public B isPublic(Boolean isPublic) {
- this.isPublic = isPublic;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getIsEnabled()
- */
- public B isEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getIsBusy()
- */
- public B isBusy(Boolean isBusy) {
- this.isBusy = isBusy;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getCreationDate()
- */
- public B creationDate(Date creationDate) {
- this.creationDate = creationDate;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getStatus()
- */
- public B status(String status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getOwnerName()
- */
- public B ownerName(String ownerName) {
- this.ownerName = ownerName;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getIsDeployed()
- */
- public B isDeployed(Boolean isDeployed) {
- this.isDeployed = isDeployed;
- return self();
- }
-
- /**
- * @see QueryResultVAppRecord#getIsInMaintenanceMode()
- */
- public B isInMaintenanceMode(Boolean isInMaintenanceMode) {
- this.isInMaintenanceMode = isInMaintenanceMode;
- return self();
- }
-
- @Override
- public QueryResultVAppRecord build() {
- return new QueryResultVAppRecord(this);
- }
-
- public B fromQueryResultVAppRecord(QueryResultVAppRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .vdc(in.getVdc())
- .vdcName(in.getVdcName())
- .isPublic(in.isIsPublic())
- .isEnabled(in.isIsEnabled())
- .isBusy(in.isIsBusy())
- .creationDate(in.getCreationDate())
- .status(in.getStatus())
- .ownerName(in.getOwnerName())
- .isDeployed(in.isIsDeployed())
- .isInMaintenanceMode(in.isIsInMaintenanceMode());
- }
- }
-
- private QueryResultVAppRecord() {
- // For JAXB and builder use
- }
-
- private QueryResultVAppRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.vdc = builder.vdc;
- this.vdcName = builder.vdcName;
- this.isPublic = builder.isPublic;
- this.isEnabled = builder.isEnabled;
- this.isBusy = builder.isBusy;
- this.creationDate = builder.creationDate;
- this.status = builder.status;
- this.ownerName = builder.ownerName;
- this.isDeployed = builder.isDeployed;
- this.isInMaintenanceMode = builder.isInMaintenanceMode;
- }
-
- @XmlAttribute
- protected String name;
- @XmlAttribute
- protected String vdc;
- @XmlAttribute
- protected String vdcName;
- @XmlAttribute
- protected Boolean isPublic;
- @XmlAttribute
- protected Boolean isEnabled;
- @XmlAttribute
- protected Boolean isBusy;
- @XmlAttribute
- @XmlSchemaType(name = "dateTime")
- protected Date creationDate;
- @XmlAttribute
- protected String status;
- @XmlAttribute
- protected String ownerName;
- @XmlAttribute
- protected Boolean isDeployed;
- @XmlAttribute
- protected Boolean isInMaintenanceMode;
-
- /**
- * Gets the value of the name property.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the value of the vdc property.
- */
- public String getVdc() {
- return vdc;
- }
-
- /**
- * Gets the value of the vdcName property.
- */
- public String getVdcName() {
- return vdcName;
- }
-
- /**
- * Gets the value of the isPublic property.
- */
- public Boolean isIsPublic() {
- return isPublic;
- }
-
- /**
- * Gets the value of the isEnabled property.
- */
- public Boolean isIsEnabled() {
- return isEnabled;
- }
-
- /**
- * Gets the value of the isBusy property.
- */
- public Boolean isIsBusy() {
- return isBusy;
- }
-
- /**
- * Gets the value of the creationDate property.
- */
- public Date getCreationDate() {
- return creationDate;
- }
-
- /**
- * Gets the value of the status property.
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * Gets the value of the ownerName property.
- */
- public String getOwnerName() {
- return ownerName;
- }
-
- /**
- * Gets the value of the isDeployed property.
- */
- public Boolean isIsDeployed() {
- return isDeployed;
- }
-
- /**
- * Gets the value of the isInMaintenanceMode property.
- */
- public Boolean isIsInMaintenanceMode() {
- return isInMaintenanceMode;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultVAppRecord that = QueryResultVAppRecord.class.cast(o);
- return super.equals(that) &&
- equal(this.name, that.name) &&
- equal(this.vdc, that.vdc) &&
- equal(this.vdcName, that.vdcName) &&
- equal(this.isPublic, that.isPublic) &&
- equal(this.isEnabled, that.isEnabled) &&
- equal(this.isBusy, that.isBusy) &&
- equal(this.creationDate, that.creationDate) &&
- equal(this.status, that.status) &&
- equal(this.ownerName, that.ownerName) &&
- equal(this.isDeployed, that.isDeployed) &&
- equal(this.isInMaintenanceMode, that.isInMaintenanceMode);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, vdc, vdcName, isPublic, isEnabled, isBusy, creationDate, status, ownerName, isDeployed, isInMaintenanceMode);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("name", name)
- .add("vdc", vdc)
- .add("vdcName", vdcName)
- .add("isPublic", isPublic)
- .add("isEnabled", isEnabled)
- .add("isBusy", isBusy)
- .add("creationDate", creationDate)
- .add("status", status)
- .add("ownerName", ownerName)
- .add("isDeployed", isDeployed)
- .add("isInMaintenanceMode", isInMaintenanceMode);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java
deleted file mode 100644
index 0c419fb..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java
+++ /dev/null
@@ -1,357 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "VAppTemplateRecord")
-@XmlType(name = "QueryResultVAppTemplateRecordType")
-public class QueryResultVAppTemplateRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultVappTemplateRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String ownerName;
- private String catalogName;
- private Boolean isPublished;
- private String name;
- private String vdc;
- private String vdcName;
- private String org;
- private Date creationDate;
- private Boolean isBusy;
- private Boolean isGoldMaster;
- private Boolean isEnabled;
- private String status;
- private Boolean isDeployed;
-
- /**
- * @see QueryResultVAppTemplateRecord#getOwnerName()
- */
- public B ownerName(String ownerName) {
- this.ownerName = ownerName;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#getCatalogName()
- */
- public B catalogName(String catalogName) {
- this.catalogName = catalogName;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#isPublished()
- */
- public B isPublished(Boolean val) {
- this.isPublished = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#getVdc()
- */
- public B vdc(String val) {
- this.vdc = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#getVdcName()
- */
- public B vdcName(String val) {
- this.vdcName = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#get()
- */
- public B org(String val) {
- this.org = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#getCreationDate()
- */
- public B creationDate(Date val) {
- this.creationDate = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#isBusy()
- */
- public B isBusy(Boolean val) {
- this.isBusy = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#isGoldMaster()
- */
- public B isGoldMaster(Boolean val) {
- this.isGoldMaster = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#isEnabled()
- */
- public B isEnabled(Boolean isEnabled) {
- this.isPublished = isEnabled;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#getStatus()
- */
- public B status(String val) {
- this.status = val;
- return self();
- }
-
- /**
- * @see QueryResultVAppTemplateRecord#isDeployed()
- */
- public B isDeployed(Boolean val) {
- this.isDeployed = val;
- return self();
- }
-
- @Override
- public QueryResultVAppTemplateRecord build() {
- return new QueryResultVAppTemplateRecord(this);
- }
-
- public B fromQueryResultVappTemplateRecord(QueryResultVAppTemplateRecord in) {
- return fromQueryResultRecordType(in)
- .ownerName(in.getOwnerName())
- .catalogName(in.getCatalogName())
- .name(in.getName())
- .isPublished(in.isPublished())
- .vdc(in.getVdc())
- .vdcName(in.getVdcName())
- .org(in.get())
- .creationDate(in.getCreationDate())
- .isBusy(in.isBusy())
- .isGoldMaster(in.isGoldMaster())
- .isEnabled(in.isEnabled())
- .status(in.getStatus())
- .isDeployed(in.isDeployed());
- }
- }
-
- private QueryResultVAppTemplateRecord(Builder<?> builder) {
- super(builder);
- this.ownerName = builder.ownerName;
- this.catalogName = builder.catalogName;
- this.isPublished = builder.isPublished;
- this.name = builder.name;
- this.vdc = builder.vdc;
- this.vdcName = builder.vdcName;
- this.org = builder.org;
- this.creationDate = builder.creationDate;
- this.isBusy = builder.isBusy;
- this.isGoldMaster = builder.isGoldMaster;
- this.isEnabled = builder.isEnabled;
- this.status = builder.status;
- this.isDeployed = builder.isDeployed;
- }
-
- private QueryResultVAppTemplateRecord() {
- // for JAXB
- }
-
- @XmlAttribute
- private String ownerName;
- @XmlAttribute
- private String catalogName;
- @XmlAttribute
- private Boolean isPublished;
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String vdc;
- @XmlAttribute
- private String vdcName;
- @XmlAttribute
- private String org;
- @XmlAttribute
- private Date creationDate;
- @XmlAttribute
- private Boolean isBusy;
- @XmlAttribute
- private Boolean isGoldMaster;
- @XmlAttribute
- private Boolean isEnabled;
- @XmlAttribute
- private String status;
- @XmlAttribute
- private Boolean isDeployed;
-
- /**
- * Owner name.
- */
- public String getOwnerName() {
- return ownerName;
- }
-
- /**
- * Catalog name.
- */
- public String getCatalogName() {
- return catalogName;
- }
-
- /**
- * Shows whether it is in published catalog.
- */
- public boolean isPublished() {
- return isPublished;
- }
-
- /**
- * Gets the value of the name property.
- *
- * @return possible object is {@link String }
- */
- public String getName() {
- return name;
- }
-
- /**
- * vDC reference or id
- */
- public String getVdc() {
- return vdc;
- }
-
- /**
- * vDC name
- */
- public String getVdcName() {
- return vdcName;
- }
-
- /**
- * Organization reference or id
- */
- public String get() {
- return org;
- }
-
- /**
- * Creation date
- */
- public Date getCreationDate() {
- return creationDate;
- }
-
- /**
- * Shows whether it is busy
- */
- public Boolean isBusy() {
- return isBusy;
- }
-
- /**
- * Shows whether Vapp template is marked as a gold master
- */
- public Boolean isGoldMaster() {
- return isGoldMaster;
- }
-
- /**
- * Shows whether vDC is enabled
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Vapp template status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * Shows whether it is deployed
- */
- public Boolean isDeployed() {
- return isDeployed;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultVAppTemplateRecord that = QueryResultVAppTemplateRecord.class.cast(o);
- return super.equals(that) && equal(ownerName, that.ownerName) && equal(catalogName, that.catalogName)
- && equal(isPublished, that.isPublished) && equal(name, that.name) && equal(vdc, that.vdc) && equal(vdcName, that.vdcName)
- && equal(org, that.org) && equal(creationDate, that.creationDate) && equal(isBusy, that.isBusy)
- && equal(isGoldMaster, that.isGoldMaster) && equal(isEnabled, that.isEnabled) && equal(status, that.status)
- && equal(isDeployed, that.isDeployed);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), ownerName, catalogName, isPublished, name, vdc, vdcName, org, creationDate, isBusy, isGoldMaster, isEnabled, status, isDeployed);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("ownerName", ownerName).add("catalogName", catalogName)
- .add("isPublished", isPublished()).add("vdc", vdc).add("vdcName", vdcName).add("org", org)
- .add("creationDate", creationDate).add("isBusy", isBusy).add("isGoldMaster", isGoldMaster)
- .add("isEnabled", isEnabled).add("status", status).add("isDeployed", isDeployed);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java
deleted file mode 100644
index 3ed3da2..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java
+++ /dev/null
@@ -1,406 +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.vcloud.director.v1_5.domain.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "VMRecord")
-@XmlType(name = "QueryResultVMRecordType")
-public class QueryResultVMRecord extends QueryResultRecord {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromQueryResultVMRecord(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
-
- private String name;
- private String containerName;
- private String container;
- private String vdc;
- private Boolean isVAppTemplate;
- private Boolean isDeleted;
- private String guestOs;
- private Integer numberOfCpus;
- private Integer memoryMB;
- private String status;
- private Boolean isBusy;
- private Boolean isDeployed;
- private Boolean isPublished;
- private Boolean catalogName;
- private Integer hardwareVersion;
- private Boolean isInMaintenanceMode;
-
- /**
- * @see QueryResultVMRecord#getName()
- */
- public B name(String val) {
- this.name = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getContainerName()
- */
- public B containerName(String val) {
- this.containerName = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getContainer()
- */
- public B container(String val) {
- this.container = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getVdc()
- */
- public B vdc(String val) {
- this.vdc = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#isVAppTemplate()
- */
- public B isVAppTemplate(Boolean val) {
- this.isVAppTemplate = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#isDeleted()
- */
- public B isDeleted(Boolean val) {
- this.isDeleted = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getGuestOs()
- */
- public B guestOs(String val) {
- this.guestOs = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getNumberOfCpus()
- */
- public B numberOfCpus(Integer val) {
- this.numberOfCpus = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getMemoryMB()
- */
- public B memoryMB(Integer val) {
- this.memoryMB = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getStatus()
- */
- public B status(String val) {
- this.status = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#isBusy()
- */
- public B isBusy(Boolean val) {
- this.isBusy = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#isDeployed()
- */
- public B isDeployed(Boolean val) {
- this.isDeployed = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#isPublished()
- */
- public B isPublished(Boolean val) {
- this.isPublished = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#isCatalogName()
- */
- public B catalogName(Boolean val) {
- this.catalogName = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#getHardwareVersion()
- */
- public B hardwareVersion(Integer val) {
- this.hardwareVersion = val;
- return self();
- }
-
- /**
- * @see QueryResultVMRecord#isInMaintenanceMode()
- */
- public B isInMaintenanceMode(Boolean val) {
- this.isInMaintenanceMode = val;
- return self();
- }
-
- @Override
- public QueryResultVMRecord build() {
- return new QueryResultVMRecord(this);
- }
-
- public B fromQueryResultVMRecord(QueryResultVMRecord in) {
- return fromQueryResultRecordType(in)
- .name(in.getName())
- .containerName(in.getContainerName())
- .container(in.getContainer())
- .vdc(in.getVdc())
- .isVAppTemplate(in.isVAppTemplate())
- .isDeleted(in.isDeleted())
- .guestOs(in.getGuestOs())
- .numberOfCpus(in.getNumberOfCpus())
- .memoryMB(in.getMemoryMB())
- .status(in.getStatus())
- .isBusy(in.isBusy())
- .isDeployed(in.isDeployed())
- .isPublished(in.isPublished())
- .catalogName(in.isCatalogName())
- .hardwareVersion(in.getHardwareVersion())
- .isInMaintenanceMode(in.isInMaintenanceMode());
- }
-
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String containerName;
- @XmlAttribute
- private String container;
- @XmlAttribute
- private String vdc;
- @XmlAttribute
- private Boolean isVAppTemplate;
- @XmlAttribute
- private Boolean isDeleted;
- @XmlAttribute
- private String guestOs;
- @XmlAttribute
- private Integer numberOfCpus;
- @XmlAttribute
- private Integer memoryMB;
- @XmlAttribute
- private String status;
- @XmlAttribute
- private Boolean isBusy;
- @XmlAttribute
- private Boolean isDeployed;
- @XmlAttribute
- private Boolean isPublished;
- @XmlAttribute
- private Boolean catalogName;
- @XmlAttribute
- private Integer hardwareVersion;
- @XmlAttribute
- private Boolean isInMaintenanceMode;
-
- protected QueryResultVMRecord(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.containerName = builder.containerName;
- this.container = builder.container;
- this.vdc = builder.vdc;
- this.isVAppTemplate = builder.isVAppTemplate;
- this.isDeleted = builder.isDeleted;
- this.guestOs = builder.guestOs;
- this.numberOfCpus = builder.numberOfCpus;
- this.memoryMB = builder.memoryMB;
- this.status = builder.status;
- this.isBusy = builder.isBusy;
- this.isDeployed = builder.isDeployed;
- this.isPublished = builder.isPublished;
- this.catalogName = builder.catalogName;
- this.hardwareVersion = builder.hardwareVersion;
- this.isInMaintenanceMode = builder.isInMaintenanceMode;
- }
-
- protected QueryResultVMRecord() {
- // for JAXB
- }
-
- /**
- * name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Vapp name or Vapp template name
- */
- public String getContainerName() {
- return containerName;
- }
-
- /**
- * Vapp or Vapp template
- */
- public String getContainer() {
- return container;
- }
-
- /**
- * vDC reference or id
- */
- public String getVdc() {
- return vdc;
- }
-
- /**
- * Shows whether the VM belongs to VApp or VAppTemplate
- */
- public Boolean isVAppTemplate() {
- return isVAppTemplate;
- }
-
- /**
- * Shows whether it is deleted
- */
- public Boolean isDeleted() {
- return isDeleted;
- }
-
- /**
- * Guest operating system
- */
- public String getGuestOs() {
- return guestOs;
- }
-
- /**
- * Number of CPUs
- */
- public Integer getNumberOfCpus() {
- return numberOfCpus;
- }
-
- /**
- * Memory in MB
- */
- public Integer getMemoryMB() {
- return memoryMB;
- }
-
- /**
- * Status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * Shows whether it is busy
- */
- public Boolean isBusy() {
- return isBusy;
- }
-
- /**
- * Shows whether it is deployed
- */
- public Boolean isDeployed() {
- return isDeployed;
- }
-
- /**
- * Shows whether it is in published catalog
- */
- public Boolean isPublished() {
- return isPublished;
- }
-
- /**
- * Catalog name
- */
- public Boolean isCatalogName() {
- return catalogName;
- }
-
- /**
- * Hardware version
- */
- public Integer getHardwareVersion() {
- return hardwareVersion;
- }
-
- /**
- * Shows whether it is in maintenance mode
- */
- public Boolean isInMaintenanceMode() {
- return isInMaintenanceMode;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- QueryResultVMRecord that = QueryResultVMRecord.class.cast(o);
-
- return super.equals(that) && equal(name, that.name) && equal(containerName, that.containerName) && equal(container, that.container) && equal(vdc, that.vdc) && equal(isVAppTemplate, that.isVAppTemplate) && equal(isDeleted, that.isDeleted) && equal(guestOs, that.guestOs) && equal(numberOfCpus, that.numberOfCpus) && equal(memoryMB, that.memoryMB) && equal(status, that.status) && equal(isBusy, that.isBusy) && equal(isDeployed, that.isDeployed) && equal(isPublished, that.isPublished) && equal(catalogName, that.catalogName) && equal(hardwareVersion, that.hardwareVersion) && equal(isInMaintenanceMode, that.isInMaintenanceMode);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, containerName, container, vdc, isVAppTemplate, isDeleted, guestOs, numberOfCpus, memoryMB, status, isBusy, isDeployed, isPublished, catalogName, hardwareVersion, isInMaintenanceMode);
- }
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("containerName", containerName).add("container", container).add("vdc", vdc).add("isVAppTemplate", isVAppTemplate).add("isDeleted", isDeleted).add("guestOs", guestOs).add("numberOfCpus", numberOfCpus).add("memoryMB", memoryMB).add("status", status).add("isBusy", isBusy).add("isDeployed", isDeployed).add("isPublished", isPublished).add("catalogName", catalogName).add("hardwareVersion", hardwareVersion).add("isInMaintenanceMode", isInMaintenanceMode);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/VAppReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/VAppReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/VAppReferences.java
deleted file mode 100644
index f0156e5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/VAppReferences.java
+++ /dev/null
@@ -1,67 +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.vcloud.director.v1_5.domain.query;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "VAppReferences")
-public class VAppReferences extends QueryResultReferences {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVAppReferences(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultReferences.Builder<B> {
-
- @Override
- public VAppReferences build() {
- return new VAppReferences(this);
- }
-
- public B fromVAppReferences(VAppReferences in) {
- return fromQueryResultReferences(in);
- }
- }
-
- protected VAppReferences(Builder<?> builder) {
- super(builder);
- }
-
- protected VAppReferences() {
- // for JAXB
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VAppReferences that = VAppReferences.class.cast(o);
- return super.equals(that);
- }
-
- // NOTE hashcode inherited from QueryResultReferences
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java
deleted file mode 100644
index 28d2c60..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.query;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java
deleted file mode 100644
index 355798e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java
+++ /dev/null
@@ -1,188 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "CustomizationSection")
-public class CustomizationSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromCustomizationSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
- private boolean customizeOnInstantiate;
- private Set<Link> links = Sets.newLinkedHashSet();
- private URI href;
- private String type;
-
- /**
- * @see CustomizationSection#isCustomizeOnInstantiate()
- */
- public B customizeOnInstantiate(boolean customizeOnInstantiate) {
- this.customizeOnInstantiate = customizeOnInstantiate;
- return self();
- }
-
- /**
- * @see CustomizationSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = checkNotNull(links, "links");
- return self();
- }
-
- /**
- * @see CustomizationSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see CustomizationSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
-
- @Override
- public CustomizationSection build() {
- return new CustomizationSection(this);
- }
-
- public B fromCustomizationSection(CustomizationSection in) {
- return fromSectionType(in)
- .customizeOnInstantiate(in.isCustomizeOnInstantiate())
- .links(in.getLinks())
- .href(in.getHref())
- .type(in.getType());
- }
- }
-
- private CustomizationSection(Builder<?> builder) {
- super(builder);
- this.customizeOnInstantiate = builder.customizeOnInstantiate;
- this.links = ImmutableSet.copyOf(builder.links);
- this.href = builder.href;
- this.type = builder.type;
- }
-
- private CustomizationSection() {
- // For JAXB
- }
-
- @XmlElement(name = "CustomizeOnInstantiate", required = true)
- protected boolean customizeOnInstantiate;
- @XmlElement(name = "Link")
- protected Set<Link> links = Sets.newLinkedHashSet();
- @XmlAttribute
- @XmlSchemaType(name = "anyURI")
- protected URI href;
- @XmlAttribute
- protected String type;
-
- /**
- * Gets the value of the customizeOnInstantiate property.
- */
- public boolean isCustomizeOnInstantiate() {
- return customizeOnInstantiate;
- }
-
- /**
- * Gets the value of the links property.
- */
- public Set<Link> getLinks() {
- return Collections.unmodifiableSet(this.links);
- }
-
- /**
- * Gets the value of the href property.
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Gets the value of the type property.
- */
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CustomizationSection that = CustomizationSection.class.cast(o);
- return super.equals(that) &&
- equal(customizeOnInstantiate, that.customizeOnInstantiate) &&
- equal(links, that.links) &&
- equal(href, that.href) &&
- equal(type, that.type);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(
- super.hashCode(),
- customizeOnInstantiate,
- links,
- href,
- type);
- }
-
- @Override
- public Objects.ToStringHelper string() {
- return super.string()
- .add("customizeOnInstantiate", customizeOnInstantiate)
- .add("links", links)
- .add("href", href)
- .add("type", type);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java
deleted file mode 100644
index 33d3409..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java
+++ /dev/null
@@ -1,553 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "GuestCustomizationSection")
-@XmlType(propOrder = {
- "enabled",
- "changeSid",
- "virtualMachineId",
- "joinDomainEnabled",
- "useOrgSettings",
- "domainName",
- "domainUserName",
- "domainUserPassword",
- "adminPasswordEnabled",
- "adminPasswordAuto",
- "adminPassword",
- "resetPasswordRequired",
- "customizationScript",
- "computerName",
- "links"
-})
-public class GuestCustomizationSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromGuestCustomizationSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
- private Boolean enabled;
- private Boolean changeSid;
- private String virtualMachineId;
- private Boolean joinDomainEnabled;
- private Boolean useOrgSettings;
- private String domainName;
- private String domainUserName;
- private String domainUserPassword;
- private Boolean adminPasswordEnabled;
- private Boolean adminPasswordAuto;
- private String adminPassword;
- private Boolean resetPasswordRequired;
- private String customizationScript;
- private String computerName;
- private Set<Link> links = Sets.newLinkedHashSet();
- private URI href;
- private String type;
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#isEnabled()
- */
- public B enabled(Boolean enabled) {
- this.enabled = enabled;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#isChangeSid()
- */
- public B changeSid(Boolean changeSid) {
- this.changeSid = changeSid;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getVirtualMachineId()
- */
- public B virtualMachineId(String virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#isJoinDomainEnabled()
- */
- public B joinDomainEnabled(Boolean joinDomainEnabled) {
- this.joinDomainEnabled = joinDomainEnabled;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#isUseOrgSettings()
- */
- public B useOrgSettings(Boolean useOrgSettings) {
- this.useOrgSettings = useOrgSettings;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getDomainName()
- */
- public B domainName(String domainName) {
- this.domainName = domainName;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getDomainUserName()
- */
- public B domainUserName(String domainUserName) {
- this.domainUserName = domainUserName;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getDomainUserPassword()
- */
- public B domainUserPassword(String domainUserPassword) {
- this.domainUserPassword = domainUserPassword;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#isAdminPasswordEnabled()
- */
- public B adminPasswordEnabled(Boolean adminPasswordEnabled) {
- this.adminPasswordEnabled = adminPasswordEnabled;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#isAdminPasswordAuto()
- */
- public B adminPasswordAuto(Boolean adminPasswordAuto) {
- this.adminPasswordAuto = adminPasswordAuto;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getAdminPassword()
- */
- public B adminPassword(String adminPassword) {
- this.adminPassword = adminPassword;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#isResetPasswordRequired()
- */
- public B resetPasswordRequired(Boolean resetPasswordRequired) {
- this.resetPasswordRequired = resetPasswordRequired;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getCustomizationScript()
- */
- public B customizationScript(String customizationScript) {
- this.customizationScript = customizationScript;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getComputerName()
- */
- public B computerName(String computerName) {
- this.computerName = computerName;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = checkNotNull(links, "links");
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- @Override
- public GuestCustomizationSection build() {
- return new GuestCustomizationSection(this);
- }
-
- public B fromGuestCustomizationSection(GuestCustomizationSection in) {
- return fromSectionType(in)
- .enabled(in.isEnabled())
- .changeSid(in.isChangeSid())
- .virtualMachineId(in.getVirtualMachineId())
- .joinDomainEnabled(in.isJoinDomainEnabled())
- .useOrgSettings(in.isUseOrgSettings())
- .domainName(in.getDomainName())
- .domainUserName(in.getDomainUserName())
- .domainUserPassword(in.getDomainUserPassword())
- .adminPasswordEnabled(in.isAdminPasswordEnabled())
- .adminPasswordAuto(in.isAdminPasswordAuto())
- .adminPassword(in.getAdminPassword())
- .resetPasswordRequired(in.isResetPasswordRequired())
- .customizationScript(in.getCustomizationScript())
- .computerName(in.getComputerName())
- .links(in.getLinks())
- .href(in.getHref())
- .type(in.getType());
- }
- }
-
- private GuestCustomizationSection(Builder<?> builder) {
- super(builder);
- this.enabled = builder.enabled;
- this.changeSid = builder.changeSid;
- this.virtualMachineId = builder.virtualMachineId;
- this.joinDomainEnabled = builder.joinDomainEnabled;
- this.useOrgSettings = builder.useOrgSettings;
- this.domainName = builder.domainName;
- this.domainUserName = builder.domainUserName;
- this.domainUserPassword = builder.domainUserPassword;
- this.adminPasswordEnabled = builder.adminPasswordEnabled;
- this.adminPasswordAuto = builder.adminPasswordAuto;
- this.adminPassword = builder.adminPassword;
- this.resetPasswordRequired = builder.resetPasswordRequired;
- this.customizationScript = builder.customizationScript;
- this.computerName = builder.computerName;
- this.href = builder.href;
- this.links = ImmutableSet.copyOf(builder.links);
- this.type = builder.type;
- }
-
- private GuestCustomizationSection() {
- // for JAXB
- }
-
-
- @XmlElement(name = "Enabled")
- private Boolean enabled;
- @XmlElement(name = "ChangeSid")
- private Boolean changeSid;
- @XmlElement(name = "VirtualMachineId")
- private String virtualMachineId;
- @XmlElement(name = "JoinDomainEnabled")
- private Boolean joinDomainEnabled;
- @XmlElement(name = "UseOrgSettings")
- private Boolean useOrgSettings;
- @XmlElement(name = "DomainName")
- private String domainName;
- @XmlElement(name = "DomainUserName")
- private String domainUserName;
- @XmlElement(name = "DomainUserPassword")
- private String domainUserPassword;
- @XmlElement(name = "AdminPasswordEnabled")
- private Boolean adminPasswordEnabled;
- @XmlElement(name = "AdminPasswordAuto")
- private Boolean adminPasswordAuto;
- @XmlElement(name = "AdminPassword")
- private String adminPassword;
- @XmlElement(name = "ResetPasswordRequired")
- private Boolean resetPasswordRequired;
- @XmlElement(name = "CustomizationScript")
- private String customizationScript;
- @XmlElement(name = "ComputerName")
- private String computerName;
- @XmlElement(name = "Link")
- private Set<Link> links = Sets.newLinkedHashSet();
- @XmlAttribute
- @XmlSchemaType(name = "anyURI")
- private URI href;
- @XmlAttribute
- private String type;
-
- /**
- * Gets the value of the enabled property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isEnabled() {
- return enabled;
- }
-
- /**
- * Gets the value of the changeSid property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isChangeSid() {
- return changeSid;
- }
-
- /**
- * Gets the value of the virtualMachineId property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVirtualMachineId() {
- return virtualMachineId;
- }
-
- /**
- * Gets the value of the joinDomainEnabled property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isJoinDomainEnabled() {
- return joinDomainEnabled;
- }
-
- /**
- * Gets the value of the useOrgSettings property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isUseOrgSettings() {
- return useOrgSettings;
- }
-
-
- /**
- * Gets the value of the domainName property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDomainName() {
- return domainName;
- }
-
- /**
- * Gets the value of the domainUserName property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDomainUserName() {
- return domainUserName;
- }
-
- /**
- * Gets the value of the domainUserPassword property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDomainUserPassword() {
- return domainUserPassword;
- }
-
- /**
- * Gets the value of the adminPasswordEnabled property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isAdminPasswordEnabled() {
- return adminPasswordEnabled;
- }
-
- /**
- * Gets the value of the adminPasswordAuto property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isAdminPasswordAuto() {
- return adminPasswordAuto;
- }
-
- /**
- * Gets the value of the adminPassword property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getAdminPassword() {
- return adminPassword;
- }
-
- /**
- * Gets the value of the resetPasswordRequired property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isResetPasswordRequired() {
- return resetPasswordRequired;
- }
-
- /**
- * Gets the value of the customizationScript property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getCustomizationScript() {
- return customizationScript;
- }
-
- /**
- * Gets the value of the computerName property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getComputerName() {
- return computerName;
- }
-
- /**
- * Gets the value of the link property.
- * <p/>
- * Objects of the following type(s) are allowed in the list
- * {@link Link }
- */
- public Set<Link> getLinks() {
- return Collections.unmodifiableSet(this.links);
- }
-
- /**
- * Gets the value of the href property.
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Gets the value of the type property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- GuestCustomizationSection that = GuestCustomizationSection.class.cast(o);
- return super.equals(that) &&
- equal(enabled, that.enabled) &&
- equal(changeSid, that.changeSid) &&
- equal(virtualMachineId, that.virtualMachineId) &&
- equal(joinDomainEnabled, that.joinDomainEnabled) &&
- equal(useOrgSettings, that.useOrgSettings) &&
- equal(domainName, that.domainName) &&
- equal(domainUserName, that.domainUserName) &&
- equal(domainUserPassword, that.domainUserPassword) &&
- equal(adminPasswordEnabled, that.adminPasswordEnabled) &&
- equal(adminPasswordAuto, that.adminPasswordAuto) &&
- equal(adminPassword, that.adminPassword) &&
- equal(resetPasswordRequired, that.resetPasswordRequired) &&
- equal(customizationScript, that.customizationScript) &&
- equal(computerName, that.computerName) &&
- equal(links, that.links) &&
- equal(href, that.href) &&
- equal(type, that.type);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- enabled,
- changeSid,
- virtualMachineId,
- joinDomainEnabled,
- useOrgSettings,
- domainName,
- domainUserName,
- domainUserPassword,
- adminPasswordEnabled,
- adminPasswordAuto,
- adminPassword,
- resetPasswordRequired,
- customizationScript,
- computerName,
- links,
- href,
- type);
- }
-
- @Override
- public Objects.ToStringHelper string() {
- return super.string()
- .add("enabled", enabled)
- .add("changeSid", changeSid)
- .add("virtualMachineId", virtualMachineId)
- .add("joinDomainEnabled", joinDomainEnabled)
- .add("useOrgSettings", useOrgSettings)
- .add("domainName", domainName)
- .add("domainUserName", domainUserName)
- .add("domainUserPassword", domainUserPassword)
- .add("adminPasswordEnabled", adminPasswordEnabled)
- .add("adminPasswordAuto", adminPasswordAuto)
- .add("adminPassword", adminPassword)
- .add("resetPasswordRequired", resetPasswordRequired)
- .add("customizationScript", customizationScript)
- .add("computerName", computerName)
- .add("links", links)
- .add("href", href)
- .add("type", type);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java
deleted file mode 100644
index af4d335..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java
+++ /dev/null
@@ -1,260 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "LeaseSettingsSection")
-@XmlType(name = "LeaseSettingsSectionType")
-public class LeaseSettingsSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromLeaseSettingsSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
- private Set<Link> links = Sets.newLinkedHashSet();
- private Integer deploymentLeaseInSeconds;
- private Integer storageLeaseInSeconds;
- private Date deploymentLeaseExpiration;
- private Date storageLeaseExpiration;
- private URI href;
- private String type;
-
- /**
- * @see LeaseSettingsSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = checkNotNull(links, "links");
- return self();
- }
-
- /**
- * @see LeaseSettingsSection#getDeploymentLeaseInSeconds()
- */
- public B deploymentLeaseInSeconds(Integer deploymentLeaseInSeconds) {
- this.deploymentLeaseInSeconds = deploymentLeaseInSeconds;
- return self();
- }
-
- /**
- * @see LeaseSettingsSection#getStorageLeaseInSeconds()
- */
- public B storageLeaseInSeconds(Integer storageLeaseInSeconds) {
- this.storageLeaseInSeconds = storageLeaseInSeconds;
- return self();
- }
-
- /**
- * @see LeaseSettingsSection#getDeploymentLeaseExpiration()
- */
- public B deploymentLeaseExpiration(Date deploymentLeaseExpiration) {
- this.deploymentLeaseExpiration = deploymentLeaseExpiration;
- return self();
- }
-
- /**
- * @see LeaseSettingsSection#getStorageLeaseExpiration()
- */
- public B storageLeaseExpiration(Date storageLeaseExpiration) {
- this.storageLeaseExpiration = storageLeaseExpiration;
- return self();
- }
-
- /**
- * @see LeaseSettingsSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see LeaseSettingsSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- @Override
- public LeaseSettingsSection build() {
- return new LeaseSettingsSection(this);
- }
-
- public B fromLeaseSettingsSection(LeaseSettingsSection in) {
- return fromSectionType(in)
- .links(in.getLinks())
- .deploymentLeaseInSeconds(in.getDeploymentLeaseInSeconds())
- .storageLeaseInSeconds(in.getStorageLeaseInSeconds())
- .deploymentLeaseExpiration(in.getDeploymentLeaseExpiration())
- .storageLeaseExpiration(in.getStorageLeaseExpiration())
- .href(in.getHref())
- .type(in.getType());
- }
- }
-
- @XmlElement(name = "Link")
- private Set<Link> links;
- @XmlElement(name = "DeploymentLeaseInSeconds")
- private Integer deploymentLeaseInSeconds;
- @XmlElement(name = "StorageLeaseInSeconds")
- private Integer storageLeaseInSeconds;
- @XmlElement(name = "DeploymentLeaseExpiration")
- @XmlSchemaType(name = "dateTime")
- private Date deploymentLeaseExpiration;
- @XmlElement(name = "StorageLeaseExpiration")
- @XmlSchemaType(name = "dateTime")
- private Date storageLeaseExpiration;
- @XmlAttribute
- @XmlSchemaType(name = "anyURI")
- private URI href;
- @XmlAttribute
- private String type;
-
- private LeaseSettingsSection(Builder<?> builder) {
- super(builder);
- this.links = ImmutableSet.copyOf(builder.links);
- this.deploymentLeaseInSeconds = builder.deploymentLeaseInSeconds;
- this.storageLeaseInSeconds = builder.storageLeaseInSeconds;
- this.deploymentLeaseExpiration = builder.deploymentLeaseExpiration;
- this.storageLeaseExpiration = builder.storageLeaseExpiration;
- this.href = builder.href;
- this.type = builder.type;
- }
-
- private LeaseSettingsSection() {
- // For JAXB
- }
-
- /**
- * Gets the value of the links property.
- */
- public Set<Link> getLinks() {
- return Collections.unmodifiableSet(links);
- }
-
- /**
- * Gets the value of the deploymentLeaseInSeconds property.
- */
- public Integer getDeploymentLeaseInSeconds() {
- return deploymentLeaseInSeconds;
- }
-
- /**
- * Gets the value of the storageLeaseInSeconds property.
- */
- public Integer getStorageLeaseInSeconds() {
- return storageLeaseInSeconds;
- }
-
- /**
- * Gets the value of the deploymentLeaseExpiration property.
- */
- public Date getDeploymentLeaseExpiration() {
- return deploymentLeaseExpiration;
- }
-
- /**
- * Gets the value of the storageLeaseExpiration property.
- */
- public Date getStorageLeaseExpiration() {
- return storageLeaseExpiration;
- }
-
- /**
- * Gets the value of the href property.
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Gets the value of the type property.
- */
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- LeaseSettingsSection that = LeaseSettingsSection.class.cast(o);
- return super.equals(that) &&
- equal(this.links, that.links) &&
- equal(this.deploymentLeaseInSeconds, that.deploymentLeaseInSeconds) &&
- equal(this.storageLeaseInSeconds, that.storageLeaseInSeconds) &&
- equal(this.deploymentLeaseExpiration, that.deploymentLeaseExpiration) &&
- equal(this.storageLeaseExpiration, that.storageLeaseExpiration) &&
- equal(this.href, that.href) &&
- equal(this.type, that.type);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- links,
- deploymentLeaseInSeconds,
- storageLeaseInSeconds,
- deploymentLeaseExpiration,
- storageLeaseExpiration,
- href,
- type);
- }
-
- @Override
- public Objects.ToStringHelper string() {
- return super.string()
- .add("links", links)
- .add("deploymentLeaseInSeconds", deploymentLeaseInSeconds)
- .add("storageLeaseInSeconds", storageLeaseInSeconds)
- .add("deploymentLeaseExpiration", deploymentLeaseExpiration)
- .add("storageLeaseExpiration", storageLeaseExpiration)
- .add("href", href)
- .add("type", type);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java
deleted file mode 100644
index 2dbce4e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java
+++ /dev/null
@@ -1,179 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "NetworkConfigSection")
-@XmlType(name = "NetworkConfigSectionType")
-public class NetworkConfigSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromNetworkConfigSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private Set<Link> links = Sets.newLinkedHashSet();
- private Set<VAppNetworkConfiguration> networkConfigs = Sets.newLinkedHashSet();
- private URI href;
- private String type;
-
- /**
- * @see NetworkConfigSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = checkNotNull(links, "links");
- return self();
- }
-
- /**
- * @see NetworkConfigSection#getNetworkConfigs()
- */
- public B networkConfigs(Set<VAppNetworkConfiguration> networkConfigs) {
- this.networkConfigs = checkNotNull(networkConfigs, "networkConfigs");
- return self();
- }
-
- /**
- * @see NetworkConfigSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see NetworkConfigSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
-
- @Override
- public NetworkConfigSection build() {
- return new NetworkConfigSection(this);
- }
-
- public B fromNetworkConfigSection(NetworkConfigSection in) {
- return fromSectionType(in)
- .links(in.getLinks())
- .networkConfigs(in.getNetworkConfigs())
- .href(in.getHref())
- .type(in.getType());
- }
- }
-
- @XmlElement(name = "Link")
- protected Set<Link> links = Sets.newLinkedHashSet();
- @XmlElement(name = "NetworkConfig")
- protected Set<VAppNetworkConfiguration> networkConfigs = Sets.newLinkedHashSet();
- @XmlAttribute
- @XmlSchemaType(name = "anyURI")
- protected URI href;
- @XmlAttribute
- protected String type;
-
- public NetworkConfigSection(Builder<?> builder) {
- super(builder);
- this.links = ImmutableSet.copyOf(builder.links);
- this.networkConfigs = ImmutableSet.copyOf(builder.networkConfigs);
- this.href = builder.href;
- this.type = builder.type;
- }
-
- protected NetworkConfigSection() {
- // For JAXB
- }
-
- /**
- * Gets the value of the link property.
- */
- public Set<Link> getLinks() {
- return Collections.unmodifiableSet(this.links);
- }
-
- /**
- * Gets the value of the networkConfig property.
- */
- public Set<VAppNetworkConfiguration> getNetworkConfigs() {
- return Collections.unmodifiableSet(this.networkConfigs);
- }
-
- /**
- * Gets the value of the href property.
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Gets the value of the type property.
- */
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NetworkConfigSection that = NetworkConfigSection.class.cast(o);
- return super.equals(that) && equal(links, that.links) && equal(networkConfigs, that.networkConfigs) && equal(href, that.href) && equal(type, that.type);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), links, networkConfigs, href, type);
- }
-
- @Override
- public Objects.ToStringHelper string() {
- return super.string().add("links", links).add("networkConfigs", networkConfigs).add("href", href).add("type", type);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java
deleted file mode 100644
index 0ef7e78..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java
+++ /dev/null
@@ -1,224 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a list of network cards existing in a VM.
- */
-@XmlRootElement(name = "NetworkConnectionSection")
-@XmlType(name = "NetworkConnectionSectionType")
-public class NetworkConnectionSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromNetworkConnectionSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private Integer primaryNetworkConnectionIndex;
- private Set<NetworkConnection> networkConnections = Sets.newLinkedHashSet();
- private Set<Link> links = Sets.newLinkedHashSet();
- private URI href;
- private String type;
-
- /**
- * @see NetworkConnectionSection#getPrimaryNetworkConnectionIndex()
- */
- public B primaryNetworkConnectionIndex(Integer primaryNetworkConnectionIndex) {
- this.primaryNetworkConnectionIndex = primaryNetworkConnectionIndex;
- return self();
- }
-
- /**
- * @see NetworkConnectionSection#getNetworkConnections()
- */
- public B networkConnections(Set<NetworkConnection> networkConnections) {
- this.networkConnections = checkNotNull(networkConnections, "networkConnections");
- return self();
- }
-
- /**
- * @see NetworkConnectionSection#getNetworkConnections()
- */
- public B networkConnection(NetworkConnection networkConnection) {
- this.networkConnections.add(checkNotNull(networkConnection, "networkConnection"));
- return self();
- }
-
- /**
- * @see NetworkConnectionSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = checkNotNull(links, "links");
- return self();
- }
-
- /**
- * @see NetworkConnectionSection#getLinks()
- */
- public B link(Link link) {
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- /**
- * @see NetworkConnectionSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see NetworkConnectionSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- @Override
- public NetworkConnectionSection build() {
- return new NetworkConnectionSection(this);
- }
-
- public B fromNetworkConnectionSection(NetworkConnectionSection in) {
- return fromSectionType(in)
- .primaryNetworkConnectionIndex(in.getPrimaryNetworkConnectionIndex())
- .networkConnections(Sets.newLinkedHashSet(in.getNetworkConnections()))
- .links(Sets.newLinkedHashSet(in.getLinks()))
- .href(in.getHref())
- .type(in.getType());
- }
- }
-
- private NetworkConnectionSection(Builder<?> builder) {
- super(builder);
- this.primaryNetworkConnectionIndex = builder.primaryNetworkConnectionIndex;
- this.networkConnections = builder.networkConnections != null ? ImmutableSet.copyOf(builder.networkConnections) : Sets.<NetworkConnection>newLinkedHashSet();
- this.links = builder.links != null ? ImmutableSet.copyOf(builder.links) : Sets.<Link>newLinkedHashSet();
- this.href = builder.href;
- this.type = builder.type;
- }
-
- private NetworkConnectionSection() {
- // For JAXB
- }
-
- @XmlElement(name = "PrimaryNetworkConnectionIndex")
- protected Integer primaryNetworkConnectionIndex;
- @XmlElement(name = "NetworkConnection")
- protected Set<NetworkConnection> networkConnections = Sets.newLinkedHashSet();
- @XmlElement(name = "Link")
- protected Set<Link> links = Sets.newLinkedHashSet();
- @XmlAttribute
- @XmlSchemaType(name = "anyURI")
- protected URI href;
- @XmlAttribute
- protected String type;
-
- /**
- * Gets the value of the primaryNetworkConnectionIndex property.
- *
- * @return possible object is {@link Integer }
- */
- public Integer getPrimaryNetworkConnectionIndex() {
- return primaryNetworkConnectionIndex;
- }
-
- /**
- * Gets the value of the networkConnection property.
- */
- public Set<NetworkConnection> getNetworkConnections() {
- return ImmutableSet.copyOf(networkConnections);
- }
-
- /**
- * Gets the value of the link property.
- */
- public Set<Link> getLinks() {
- return ImmutableSet.copyOf(links);
- }
-
- /**
- * @return the value of the href property.
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Gets the value of the type property.
- *
- * @return possible object is {@link String }
- */
- public String getType() {
- return type;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NetworkConnectionSection that = NetworkConnectionSection.class.cast(o);
- return super.equals(that) &&
- equal(primaryNetworkConnectionIndex, that.primaryNetworkConnectionIndex) &&
- equal(networkConnections, that.networkConnections) &&
- equal(links, that.links) &&
- equal(href, that.href) &&
- equal(type, that.type);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), primaryNetworkConnectionIndex, networkConnections, links, href, type);
- }
-
- @Override
- public Objects.ToStringHelper string() {
- return super.string().add("primaryNetworkConnectionIndex", primaryNetworkConnectionIndex).add("networkConnection", networkConnections).add("links", links).add("href", href).add("type", type);
- }
-}
[10/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiLiveTest.java
deleted file mode 100644
index 5dc1a07..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppApiLiveTest.java
+++ /dev/null
@@ -1,861 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CORRECT_VALUE_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.ENTITY_EQUAL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.MATCHES_STRING_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_EMPTY_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ADMIN_USER;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkControlAccessParams;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkLeaseSettingsSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataFor;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataKeyAbsentFor;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkNetworkConfigSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkNetworkSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOwner;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkProductSectionList;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkStartupSection;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkVApp;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.jclouds.dmtf.ovf.MsgType;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.AbstractVAppApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.domain.AccessSetting;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.User;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.network.DhcpService;
-import org.jclouds.vcloud.director.v1_5.domain.network.FirewallService;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRange;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpScope;
-import org.jclouds.vcloud.director.v1_5.domain.network.NatService;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkAssignment;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection.IpAddressAllocationMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures;
-import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings;
-import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiationParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.SourcedCompositionItemParam;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-@Test(singleThreaded = true, testName = "VAppApiLiveTest")
-public class VAppApiLiveTest extends AbstractVAppApiLiveTest {
-
- private String key;
- private boolean testUserCreated = false;
- private User user;
-
- @BeforeClass(alwaysRun = true)
- protected void setupRequiredEntities() {
-
- if (adminContext != null) {
- userId = adminContext.getApi().getUserApi().addUserToOrg(randomTestUser("VAppAccessTest"), org.getHref())
- .getId();
- }
- user = lazyGetUser();
- }
-
- @AfterClass(alwaysRun = true, dependsOnMethods = { "cleanUpEnvironment" })
- public void cleanUp() {
- if (adminContext != null && testUserCreated && userId != null) {
- try {
- adminContext.getApi().getUserApi().remove(context.resolveIdToAdminHref(userId));
- } catch (Exception e) {
- logger.warn(e, "Error when deleting user");
- }
- }
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}")
- public void testGetVApp() {
- // The method under test
- vApp = vAppApi.get(context.resolveIdToHref(vAppId));
-
- // Check the retrieved object is well formed
- checkVApp(vApp);
-
- // Check the required fields are set
- assertEquals(vApp.isDeployed(), Boolean.FALSE,
- String.format(OBJ_FIELD_EQ, VAPP, "deployed", "FALSE", vApp.isDeployed().toString()));
- assertTrue(vApp.getName().startsWith("test-vapp-"),
- String.format(MATCHES_STRING_FMT, "name", "test-vapp-*", vApp.getName()));
- assertEquals(vApp.getDescription(), "Test VApp",
- String.format(OBJ_FIELD_EQ, VAPP, "Description", "Test VApp", vApp.getDescription()));
-
- // TODO instantiationParams instantiationParams()
- // TODO source.href vAppTemplateURI
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.POWERED_OFF);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/action/recomposeVApp")
- public void testRecomposeVApp() {
-
- VApp composedVApp = vdcApi.composeVApp(context.resolveIdToHref(vdcId), ComposeVAppParams.builder()
- .name(name("composed-"))
- .instantiationParams(instantiationParams())
- .build());
-
- Set<Vm> vms = getAvailableVMsFromVAppTemplate(vAppTemplate);
-
- // get the first vm to be added to vApp
- Vm toAddVm = Iterables.get(vms, 0);
-
- // TODO clean up network config of the vm
- //cleanUpNetworkConnectionSection(toAddVm);
-
- RecomposeVAppParams params = addRecomposeParams(composedVApp, toAddVm);
-
- // The method under test
- Task recomposeVApp = vAppApi.recompose(composedVApp.getHref(), params);
- assertTaskSucceedsLong(recomposeVApp);
-
- // remove a vm
- VApp configured = vAppApi.get(composedVApp.getHref());
- List<Vm> vmsToBeDeleted = configured.getChildren().getVms();
- Vm toBeDeleted = Iterables.find(vmsToBeDeleted, new Predicate<Vm>() {
-
- @Override
- public boolean apply(Vm vm) {
- return vm.getName().startsWith("vm-");
- }
-
- });
- Task removeVm = vmApi.remove(toBeDeleted.getHref());
- assertTaskSucceedsLong(removeVm);
-
- Task deleteVApp = vAppApi.remove(composedVApp.getHref());
- assertTaskSucceedsLong(deleteVApp);
- }
-
- private Set<Vm> getAvailableVMsFromVAppTemplate(VAppTemplate vAppTemplate) {
- return ImmutableSet.copyOf(Iterables.filter(vAppTemplate.getChildren(), new Predicate<Vm>() {
- // filter out vms in the vApp template with computer name that contains underscores, dots,
- // or both.
- @Override
- public boolean apply(Vm input) {
- GuestCustomizationSection guestCustomizationSection = vmApi.getGuestCustomizationSection(input.getHref());
- String computerName = guestCustomizationSection.getComputerName();
- String retainComputerName = CharMatcher.inRange('0', '9').or(CharMatcher.inRange('a', 'z'))
- .or(CharMatcher.inRange('A', 'Z')).or(CharMatcher.is('-')).retainFrom(computerName);
- return computerName.equals(retainComputerName);
- }
- }));
- }
-
- @Test(groups = { "live", "user" }, description = "PUT /vApp/{id}", dependsOnMethods = { "testGetVApp" })
- public void testEditVApp() {
- VApp newVApp = VApp.builder().name(name("new-name-")).description("New Description").build();
- vAppNames.add(newVApp.getName());
-
- // The method under test
- Task editVApp = vAppApi.edit(vApp.getHref(), newVApp);
- assertTrue(retryTaskSuccess.apply(editVApp), String.format(TASK_COMPLETE_TIMELY, "editVApp"));
-
- // Get the edited VApp
- vApp = vAppApi.get(editVApp.getHref());
-
- // Check the required fields are set
- assertEquals(vApp.getName(), newVApp.getName(),
- String.format(OBJ_FIELD_EQ, VAPP, "Name", newVApp.getName(), vApp.getName()));
- assertEquals(vApp.getDescription(), newVApp.getDescription(),
- String.format(OBJ_FIELD_EQ, VAPP, "Description", newVApp.getDescription(), vApp.getDescription()));
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/action/deploy", dependsOnMethods = { "testGetVApp" })
- public void testDeployVApp() {
- DeployVAppParams params = DeployVAppParams.builder()
- .deploymentLeaseSeconds((int) TimeUnit.SECONDS.convert(1L, TimeUnit.HOURS)).notForceCustomization()
- .notPowerOn().build();
-
- // The method under test
- Task deployVApp = vAppApi.deploy(vApp.getHref(), params);
- assertTrue(retryTaskSuccessLong.apply(deployVApp), String.format(TASK_COMPLETE_TIMELY, "deployVApp"));
-
- // Get the edited VApp
- vApp = vAppApi.get(deployVApp.getHref());
-
- // Check the required fields are set
- assertTrue(vApp.isDeployed(), String.format(OBJ_FIELD_EQ, VAPP, "deployed", "TRUE", vApp.isDeployed().toString()));
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.POWERED_OFF);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/power/action/powerOn", dependsOnMethods = { "testDeployVApp" })
- public void testPowerOnVApp() {
- // Power off VApp
- vApp = powerOffVApp(vApp.getHref());
-
- // The method under test
- Task powerOnVApp = vAppApi.powerOn(vApp.getHref());
- assertTaskSucceedsLong(powerOnVApp);
-
- // Get the edited VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.POWERED_ON);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/power/action/reboot", dependsOnMethods = { "testDeployVApp" })
- public void testReboot() {
- // Power on VApp
- vApp = powerOnVApp(vApp.getHref());
-
- // The method under test
- Task reboot = vAppApi.reboot(vApp.getHref());
- assertTaskSucceedsLong(reboot);
-
- // Get the edited VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.POWERED_OFF);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/power/action/shutdown", dependsOnMethods = { "testDeployVApp" })
- public void testShutdown() {
- // Power on VApp
- vApp = powerOnVApp(vApp.getHref());
-
- vApp = vAppApi.get(vApp.getHref());
-
- // The method under test
- Task shutdown = vAppApi.shutdown(vApp.getHref());
- assertTaskSucceedsLong(shutdown);
-
- // Get the edited VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.POWERED_OFF);
-
- // Power on the VApp again
- vApp = powerOnVApp(vApp.getHref());
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/power/action/suspend", dependsOnMethods = { "testDeployVApp" })
- public void testSuspend() {
- // Power on VApp
- vApp = powerOnVApp(vApp.getHref());
-
- // The method under test
- Task suspend = vAppApi.suspend(vApp.getHref());
- assertTaskSucceedsLong(suspend);
-
- // Get the edited VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.SUSPENDED);
-
- // Power on the VApp again
- vApp = powerOnVApp(vApp.getHref());
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/power/action/reset", dependsOnMethods = { "testDeployVApp" })
- public void testReset() {
- // Power on VApp
- vApp = powerOnVApp(vApp.getHref());
-
- // The method under test
- Task reset = vAppApi.reset(vApp.getHref());
- assertTaskSucceedsLong(reset);
-
- // Get the edited VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.POWERED_ON);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/action/undeploy", dependsOnMethods = { "testDeployVApp" })
- public void testUndeployVApp() {
- // Power on VApp
- vApp = powerOnVApp(vApp.getHref());
-
- UndeployVAppParams params = UndeployVAppParams.builder().build();
-
- // The method under test
- Task undeploy = vAppApi.undeploy(vApp.getHref(), params);
- assertTrue(retryTaskSuccess.apply(undeploy), String.format(TASK_COMPLETE_TIMELY, "undeploy"));
-
- // Get the edited VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Check status
- assertFalse(vApp.isDeployed(),
- String.format(OBJ_FIELD_EQ, VAPP, "deployed", "FALSE", vApp.isDeployed().toString()));
- assertVAppStatus(vApp.getHref(), Status.POWERED_OFF);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/power/action/powerOff", dependsOnMethods = { "testUndeployVApp" })
- public void testPowerOffVApp() {
- // Power on VApp
- vApp = powerOnVApp(vApp.getHref());
-
- // The method under test
- Task powerOffVApp = vAppApi.powerOff(vApp.getHref());
- assertTrue(retryTaskSuccess.apply(powerOffVApp), String.format(TASK_COMPLETE_TIMELY, "powerOffVApp"));
-
- // Get the edited VApp
- vApp = vAppApi.get(vApp.getHref());
-
- // Check status
- assertVAppStatus(vApp.getHref(), Status.POWERED_OFF);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/action/controlAccess", dependsOnMethods = { "testGetVApp" })
- public void testControlAccessUser() {
- ControlAccessParams params = ControlAccessParams
- .builder()
- .notSharedToEveryone()
- .accessSetting(
- AccessSetting.builder()
- .subject(Reference.builder().href(user.getHref()).type(ADMIN_USER).build())
- .accessLevel("ReadOnly").build()).build();
-
- // The method under test
- ControlAccessParams modified = vAppApi.editControlAccess(vApp.getHref(), params);
-
- // Check the retrieved object is well formed
- checkControlAccessParams(modified);
- // Check the required fields are set
- assertEquals(modified, params, String.format(ENTITY_EQUAL, "ControlAccessParams"));
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/action/controlAccess", dependsOnMethods = { "testControlAccessUser" })
- public void testControlAccessEveryone() {
-
- ControlAccessParams params = ControlAccessParams.builder().sharedToEveryone().everyoneAccessLevel("FullControl")
- .build();
-
- // The method under test
- ControlAccessParams modified = vAppApi.editControlAccess(vApp.getHref(), params);
-
- // Check the retrieved object is well formed
- checkControlAccessParams(modified);
-
- // Check entities are equal
- assertEquals(modified, params, String.format(ENTITY_EQUAL, "ControlAccessParams"));
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/action/discardSuspendedState", dependsOnMethods = { "testDeployVApp" })
- public void testDiscardSuspendedState() {
- // Power on, then suspend the VApp
- vApp = powerOnVApp(vApp.getHref());
- vApp = suspendVApp(vApp.getHref());
-
- // The method under test
- Task discardSuspendedState = vAppApi.discardSuspendedState(vApp.getHref());
- assertTrue(retryTaskSuccess.apply(discardSuspendedState),
- String.format(TASK_COMPLETE_TIMELY, "discardSuspendedState"));
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/controlAccess", dependsOnMethods = { "testGetVApp" })
- public void testGetControlAccess() {
- // The method under test
- ControlAccessParams controlAccess = vAppApi.getAccessControl(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkControlAccessParams(controlAccess);
- }
-
- @Test(description = "GET /vApp/{id}/leaseSettingsSection", dependsOnMethods = { "testGetVApp" })
- public void testGetLeaseSettingsSection() {
- // The method under test
- LeaseSettingsSection section = vAppApi.getLeaseSettingsSection(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkLeaseSettingsSection(section);
- }
-
- @Test(groups = { "live", "user" }, description = "PUT /vApp/{id}/leaseSettingsSection", dependsOnMethods = { "testGetLeaseSettingsSection" })
- public void testEditLeaseSettingsSection() {
- // Copy existing section
- LeaseSettingsSection oldSection = vAppApi.getLeaseSettingsSection(vApp.getHref());
- Integer twoHours = (int) TimeUnit.SECONDS.convert(2L, TimeUnit.HOURS);
- LeaseSettingsSection newSection = oldSection.toBuilder().deploymentLeaseInSeconds(twoHours).build();
-
- // The method under test
- Task editLeaseSettingsSection = vAppApi.editLeaseSettingsSection(vApp.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editLeaseSettingsSection),
- String.format(TASK_COMPLETE_TIMELY, "editLeaseSettingsSection"));
-
- // Retrieve the modified section
- LeaseSettingsSection modified = vAppApi.getLeaseSettingsSection(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkLeaseSettingsSection(modified);
-
- // Check the date fields
- if (modified.getDeploymentLeaseExpiration() != null && newSection.getDeploymentLeaseExpiration() != null) {
- assertTrue(modified.getDeploymentLeaseExpiration().after(newSection.getDeploymentLeaseExpiration()),
- String.format("The new deploymentLeaseExpiration timestamp must be later than the original: %s > %s",
- dateService.iso8601DateFormat(modified.getDeploymentLeaseExpiration()),
- dateService.iso8601DateFormat(newSection.getDeploymentLeaseExpiration())));
- }
- if (modified.getStorageLeaseExpiration() != null && newSection.getStorageLeaseExpiration() != null) {
- assertTrue(modified.getStorageLeaseExpiration().after(newSection.getStorageLeaseExpiration()), String.format(
- "The new storageLeaseExpiration timestamp must be later than the original: %s > %s",
- dateService.iso8601DateFormat(modified.getStorageLeaseExpiration()),
- dateService.iso8601DateFormat(newSection.getStorageLeaseExpiration())));
- }
-
- // Reset the date fields
- modified = modified.toBuilder().deploymentLeaseExpiration(null).storageLeaseExpiration(null).build();
- newSection = newSection.toBuilder().deploymentLeaseExpiration(null).storageLeaseExpiration(null).build();
-
- // Check the section was modified correctly
- assertEquals(
- modified.getDeploymentLeaseInSeconds(),
- twoHours,
- String.format(OBJ_FIELD_EQ, "LeaseSettingsSection", "DeploymentLeaseInSeconds",
- Integer.toString(twoHours), modified.getDeploymentLeaseInSeconds().toString()));
- assertEquals(modified, newSection, String.format(ENTITY_EQUAL, "LeaseSettingsSection"));
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/networkConfigSection", dependsOnMethods = { "testGetVApp" })
- public void testGetNetworkConfigSection() {
- // The method under test
- NetworkConfigSection section = vAppApi.getNetworkConfigSection(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkNetworkConfigSection(section);
- }
-
- @Test(description = "PUT /vApp/{id}/networkConfigSection", dependsOnMethods = { "testGetNetworkConfigSection" })
- public void testEditNetworkConfigSection() {
-
- // Copy existing section and update fields
- NetworkConfigSection oldSection = vAppApi.getNetworkConfigSection(vApp.getHref());
- Network network = lazyGetNetwork();
-
- tryFindBridgedNetworkInOrg();
- IpRange ipRange = ipRange();
- NetworkConfiguration newConfiguration = NetworkConfiguration.builder()
- .ipScope(ipScope(ipRange))
- .parentNetwork(Reference.builder().fromEntity(network).build())
- .fenceMode(FenceMode.NAT_ROUTED)
- .retainNetInfoAcrossDeployments(false)
- .syslogServerSettings(SyslogServerSettings.builder().syslogServerIp1("192.168.14.27").build())
- .features(NetworkFeatures.builder()
- .service(DhcpService.builder()
- .ipRange(ipRange)
- .build())
- .service(FirewallService.builder()
- .logDefaultAction(false)
- .defaultAction("drop")
- .build())
- .service(NatService.builder()
- .natType("portForwarding")
- .enabled(false)
- .build())
- .build())
- .build();
-
- final String networkName = name("vAppNetwork-");
- VAppNetworkConfiguration newVAppNetworkConfiguration = VAppNetworkConfiguration.builder()
- .networkName(networkName)
- .description(name("description-"))
- .configuration(newConfiguration)
- .build();
-
- NetworkConfigSection newSection = oldSection.toBuilder().networkConfigs(
- ImmutableSet.of(newVAppNetworkConfiguration)).build();
-
- // The method under test
- Task editNetworkConfigSection = vAppApi.editNetworkConfigSection(vApp.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editNetworkConfigSection),
- String.format(TASK_COMPLETE_TIMELY, "editNetworkConfigSection"));
-
- // Retrieve the modified section
- NetworkConfigSection modified = vAppApi.getNetworkConfigSection(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkNetworkConfigSection(modified);
-
- Optional<VAppNetworkConfiguration> modifiedOptionalVAppNetwork = Iterables.tryFind(modified.getNetworkConfigs(), new IsVAppNetworkNamed(networkName));
- if (!modifiedOptionalVAppNetwork.isPresent())
- fail(String.format("Could not find vApp network named %s", networkName));
-
- Optional<VAppNetworkConfiguration> newOptionalVAppNetwork = Iterables.tryFind(newSection.getNetworkConfigs(), new IsVAppNetworkNamed(networkName));
- if (!newOptionalVAppNetwork.isPresent())
- fail(String.format("Could not find vApp network named %s", networkName));
-
- assertEquals(modifiedOptionalVAppNetwork.get().getNetworkName(), newOptionalVAppNetwork.get().getNetworkName(), String.format(ENTITY_EQUAL, "NetworkName"));
- assertEquals(modifiedOptionalVAppNetwork.get().getConfiguration().getFenceMode(), newOptionalVAppNetwork.get().getConfiguration().getFenceMode(), String.format(ENTITY_EQUAL, "FenceMode"));
- assertEquals(modifiedOptionalVAppNetwork.get().getConfiguration().getIpScope(), newOptionalVAppNetwork.get().getConfiguration().getIpScope(), String.format(ENTITY_EQUAL, "IpScope"));
- assertEquals(modifiedOptionalVAppNetwork.get().getConfiguration().getNetworkFeatures(), newOptionalVAppNetwork.get().getConfiguration().getNetworkFeatures(), String.format(ENTITY_EQUAL, "NetworkFeatures"));
- }
-
- private IpRange ipRange() {
- return IpRange.builder()
- .startAddress("192.168.2.100")
- .endAddress("192.168.2.199")
- .build();
- }
-
- private IpScope ipScope(IpRange ipRange) {
- IpRanges newIpRanges = IpRanges.builder()
- .ipRange(ipRange)
- .build();
- return IpScope.builder()
- .isInherited(false)
- .gateway("192.168.2.1")
- .netmask("255.255.0.0")
- .ipRanges(newIpRanges).build();
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/networkSection", dependsOnMethods = { "testGetVApp" })
- public void testGetNetworkSection() {
- // The method under test
- NetworkSection section = vAppApi.getNetworkSection(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkNetworkSection(section);
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/owner", dependsOnMethods = { "testGetVApp" })
- public void testGetOwner() {
- // The method under test
- Owner owner = vAppApi.getOwner(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkOwner(owner);
- }
-
- @Test(groups = { "live", "user" }, description = "PUT /vApp/{id}/owner", dependsOnMethods = { "testGetOwner" })
- public void testEditOwner() {
- Owner newOwner = Owner.builder().user(Reference.builder().href(user.getHref()).type(ADMIN_USER).build()).build();
-
- // The method under test
- vAppApi.editOwner(vApp.getHref(), newOwner);
-
- // Get the new VApp owner
- Owner modified = vAppApi.getOwner(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkOwner(modified);
-
- // Check the href fields match
- assertEquals(modified.getUser().getHref(), newOwner.getUser().getHref());
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/productSections", dependsOnMethods = { "testGetVApp" })
- public void testGetProductSections() {
- // The method under test
- ProductSectionList sectionList = vAppApi.getProductSections(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkProductSectionList(sectionList);
- }
-
- @Test(groups = { "live", "user" }, description = "PUT /vApp/{id}/productSections", dependsOnMethods = { "testGetProductSections" })
- public void testEditProductSections() {
- // Copy existing section and edit fields
- ProductSectionList oldSections = vAppApi.getProductSections(vApp.getHref());
- ProductSectionList newSections = oldSections
- .toBuilder()
- .productSection(
- ProductSection.builder().info("Information about the installed software")
- // Default ovf:Info text
- .required().product(MsgType.builder().value("jclouds").build())
- .vendor(MsgType.builder().value("jclouds Inc.").build())
- // NOTE other ProductSection elements not returned by vCloud
- .build()).build();
-
- // The method under test
- Task editProductSections = vAppApi.editProductSections(vApp.getHref(), newSections);
- assertTrue(retryTaskSuccess.apply(editProductSections),
- String.format(TASK_COMPLETE_TIMELY, "editProductSections"));
-
- // Retrieve the modified section
- ProductSectionList modified = vAppApi.getProductSections(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkProductSectionList(modified);
-
- // Check the modified object has an extra ProductSection
- assertEquals(modified.getProductSections().size(), oldSections.getProductSections().size() + 1);
-
- // Check the section was modified correctly
- assertEquals(modified, newSections);
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/startupSection", dependsOnMethods = { "testGetVApp" })
- public void testGetStartupSection() {
- // The method under test
- StartupSection section = vAppApi.getStartupSection(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkStartupSection(section);
- }
-
- @Test(groups = { "live", "user" }, description = "PUT /vApp/{id}/startupSection", dependsOnMethods = { "testGetStartupSection" })
- public void testEditStartupSection() {
- // Copy existing section and edit fields
- StartupSection oldSection = vAppApi.getStartupSection(vApp.getHref());
- StartupSection newSection = oldSection.toBuilder().build();
-
- // The method under test
- Task editStartupSection = vAppApi.editStartupSection(vApp.getHref(), newSection);
- assertTrue(retryTaskSuccess.apply(editStartupSection), String.format(TASK_COMPLETE_TIMELY, "editStartupSection"));
-
- // Retrieve the modified section
- StartupSection modified = vAppApi.getStartupSection(vApp.getHref());
-
- // Check the retrieved object is well formed
- checkStartupSection(modified);
-
- // Check the modified section fields are set correctly
- assertEquals(modified, newSection);
- }
-
- @Test(groups = { "live", "user" }, description = "PUT /vApp/{id}/metadata", dependsOnMethods = { "testGetVApp" })
- public void testSetMetadataValue() {
- key = name("key-");
- String value = name("value-");
- context.getApi().getMetadataApi(vApp.getHref()).put(key, value);
-
- // Retrieve the value, and assert it was set correctly
- String newMetadataValue = context.getApi().getMetadataApi(vApp.getHref()).get(key);
-
- // Check the retrieved object is well formed
- assertEquals(newMetadataValue, value);
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/metadata", dependsOnMethods = { "testSetMetadataValue" })
- public void testGetMetadata() {
- key = name("key-");
- String value = name("value-");
- context.getApi().getMetadataApi(vApp.getHref()).put(key, value);
-
- // Call the method being tested
- Metadata metadata = context.getApi().getMetadataApi(vApp.getHref()).get();
-
- checkMetadata(metadata);
-
- // Check requirements for this test
- assertFalse(Iterables.isEmpty(metadata.getMetadataEntries()),
- String.format(NOT_EMPTY_OBJECT_FMT, "MetadataEntry", "vApp"));
- }
-
- @Test(groups = { "live", "user" }, description = "GET /vApp/{id}/metadata/{key}", dependsOnMethods = { "testGetMetadata" })
- public void testGetOrgMetadataValue() {
-
- key = name("key-");
- String value = name("value-");
- context.getApi().getMetadataApi(vApp.getHref()).put(key, value);
-
- // Call the method being tested
- String newValue = context.getApi().getMetadataApi(vApp.getHref()).get(key);
-
- assertEquals(newValue, value, String.format(CORRECT_VALUE_OBJECT_FMT, "Value", "MetadataValue", value, newValue));
- }
-
- @Test(groups = { "live", "user" }, description = "DELETE /vApp/{id}/metadata/{key}", dependsOnMethods = { "testSetMetadataValue" })
- public void testRemoveMetadataEntry() {
- // Delete the entry
- Task task = context.getApi().getMetadataApi(vApp.getHref()).remove(key);
- retryTaskSuccess.apply(task);
-
- // Confirm the entry has been removed
- Metadata newMetadata = context.getApi().getMetadataApi(vApp.getHref()).get();
-
- // Check the retrieved object is well formed
- checkMetadataKeyAbsentFor(VAPP, newMetadata, key);
- }
-
- @Test(groups = { "live", "user" }, description = "POST /vApp/{id}/metadata", dependsOnMethods = { "testGetMetadata" })
- public void testMergeMetadata() {
- Metadata oldMetadata = context.getApi().getMetadataApi(vApp.getHref()).get();
- Map<String, String> oldMetadataMap = Checks.metadataToMap(oldMetadata);
-
- // Store a value, to be removed
- String key = name("key-");
- String value = name("value-");
- Task task = context.getApi().getMetadataApi(vApp.getHref()).putAll(ImmutableMap.of(key, value));
- retryTaskSuccess.apply(task);
-
- // Confirm the entry contains everything that was there, and everything that was being added
- Metadata newMetadata = context.getApi().getMetadataApi(vApp.getHref()).get();
- Map<String, String> expectedMetadataMap = ImmutableMap.<String, String> builder().putAll(oldMetadataMap)
- .put(key, value).build();
-
- // Check the retrieved object is well formed
- checkMetadataFor(VAPP, newMetadata, expectedMetadataMap);
- }
-
- @Test(groups = { "live", "user" }, description = "DELETE /vApp/{id}")
- public void testRemoveVApp() {
- // Create a temporary VApp to remove
- VApp temp = instantiateVApp();
-
- // The method under test
- Task removeVApp = vAppApi.remove(temp.getHref());
- assertTrue(retryTaskSuccess.apply(removeVApp), String.format(TASK_COMPLETE_TIMELY, "removeVApp"));
-
- VApp removed = vAppApi.get(temp.getHref());
- assertNull(removed, "The VApp " + temp.getName() + " should have been removed");
- }
-
- public RecomposeVAppParams addRecomposeParams(VApp vApp, Vm vm) {
-
- // creating an item element. this item will contain the vm which should be added to the vapp.
- Reference reference = Reference.builder().name(name("vm-")).href(vm.getHref()).type(vm.getType()).build();
- SourcedCompositionItemParam vmItem = SourcedCompositionItemParam.builder().source(reference).build();
-
- InstantiationParams vmInstantiationParams = null;
-
- Set<NetworkAssignment> networkAssignments = Sets.newLinkedHashSet();
-
- // if the vm contains a network connection and the vApp does not contain any configured
- // network
- if (vmHasNetworkConnectionConfigured(vm)) {
- if (!vAppHasNetworkConfigured(vApp)) {
- // add a new network connection section for the vm.
- NetworkConnectionSection networkConnectionSection = NetworkConnectionSection.builder()
- .info("Empty network configuration parameters").build();
- // adding the network connection section to the instantiation params of the vapp.
- vmInstantiationParams = InstantiationParams.builder().sections(ImmutableSet.of(networkConnectionSection))
- .build();
- }
-
- // if the vm already contains a network connection section and if the vapp contains a
- // configured network -> vm could be mapped to that network.
- else {
- Set<VAppNetworkConfiguration> vAppNetworkConfigurations = listVappNetworkConfigurations(vApp);
- for (VAppNetworkConfiguration vAppNetworkConfiguration : vAppNetworkConfigurations) {
- NetworkAssignment networkAssignment = NetworkAssignment.builder()
- .innerNetwork(vAppNetworkConfiguration.getNetworkName())
- .containerNetwork(vAppNetworkConfiguration.getNetworkName()).build();
- networkAssignments.add(networkAssignment);
- }
- }
- }
-
- // if the vm does not contain any network connection sections and if the
- // vapp contains a network configuration. we should add the vm to this
- // vapp network
- else {
- if (vAppHasNetworkConfigured(vApp)) {
- VAppNetworkConfiguration vAppNetworkConfiguration = getVAppNetworkConfig(vApp);
- NetworkConnection networkConnection = NetworkConnection.builder()
- .network(vAppNetworkConfiguration.getNetworkName())
- .ipAddressAllocationMode(IpAddressAllocationMode.DHCP).build();
-
- NetworkConnectionSection networkConnectionSection = NetworkConnectionSection.builder().info("networkInfo")
- .primaryNetworkConnectionIndex(0).networkConnection(networkConnection).build();
-
- // adding the network connection section to the instantiation params of the vapp.
- vmInstantiationParams = InstantiationParams.builder().sections(ImmutableSet.of(networkConnectionSection))
- .build();
- }
- }
-
- if (vmInstantiationParams != null)
- vmItem = SourcedCompositionItemParam.builder().fromSourcedCompositionItemParam(vmItem)
- .instantiationParams(vmInstantiationParams).build();
-
- if (networkAssignments != null)
- vmItem = SourcedCompositionItemParam.builder().fromSourcedCompositionItemParam(vmItem)
- .networkAssignment(networkAssignments).build();
-
- return RecomposeVAppParams.builder().name(name("recompose-"))
- // adding the vm item.
- .sourcedItems(ImmutableList.of(vmItem)).build();
- }
-
- private final class IsVAppNetworkNamed implements Predicate<VAppNetworkConfiguration> {
- private final String networkName;
-
- private IsVAppNetworkNamed(String networkName) {
- this.networkName = networkName;
- }
-
- @Override
- public boolean apply(VAppNetworkConfiguration input) {
- return input.getNetworkName().equals(networkName);
- }
- }
-
- private void cleanUpNetworkConnectionSection(Vm toAddVm) {
- NetworkConnectionSection networkConnectionSection = vmApi.getNetworkConnectionSection(toAddVm.getHref());
- Set<NetworkConnection> networkConnections = networkConnectionSection.getNetworkConnections();
- for (NetworkConnection networkConnection : networkConnections) {
- NetworkConnection newNetworkConnection = networkConnection.toBuilder().isConnected(false).build();
- networkConnectionSection = networkConnectionSection.toBuilder().networkConnection(newNetworkConnection)
- .build();
- }
-
- Task configureNetwork = vmApi.editNetworkConnectionSection(toAddVm.getHref(), networkConnectionSection);
- assertTaskSucceedsLong(configureNetwork);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppNetworksLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppNetworksLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppNetworksLiveTest.java
deleted file mode 100644
index ba94019..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppNetworksLiveTest.java
+++ /dev/null
@@ -1,330 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkNetworkConfigSection;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.vcloud.director.v1_5.AbstractVAppApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.network.FirewallRule;
-import org.jclouds.vcloud.director.v1_5.domain.network.FirewallRuleProtocols;
-import org.jclouds.vcloud.director.v1_5.domain.network.FirewallService;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRange;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpScope;
-import org.jclouds.vcloud.director.v1_5.domain.network.NatService;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection.IpAddressAllocationMode;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures;
-import org.jclouds.vcloud.director.v1_5.domain.network.NetworkService;
-import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * NOTE The environment MUST have at least one template configured
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "VAppNetworksLiveTest")
-public class VAppNetworksLiveTest extends AbstractVAppApiLiveTest {
-
- private static final String HTTP_SECURITY_GROUP = "http";
- private static final String DEFAULT_SECURITY_GROUP = "default";
- private String key;
- private Map<String, NetworkConfiguration> securityGroupToNetworkConfig;
- private Network network;
- private URI vAppHref;
-
- @AfterClass(alwaysRun = true, dependsOnMethods = { "cleanUpEnvironment" })
- protected void tidyUp() {
- if (key != null) {
- try {
- Task remove = context.getApi().getMetadataApi(context.resolveIdToHref(vAppTemplateId)).remove(key);
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error when deleting metadata entry '%s'", key);
- }
- }
- }
-
- @BeforeClass
- void setUp() {
- network = lazyGetNetwork();
- securityGroupToNetworkConfig = addSecurityGroupToNetworkConfiguration(Reference.builder().fromEntity(network).build());
- vAppHref = context.resolveIdToHref(vAppId);
- }
-
- @AfterMethod
- void cleanUpVmNetworks() {
- disconnectVmFromVAppNetwork(vm);
- }
-
- @Test(description = "Create a vApp Network based on an org network with `default` firewall rules applied")
- public void testAddVAppNetworkWithDefaultSecurityGroup() {
- ImmutableList<String> securityGroups = ImmutableList.of(DEFAULT_SECURITY_GROUP);
- addVAppNetworkWithSecurityGroupOnVApp(securityGroups, vAppHref);
-
- // Retrieve the modified section
- NetworkConfigSection modified = vAppApi.getNetworkConfigSection(vAppHref);
-
- // Check the retrieved object is well formed
- checkNetworkConfigSection(modified);
-
- /*
- * TODO
- * powerOn machine, ssh to it, run sshd on a port, trying to connect
- * `which sshd` -p 22
- *
- */
- }
-
- @Test(description = "Create a vApp Network based on an org network with `http` firewall rules applied")
- public void testAddVAppNetworkWithHttpSecurityGroup() {
- ImmutableList<String> securityGroups = ImmutableList.of(HTTP_SECURITY_GROUP);
- addVAppNetworkWithSecurityGroupOnVApp(securityGroups, vAppHref);
-
- // Retrieve the modified section
- NetworkConfigSection modified = vAppApi.getNetworkConfigSection(vAppHref);
-
- // Check the retrieved object is well formed
- checkNetworkConfigSection(modified);
-
- /*
- * TODO
- * powerOn machine, ssh to it, run sshd on a port, trying to connect
- * `which sshd` -p 22
- *
- */
- }
-
- @Test(description = "Create a vApp Network based on an org network with both `defautl` and `http` firewall rules applied")
- public void testAddVAppNetworkWithDefaultAndHttpSecurityGroup() {
- ImmutableList<String> securityGroups = ImmutableList.of(DEFAULT_SECURITY_GROUP, HTTP_SECURITY_GROUP);
- addVAppNetworkWithSecurityGroupOnVApp(securityGroups, vAppHref);
-
- // Retrieve the modified section
- NetworkConfigSection modified = vAppApi.getNetworkConfigSection(vAppHref);
-
- // Check the retrieved object is well formed
- checkNetworkConfigSection(modified);
-
- /*
- * TODO
- * powerOn machine, ssh to it, run sshd on a port, trying to connect
- * `which sshd` -p 22
- *
- */
- }
-
- private void addVAppNetworkWithSecurityGroupOnVApp(ImmutableList<String> securityGroups, URI vAppHref) {
- String newVAppNetworkName = generateVAppNetworkName(network.getName(), securityGroups);
- // Create a vAppNetwork with firewall rules
- NetworkConfigSection newSection = generateNetworkConfigSection(securityGroups, newVAppNetworkName);
- Task editNetworkConfigSection = vAppApi.editNetworkConfigSection(vAppHref, newSection);
- assertTrue(retryTaskSuccess.apply(editNetworkConfigSection), String.format(TASK_COMPLETE_TIMELY, "editNetworkConfigSection"));
- attachVmToVAppNetwork(vm, newVAppNetworkName);
- }
-
- private NetworkConfigSection generateNetworkConfigSection(List<String> securityGroups, String newVAppNetworkName) {
-
- Set<FirewallRule> firewallRules = Sets.newLinkedHashSet();
- for (String securityGroup : securityGroups) {
- Set<FirewallRule> securityGroupFirewallRules = retrieveAllFirewallRules(securityGroupToNetworkConfig.get(securityGroup).getNetworkFeatures());
- firewallRules.addAll(securityGroupFirewallRules);
- }
-
- FirewallService firewallService = addFirewallService(firewallRules);
- NatService natService = addNatService();
- IpScope ipScope = addNewIpScope();
- NetworkConfiguration newConfiguration = NetworkConfiguration.builder()
- .ipScope(ipScope)
- .parentNetwork(Reference.builder().fromEntity(network).build())
- .fenceMode(FenceMode.NAT_ROUTED)
- .retainNetInfoAcrossDeployments(false)
- .features(toNetworkFeatures(ImmutableSet.of(firewallService, natService)))
- .build();
-
- VAppNetworkConfiguration newVAppNetworkConfiguration = VAppNetworkConfiguration.builder().networkName(newVAppNetworkName).configuration(newConfiguration).build();
- return NetworkConfigSection.builder()
- .info("modified")
- .networkConfigs(ImmutableSet.of(newVAppNetworkConfiguration))
- .build();
- }
-
- private IpScope addNewIpScope() {
- IpRange newIpRange = addIpRange();
- IpRanges newIpRanges = IpRanges.builder()
- .ipRange(newIpRange)
- .build();
- return IpScope.builder()
- .isInherited(false)
- .gateway("192.168.2.1")
- .netmask("255.255.0.0")
- .ipRanges(newIpRanges).build();
- }
-
- private IpRange addIpRange() {
- IpRange newIpRange = IpRange.builder()
- .startAddress("192.168.2.100")
- .endAddress("192.168.2.199")
- .build();
- return newIpRange;
- }
-
- private Set<FirewallRule> retrieveAllFirewallRules(NetworkFeatures networkFeatures) {
- Set<FirewallRule> firewallRules = Sets.newLinkedHashSet();
- for (NetworkService<?> networkService : networkFeatures.getNetworkServices()) {
- if (networkService instanceof FirewallService) {
- firewallRules.addAll(((FirewallService) networkService).getFirewallRules());
- }
- }
- return firewallRules;
- }
-
- private NetworkFeatures toNetworkFeatures(Set<? extends NetworkService<?>> networkServices) {
- NetworkFeatures networkFeatures = NetworkFeatures.builder()
- .services(networkServices)
- .build();
- return networkFeatures;
- }
-
-
- private Set<FirewallRule> defaultFirewallRules() {
- FirewallRuleProtocols protocols = FirewallRuleProtocols.builder()
- .any(true)
- .build();
- FirewallRule egressAll = addFirewallRule(FirewallRuleProtocols.builder().tcp(true).build(), "allow ssh ingoing traffic", -1, 22, "in");
- FirewallRule sshIngoing = addFirewallRule(protocols, "allow all outgoing traffic", -1, -1, "out");
- return ImmutableSet.of(egressAll, sshIngoing);
- }
-
- private Set<FirewallRule> httpIngressFirewallRules() {
- FirewallRuleProtocols protocols = FirewallRuleProtocols.builder().tcp(true).build();
- FirewallRule httpIngoing = addFirewallRule(protocols , "allow http ingoing traffic", 80, 80, "in");
- FirewallRule httpsIngoing = addFirewallRule(protocols , "allow https ingoing traffic", 443, 443, "in");
- return ImmutableSet.of(httpIngoing, httpsIngoing);
- }
-
- private FirewallRule addFirewallRule(FirewallRuleProtocols protocols, String description, int sourcePort, int outPort, String direction) {
- return FirewallRule.builder()
- .isEnabled(true)
- .description(description)
- .policy("allow")
- .protocols(protocols)
- .port(outPort)
- .destinationIp("Any")
- .sourcePort(sourcePort)
- .sourceIp("Any")
- .direction(direction)
- .enableLogging(false)
- .build();
- }
-
- private FirewallService addFirewallService(Set<FirewallRule> firewallRules) {
- FirewallService firewallService = FirewallService.builder()
- .enabled(true)
- .defaultAction("drop")
- .logDefaultAction(false)
- .firewallRules(firewallRules)
- .build();
- return firewallService;
- }
-
- private NatService addNatService() {
- NatService natService = NatService.builder()
- .enabled(true)
- .natType("ipTranslation")
- .policy("allowTraffic")
- .build();
- return natService;
- }
-
- private Map<String, NetworkConfiguration> addSecurityGroupToNetworkConfiguration(Reference parentNetworkRef) {
- Set<FirewallRule> defaultFirewallRules = defaultFirewallRules();
- Set<FirewallRule> httpFirewallRules = httpIngressFirewallRules();
-
- Map<String, NetworkConfiguration> securityGroupToNetworkConfigurations = Maps.newHashMap();
- securityGroupToNetworkConfigurations.put(DEFAULT_SECURITY_GROUP, addNetworkConfiguration(parentNetworkRef, defaultFirewallRules));
- securityGroupToNetworkConfigurations.put(HTTP_SECURITY_GROUP, addNetworkConfiguration(parentNetworkRef, httpFirewallRules));
-
- return securityGroupToNetworkConfigurations;
- }
-
- private NetworkConfiguration addNetworkConfiguration(Reference parentNetworkRef, Set<FirewallRule> newFirewallRules) {
- FirewallService firewallService = addFirewallService(newFirewallRules);
-
- IpScope ipScope = addNewIpScope();
-
- NetworkConfiguration newConfiguration = NetworkConfiguration.builder()
- .ipScope(ipScope)
- .parentNetwork(parentNetworkRef)
- .fenceMode(FenceMode.NAT_ROUTED)
- .retainNetInfoAcrossDeployments(false)
- .features(toNetworkFeatures(ImmutableSet.of(firewallService)))
- .build();
- return newConfiguration;
- }
-
- private static String generateVAppNetworkName(String orgNetworkName, List<String> securityGroupNames) {
- return orgNetworkName + "-" + Joiner.on("+").join(securityGroupNames);
- }
-
- private void disconnectVmFromVAppNetwork(Vm vm) {
-
- Set<NetworkConnection> networkConnections = vmApi.getNetworkConnectionSection(vm.getHref())
- .getNetworkConnections();
-
- NetworkConnectionSection section = NetworkConnectionSection.builder()
- .info("info")
- .primaryNetworkConnectionIndex(0)
- .build();
-
- for (NetworkConnection networkConnection : networkConnections) {
- section = section
- .toBuilder()
- .networkConnection(networkConnection.toBuilder()
- .network("none")
- .ipAddressAllocationMode(IpAddressAllocationMode.NONE)
- .build())
- .build();
- }
- Task cleanUpNetworks = vmApi.editNetworkConnectionSection(vm.getHref(), section);
- assertTaskSucceedsLong(cleanUpNetworks);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiExpectTest.java
deleted file mode 100644
index 1ffc22c..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApiExpectTest.java
+++ /dev/null
@@ -1,317 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CUSTOMIZATION_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.ERROR;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.LEASE_SETTINGS_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_CONFIG_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP_TEMPLATE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
-import java.net.URI;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vm;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = { "unit", "user" }, testName = "VAppTemplateApiExpectTest")
-public class VAppTemplateApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- public VAppTemplateApiExpectTest() {
- TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
- }
-
- @Test
- public void testVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId).acceptMedia(VAPP_TEMPLATE).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/vAppTemplate.xml", VAPP_TEMPLATE).httpResponseBuilder().build(),
- new VcloudHttpRequestPrimer().apiCommand("PUT", templateId).xmlFilePayload("/vapptemplate/vAppTemplate.xml", VAPP_TEMPLATE).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/task/task.xml", TASK).httpResponseBuilder().build(),
- new VcloudHttpRequestPrimer().apiCommand("DELETE", templateId).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/task/task.xml", TASK).httpResponseBuilder().build()
- ).getVAppTemplateApi();
-
- assertNotNull(api);
- VAppTemplate template = api.get(uri);
-
- assertEquals(template, exampleTemplate());
-
- Task task = api.edit(uri, exampleTemplate());
- assertNotNull(task);
-
- task = api.remove(uri);
- assertNotNull(task);
- }
-
- @Test(expectedExceptions = VCloudDirectorException.class)
- public void testErrorGetVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId).acceptMedia(VAPP_TEMPLATE).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateApi();
-
- api.get(uri);
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testErrorEditVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("PUT", templateId).xmlFilePayload("/vapptemplate/vAppTemplate.xml", VAPP_TEMPLATE).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateApi();
-
- api.edit(uri, exampleTemplate());
- }
-
- @Test(expectedExceptions = VCloudDirectorException.class)
- public void testRemoveMissingVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("DELETE", templateId).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateApi();
-
- api.remove(uri);
- }
-
- public void testDisableDownloadVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/action/disableDownload").httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().httpResponseBuilder().build()
- ).getVAppTemplateApi();
-
- assertNotNull(api);
- api.disableDownload(uri);
- }
-
- @Test(expectedExceptions = VCloudDirectorException.class)
- public void testDisableDownloadMissingVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/action/disableDownload").httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateApi();
-
- api.disableDownload(uri);
- }
-
- public void testEnableDownloadVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/action/enableDownload").acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/task/task.xml", TASK).httpResponseBuilder().build()
- ).getVAppTemplateApi();
-
- assertNotNull(api);
- Task task = api.enableDownload(uri);
- assertNotNull(task);
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testEnableDownloadMissingVAppTemplate() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("POST", templateId + "/action/enableDownload").acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateApi();
-
- api.enableDownload(uri);
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testErrorGetCustomizationSection() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/customizationSection").acceptMedia(CUSTOMIZATION_SECTION).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateApi();
-
- assertNull(api.getCustomizationSection(uri));
- }
-
- public void testLeaseSettingsSection() throws ParseException {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/leaseSettingsSection").acceptMedia(LEASE_SETTINGS_SECTION).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/leaseSettingsSection.xml", LEASE_SETTINGS_SECTION).httpResponseBuilder().build(),
- new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/leaseSettingsSection").xmlFilePayload("/vapptemplate/leaseSettingsSection.xml", LEASE_SETTINGS_SECTION).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/task/task.xml", TASK).httpResponseBuilder().build()
- ).getVAppTemplateApi();
-
- assertNotNull(api);
- LeaseSettingsSection section = api.getLeaseSettingsSection(uri);
-
- assertEquals(section, exampleLeaseSettingsSection());
-
- Task task = api.editLeaseSettingsSection(uri, exampleLeaseSettingsSection());
- assertNotNull(task);
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testErrorGetLeaseSettingsSection() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/leaseSettingsSection").acceptMedia(LEASE_SETTINGS_SECTION).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateApi();
-
- assertNull(api.getLeaseSettingsSection(uri));
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testErrorEditLeaseSettingsSection() throws ParseException {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("PUT", templateId + "/leaseSettingsSection").xmlFilePayload("/vapptemplate/leaseSettingsSection.xml", LEASE_SETTINGS_SECTION).acceptMedia(TASK).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error403.xml", ERROR).httpResponseBuilder().statusCode(403).build()).getVAppTemplateApi();
-
- api.editLeaseSettingsSection(uri, exampleLeaseSettingsSection());
- }
-
-
- @Test(expectedExceptions = VCloudDirectorException.class)
- public void testErrorGetNetworkConfigSection() {
- final String templateId = "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9";
- URI uri = URI.create(endpoint + templateId);
-
- VAppTemplateApi api = orderedRequestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer().apiCommand("GET", templateId + "/networkConfigSection").acceptMedia(NETWORK_CONFIG_SECTION).httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer().xmlFilePayload("/vapptemplate/error400.xml", ERROR).httpResponseBuilder().statusCode(400).build()).getVAppTemplateApi();
-
- api.getNetworkConfigSection(uri);
- }
-
- private VAppTemplate exampleTemplate() {
- Link aLink = Link.builder().href(URI.create("https://vcloudbeta.bluelock.com/api/vdc/d16d333b-e3c0-4176-845d-a5ee6392df07"))
- .type("application/vnd.vmware.vcloud.vdc+xml").rel("up").build();
- Link bLink = Link.builder().href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"))
- .rel("remove").build();
-
- Owner owner = Owner.builder().type("application/vnd.vmware.vcloud.owner+xml").user(Reference.builder().href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/967d317c-4273-4a95-b8a4-bf63b78e9c69")).name("x@jclouds.org").type("application/vnd.vmware.admin.user+xml").build()).build();
-
- LeaseSettingsSection leaseSettings = LeaseSettingsSection.builder().type("application/vnd.vmware.vcloud.leaseSettingsSection+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/leaseSettingsSection/"))
- .info("Lease settings section")
- .links(ImmutableSet.of(Link.builder().rel("edit").type("application/vnd.vmware.vcloud.leaseSettingsSection+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/leaseSettingsSection/")).build()))
- .storageLeaseInSeconds(0)
- .required(false)
- .build();
- CustomizationSection customizationSection = CustomizationSection.builder()
- .type("application/vnd.vmware.vcloud.customizationSection+xml")
- .info("VApp template customization section")
- .customizeOnInstantiate(true)
- .href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9/customizationSection/"))
- .required(false)
- .build();
-
- return VAppTemplate.builder().href(URI.create("https://vcloudbeta.bluelock.com/api/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"))
- .links(ImmutableSet.of(aLink, bLink))
- .children(ImmutableSet.<Vm>of())
- .type("application/vnd.vmware.vcloud.vAppTemplate+xml")
- .description("For testing")
- .id("urn:vcloud:vapptemplate:ef4415e6-d413-4cbb-9262-f9bbec5f2ea9")
- .name("ubuntu10")
- .sections(ImmutableSet.of(leaseSettings, customizationSection))
- .status(-1)
- .owner(owner)
- .ovfDescriptorUploaded(true)
- .goldMaster(false)
- .build();
- }
-
- private GuestCustomizationSection exampleGuestCustomizationSection() {
- return GuestCustomizationSection.builder()
- .links(ImmutableSet.of(
- Link.builder().href(URI.create("http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-12/guestCustomizationSection/"))
- .type("application/vnd.vmware.vcloud.guestCustomizationSection+xml").rel("edit").build()
- ))
- .enabled(false)
- .changeSid(false)
- .virtualMachineId("4")
- .joinDomainEnabled(false)
- .useOrgSettings(false)
- .adminPasswordEnabled(false)
- .adminPasswordAuto(true)
- .resetPasswordRequired(false)
- .type("application/vnd.vmware.vcloud.guestCustomizationSection+xml")
- .info("Specifies Guest OS Customization Settings")
- .computerName("ubuntu10-x86")
- .customizationScript("ls")
- .href(URI.create("http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-12/guestCustomizationSection/"))
- .required(false)
- .build();
- }
-
- private LeaseSettingsSection exampleLeaseSettingsSection() throws ParseException {
- SimpleDateFormat iso8601SimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
- return LeaseSettingsSection.builder().type("application/vnd.vmware.vcloud.leaseSettingsSection+xml")
- .href(URI.create("http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-7/leaseSettingsSection/"))
- .info("VApp lease settings")
- .links(ImmutableSet.of(Link.builder().rel("edit").type("application/vnd.vmware.vcloud.leaseSettingsSection+xml")
- .href(URI.create("http://vcloud.example.com/api/v1.5/vAppTemplate/vAppTemplate-7/leaseSettingsSection/")).build()))
- .storageLeaseInSeconds(3600)
- .deploymentLeaseInSeconds(3600)
- // note adjusted to UTC
- .deploymentLeaseExpiration(iso8601SimpleDateFormat.parse("2010-01-21T21:50:59.764"))
- .required(false)
- .build();
- }
-
-}
[13/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiExpectTest.java
deleted file mode 100644
index be8e669..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiExpectTest.java
+++ /dev/null
@@ -1,535 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CATALOG;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CATALOG_ITEM;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA_VALUE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.domain.Catalog;
-import org.jclouds.vcloud.director.v1_5.domain.CatalogItem;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HttpHeaders;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "CatalogApiExpectTest")
-public class CatalogApiExpectTest extends VCloudDirectorApiExpectTest {
- static String catalog = "7212e451-76e1-4631-b2de-ba1dfd8080e4";
- static String catalogUrn = "urn:vcloud:catalog:" + catalog;
- static URI catalogHref = URI.create(endpoint + "/catalog/" + catalog);
-
- HttpRequest get = HttpRequest.builder()
- .method("GET")
- .endpoint(catalogHref)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .build();
-
- HttpResponse getResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/catalog.xml", CATALOG + ";version=1.5"))
- .build();
-
- @Test
- public void testGetCatalogHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, get, getResponse);
- assertEquals(api.getCatalogApi().get(catalogHref), catalog());
- }
-
- HttpRequest add = HttpRequest.builder()
- .method("POST")
- .endpoint(catalogHref + "/catalogItems")
- .addHeader("Accept", "application/vnd.vmware.vcloud.catalogItem+xml")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/newCatalogItem.xml", CATALOG_ITEM))
- .build();
-
- HttpResponse addResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/adddCatalogItem.xml", CATALOG_ITEM + ";version=1.5"))
- .build();
-
- CatalogItem newItem = CatalogItem.builder()
- .name("newCatalogItem")
- .description("New Catalog Item")
- .entity(ubuntuVappTemplateReference())
- .build();
-
- @Test
- public void testAddCatalogItemHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, add, addResponse);
- assertEquals(api.getCatalogApi().addItem(catalogHref, newItem), adddCatalogItem());
- }
-
- HttpRequest getMetadata = HttpRequest.builder()
- .method("GET")
- .endpoint(catalogHref + "/metadata")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getMetadataResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/catalogMetadata.xml", METADATA))
- .build();
-
- @Test
- public void testGetCatalogMetadataHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getMetadata, getMetadataResponse);
- assertEquals(api.getMetadataApi(catalogHref).get(), metadata());
- }
-
- static Metadata metadata() {
- return Metadata.builder()
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/catalog/" + catalog + "/metadata"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .href(catalogHref)
- .build())
- .entries(ImmutableSet.of(metadataEntry()))
- .build();
- }
-
- HttpRequest getMetadataValue = HttpRequest.builder()
- .method("GET")
- .endpoint(catalogHref + "/metadata/KEY")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getMetadataValueResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/catalogMetadataValue.xml", METADATA_VALUE))
- .build();
-
- @Test
- public void testGetCatalogMetadataEntryHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getMetadataValue, getMetadataValueResponse);
- assertEquals(api.getMetadataApi(catalogHref).get("KEY"), "VALUE");
- }
-
- static String item = "a36fdac9-b8c2-43e2-9a4c-2ffaf3ee13df";
- static URI itemHref = URI.create(endpoint + "/catalogItem/" + item);
-
- HttpRequest getItem = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/catalogItem/" + item)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getItemResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/catalogItem.xml", CATALOG_ITEM))
- .build();
-
- @Test
- public void testGetCatalogItemHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getItem, getItemResponse);
- assertEquals(api.getCatalogApi().getItem(itemHref), catalogItem());
- }
-
- HttpRequest editItem = HttpRequest.builder()
- .method("PUT")
- .endpoint(endpoint + "/catalogItem/" + item)
- .addHeader("Accept", "application/vnd.vmware.vcloud.catalogItem+xml")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/editCatalogItem.xml", CATALOG_ITEM))
- .build();
-
- HttpResponse editItemResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/editCatalogItem.xml", CATALOG_ITEM + ";version=1.5"))
- .build();
-
- @Test
- public void testEditCatalogItemHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, editItem, editItemResponse);
- assertEquals(api.getCatalogApi().editItem(itemHref, catalogItem()), catalogItem());
- }
-
- HttpRequest removeItem = HttpRequest.builder()
- .method("DELETE")
- .endpoint(endpoint + "/catalogItem/" + item)
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse removeItemResponse = HttpResponse.builder()
- .statusCode(200)
- .build();
-
- @Test
- public void testRemoveCatalogItemHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, removeItem, removeItemResponse);
- api.getCatalogApi().removeItem(itemHref);
- }
-
- HttpRequest getItemMetadata = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/catalogItem/" + item + "/metadata")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getItemMetadataResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/catalogItemMetadata.xml", METADATA))
- .build();
-
- Metadata expected = Metadata.builder()
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/catalogItem/" + item + "/metadata"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(itemHref)
- .build())
- .entries(ImmutableSet.of(itemMetadataEntry()))
- .build();
-
- @Test
- public void testGetCatalogItemMetadataHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getItemMetadata, getItemMetadataResponse);
- assertEquals(api.getMetadataApi(itemHref).get(), expected);
- }
-
- HttpRequest mergeItemMetadata = HttpRequest.builder()
- .method("POST")
- .endpoint(endpoint + "/catalogItem/" + item + "/metadata")
- .addHeader("Accept", "application/vnd.vmware.vcloud.task+xml")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/mergeCatalogItemMetadata.xml", METADATA))
- .build();
-
- HttpResponse mergeItemMetadataResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/mergeMetadataTask.xml", TASK + ";version=1.5"))
- .build();
-
- @Test
- public void testMergeCatalogItemMetadataHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, mergeItemMetadata, mergeItemMetadataResponse);
- assertEquals(api.getMetadataApi(itemHref).putAll(ImmutableMap.of("KEY", "VALUE")), mergeMetadataTask());
- }
-
- HttpRequest getItemMetadataValue = HttpRequest.builder()
- .method("GET")
- .endpoint(endpoint + "/catalogItem/" + item + "/metadata/KEY")
- .addHeader("Accept", "*/*")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse getItemMetadataValueResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/catalogItemMetadataValue.xml", METADATA_VALUE + ";version=1.5"))
- .build();
-
- @Test
- public void testGetCatalogItemMetadataEntryHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, getItemMetadataValue, getItemMetadataValueResponse);
- assertEquals(api.getMetadataApi(itemHref).get("KEY"), "VALUE");
- }
-
- HttpRequest putItemMetadata = HttpRequest.builder()
- .method("PUT")
- .endpoint(endpoint + "/catalogItem/" + item + "/metadata/KEY")
- .addHeader("Accept", "application/vnd.vmware.vcloud.task+xml")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token)
- .payload(payloadFromResourceWithContentType("/catalog/setCatalogItemMetadataValue.xml", METADATA_VALUE))
- .build();
-
- HttpResponse putItemMetadataResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/setMetadataValueTask.xml", TASK + ";version=1.5"))
- .build();
-
- @Test
- public void testSetCatalogItemMetadataEntryHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, putItemMetadata, putItemMetadataResponse);
- assertEquals(api.getMetadataApi(itemHref).put("KEY", "KITTENS"), setMetadataValueTask());
- }
-
- HttpRequest removeItemMetadataEntry = HttpRequest.builder()
- .method("DELETE")
- .endpoint(endpoint + "/catalogItem/" + item + "/metadata/KEY")
- .addHeader("Accept", "application/vnd.vmware.vcloud.task+xml")
- .addHeader("x-vcloud-authorization", token)
- .addHeader(HttpHeaders.COOKIE, "vcloud-token=" + token).build();
-
- HttpResponse removeItemMetadataEntryResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResourceWithContentType("/catalog/removeMetadataEntryTask.xml", TASK))
- .build();
-
- @Test
- public void testRemoveCatalogItemMetadataEntryHref() {
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse, removeItemMetadataEntry, removeItemMetadataEntryResponse);
- assertEquals(api.getMetadataApi(itemHref).remove("KEY"), removeTask());
- }
-
- public static final Catalog catalog() {
- return Catalog.builder()
- .name("QunyingTestCatalog")
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .id(catalogUrn)
- .href(catalogHref)
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.org+xml")
- .href(URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(URI.create(endpoint + "/catalog/" + catalog + "/catalogItems"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/catalog/" + catalog + "/metadata"))
- .build())
- .item(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("ubuntu10")
- .href(itemHref)
- .build())
- .item(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("imageTesting")
- .href(URI.create(endpoint + "/catalogItem/a9e0afdb-a42b-4688-8409-2ac68cf22939"))
- .build())
- .description("Testing")
- .isPublished(false)
- .build();
- }
-
- public static CatalogItem adddCatalogItem() {
- return CatalogItem.builder()
- .name("newCatalogItem")
- .id("urn:vcloud:catalogitem:" + item)
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(itemHref)
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .href(catalogHref)
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/catalogItem/" + item + "/metadata"))
- .build())
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(itemHref)
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(itemHref)
- .build())
- .description("New Catalog Item")
- .entity(ubuntuVappTemplateReference())
- .build();
- }
-
- public static Reference ubuntuVappTemplateReference() {
- return Reference.builder()
- .type("application/vnd.vmware.vcloud.vAppTemplate+xml")
- .name("ubuntu10")
- .href(URI.create(endpoint + "/vAppTemplate/vappTemplate-ef4415e6-d413-4cbb-9262-f9bbec5f2ea9"))
- .build();
- }
-
- public static MetadataEntry metadataEntry() {
- return MetadataEntry.builder()
- .href(URI.create(endpoint + "/catalog/" + catalog + "/metadata/KEY"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/catalog/" + catalog + "/metadata"))
- .build())
- .entry("KEY", "VALUE")
- .build();
- }
-
- public static MetadataEntry itemMetadataEntry() {
- return MetadataEntry.builder()
- .href(URI.create(endpoint + "/catalogItem/" + item + "/metadata/KEY"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/catalogItem/" + item + "/metadata"))
- .build())
- .entry("KEY", "VALUE")
- .build();
- }
-
- public static CatalogItem catalogItem() {
- return CatalogItem.builder()
- .name("ubuntu10")
- .id("urn:vcloud:catalogitem:" + item)
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(itemHref)
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.catalog+xml")
- .href(catalogHref)
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create(endpoint + "/catalogItem/" + item + "/metadata"))
- .build())
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(itemHref)
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(itemHref)
- .build())
- .description("For testing")
- .entity(ubuntuVappTemplateReference())
- .build();
- }
-
- public static Task mergeMetadataTask() {
- return Task.builder()
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create(endpoint + "/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .operationName("metadataUpdate")
- .operation("Updating metadata for Catalog Item (" + item + ")")
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create(endpoint + "/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("")
- .href(itemHref)
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create(endpoint + "/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- public static Task setMetadataValueTask() {
- return Task.builder()
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create(endpoint + "/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .operationName("metadataSet")
- .operation("Setting metadata for Catalog Item (" + item + ")")
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create(endpoint + "/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("")
- .href(itemHref)
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create(endpoint + "/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- public static Task removeTask() {
- return Task.builder()
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create(endpoint + "/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .operationName("metadataDelete")
- .operation("Deleting metadata for Catalog Item (" + item + ")")
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create(endpoint + "/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .name("")
- .href(itemHref)
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create(endpoint + "/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create(endpoint + "/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiLiveTest.java
deleted file mode 100644
index a49e527..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogApiLiveTest.java
+++ /dev/null
@@ -1,259 +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.vcloud.director.v1_5.features;
-
-import static com.google.common.base.Predicates.and;
-import static com.google.common.collect.Iterables.find;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CORRECT_VALUE_OBJECT_FMT;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkCatalogItem;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata;
-import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkTask;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.relEquals;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.typeEquals;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
-import org.jclouds.vcloud.director.v1_5.domain.Catalog;
-import org.jclouds.vcloud.director.v1_5.domain.CatalogItem;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-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.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogApi;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CatalogApiLiveTest")
-public class CatalogApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- /*
- * Convenience references to API apis.
- */
- private CatalogApi catalogApi;
-
- /*
- * Shared state between dependant tests.
- */
- private AdminCatalog adminCatalog;
- private Media media;
- private CatalogItem catalogItem;
- private boolean createdByTest = false;
- private AdminCatalogApi adminCatalogApi;
-
- @Override
- protected void setupRequiredApis() {
- catalogApi = context.getApi().getCatalogApi();
- adminCatalogApi = adminContext.getApi().getCatalogApi();
-
- if (catalogId == null) {
- AdminCatalog newCatalog = AdminCatalog.builder().name(name("Test Catalog "))
- .description("created by CatalogApiLiveTest").build();
-
- adminCatalog = adminCatalogApi.addCatalogToOrg(newCatalog, org.getHref());
- catalogId = catalogApi.get(
- find(adminCatalog.getLinks(),
- and(relEquals("alternate"), typeEquals(VCloudDirectorMediaType.CATALOG))).getHref()).getId();
-
- createdByTest = true;
- }
- }
-
- @AfterClass(alwaysRun = true)
- @Override
- protected void tearDownContext() {
- if (media != null) {
- try {
- Task remove = context.getApi().getMediaApi().remove(media.getHref());
- taskDoneEventually(remove);
- } catch (Exception e) {
- logger.warn(e, "Error when deleting media '%s'", media.getName());
- }
- }
- if (createdByTest) {
- if (catalogItem != null) {
- try {
- catalogApi.removeItem(catalogItem.getHref());
- } catch (Exception e) {
- logger.warn(e, "Error when deleting catalog item '%s'", catalogItem.getName());
- }
- }
- if (adminContext != null && adminCatalog != null) {
- try {
- adminContext.getApi().getCatalogApi().remove(adminCatalog.getHref());
- } catch (Exception e) {
- logger.warn(e, "Error when deleting catalog '%s'", adminCatalog.getName());
- }
- }
- }
- super.tearDownContext();
- }
-
- @Test(description = "GET /catalog/{id}")
- public void testGetCatalog() {
- Catalog catalog = lazyGetCatalog();
- assertNotNull(catalog);
- // Double check it's pointing at the correct catalog
- assertEquals(catalog.getHref(), catalogId);
- }
-
- @Test(description = "GET /catalogItem/{id}", dependsOnMethods = "testAddCatalogItem")
- public void testGetCatalogItem() {
- CatalogItem catalogItem = catalogApi.getItem(this.catalogItem.getHref());
- checkCatalogItem(catalogItem);
- assertEquals(catalogItem.getEntity().getHref(), this.catalogItem.getEntity().getHref());
- }
-
- @Test(description = "POST /catalog/{id}/catalogItems")
- public void testAddCatalogItem() {
- byte[] iso = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
- Vdc vdc = lazyGetVdc();
- Link addMedia = find(vdc.getLinks(), and(relEquals("add"), typeEquals(VCloudDirectorMediaType.MEDIA)));
-
- Media sourceMedia = Media.builder().type(VCloudDirectorMediaType.MEDIA).name(name("TestMedia-")).size(iso.length)
- .imageType(Media.ImageType.ISO).description("Test media generated by testAddMedia()").build();
- media = context.getApi().getMediaApi().add(addMedia.getHref(), sourceMedia);
-
- Checks.checkMediaFor(VCloudDirectorMediaType.MEDIA, media);
-
- CatalogItem editedCatalogItem = CatalogItem.builder().name("newitem").description("New Item")
- .type(VCloudDirectorMediaType.CATALOG_ITEM).entity(Reference.builder().href(media.getHref()).build())
- .build();
- catalogItem = catalogApi.addItem(context.resolveIdToHref(catalogId), editedCatalogItem);
- checkCatalogItem(catalogItem);
- assertEquals(catalogItem.getName(), "newitem");
- assertEquals(catalogItem.getDescription(), "New Item");
- }
-
- @Test(description = "PUT /catalogItem/{id}", dependsOnMethods = "testAddCatalogItem")
- public void testEditCatalogItem() {
- CatalogItem editedCatalogItem = CatalogItem.builder().fromCatalogItem(catalogItem).name("UPDATEDNAME").build();
- catalogItem = catalogApi.editItem(catalogItem.getHref(), editedCatalogItem);
- checkCatalogItem(catalogItem);
- assertEquals(catalogItem.getName(), "UPDATEDNAME");
- }
-
- // Note this runs after all the metadata tests
- @Test(description = "DELETE /catalogItem/{id}", dependsOnMethods = "testRemoveCatalogItemMetadataValue")
- public void testRemoveCatalogItem() {
- removeMediaAttachedToCatalogItem(catalogItem);
- catalogApi.removeItem(catalogItem.getHref());
- catalogItem = catalogApi.getItem(catalogItem.getHref());
- assertNull(catalogItem);
- }
-
- @Test(description = "GET /catalog/{id}/metadata")
- public void testGetCatalogMetadata() {
- Metadata catalogMetadata = context.getApi().getMetadataApi(context.resolveIdToHref(catalogId)).get();
- checkMetadata(catalogMetadata);
- }
-
- @Test(description = "GET /catalog/{id}/metadata/{key}")
- public void testGetCatalogMetadataValue() {
-
- Task mergeCatalogMetadata = context.getApi().getMetadataApi(context.resolveIdToHref(catalogId))
- .putAll(ImmutableMap.of("KEY", "MARMALADE"));
- assertTaskSucceedsLong(mergeCatalogMetadata);
-
- Metadata catalogMetadata = context.getApi().getMetadataApi(context.resolveIdToHref(catalogId)).get();
-
- String metadataValue = context.getApi().getMetadataApi(context.resolveIdToHref(catalogId)).get("KEY");
- assertEquals(metadataValue, catalogMetadata.get("KEY"), String.format(CORRECT_VALUE_OBJECT_FMT, "Value",
- "MetadataValue", catalogMetadata.get("KEY"), metadataValue));
- }
-
- @Test(description = "GET /catalogItem/{id}/metadata", dependsOnMethods = "testAddCatalogItem")
- public void testGetCatalogItemMetadata() {
- Metadata catalogItemMetadata = context.getApi().getMetadataApi(catalogItem.getHref()).get();
- checkMetadata(catalogItemMetadata);
- }
-
- @Test(description = "POST /catalogItem/{id}/metadata", dependsOnMethods = "testAddCatalogItem")
- public void testMergeCatalogItemMetadata() {
- Metadata before = context.getApi().getMetadataApi(catalogItem.getHref()).get();
-
- Task mergeCatalogItemMetadata = context.getApi().getMetadataApi(catalogItem.getHref()).putAll(
- ImmutableMap.of("KEY", "MARMALADE", "VEGIMITE", "VALUE"));
- checkTask(mergeCatalogItemMetadata);
- assertTrue(retryTaskSuccess.apply(mergeCatalogItemMetadata),
- String.format(TASK_COMPLETE_TIMELY, "mergeCatalogItemMetadata"));
- Metadata mergedCatalogItemMetadata = context.getApi().getMetadataApi(catalogItem.getHref()).get();
-
- assertTrue(mergedCatalogItemMetadata.getMetadataEntries().size() > before.getMetadataEntries().size(),
- "Should have added at least one other MetadataEntry to the CatalogItem");
-
- String keyMetadataValue = context.getApi().getMetadataApi(catalogItem.getHref()).get("KEY");
- assertEquals(keyMetadataValue, "MARMALADE", "The Value of the MetadataValue for KEY should have changed");
-
- String newKeyMetadataValue = context.getApi().getMetadataApi(catalogItem.getHref()).get("VEGIMITE");
-
- assertEquals(newKeyMetadataValue, "VALUE", "The Value of the MetadataValue for NEW_KEY should have been set");
- }
-
- @Test(description = "GET /catalogItem/{id}/metadata/{key}", dependsOnMethods = "testSetCatalogItemMetadataValue")
- public void testGetCatalogItemMetadataValue() {
- String metadataValue = context.getApi().getMetadataApi(catalogItem.getHref()).get("KEY");
- assertNotNull(metadataValue);
- }
-
- @Test(description = "PUT /catalogItem/{id}/metadata/{key}", dependsOnMethods = "testMergeCatalogItemMetadata")
- public void testSetCatalogItemMetadataValue() {
-
- Task setCatalogItemMetadataValue = context.getApi().getMetadataApi(catalogItem.getHref()).put("KEY", "NEW");
- checkTask(setCatalogItemMetadataValue);
- assertTrue(retryTaskSuccess.apply(setCatalogItemMetadataValue),
- String.format(TASK_COMPLETE_TIMELY, "setCatalogItemMetadataValue"));
-
- String editedMetadataValue = context.getApi().getMetadataApi(catalogItem.getHref()).get("KEY");
- assertEquals(editedMetadataValue, "NEW",
- String.format(CORRECT_VALUE_OBJECT_FMT, "Value", "MetadataValue", "NEW", editedMetadataValue));
- }
-
- @Test(description = "DELETE /catalogItem/{id}/metadata/{key}", dependsOnMethods = "testGetCatalogItemMetadataValue")
- public void testRemoveCatalogItemMetadataValue() {
- Task removeCatalogItemMetadataValue = context.getApi().getMetadataApi(catalogItem.getHref()).remove("KEY");
- checkTask(removeCatalogItemMetadataValue);
- assertTrue(retryTaskSuccess.apply(removeCatalogItemMetadataValue),
- String.format(TASK_COMPLETE_TIMELY, "removeCatalogItemMetadataValue"));
- String removed = context.getApi().getMetadataApi(catalogItem.getHref()).get("KEY");
- assertNull(removed);
- }
-
- private void removeMediaAttachedToCatalogItem(CatalogItem catalogItem) {
- if (media != null) {
- if (catalogItem.getEntity().getHref().equals(media.getHref())) {
- try {
- Task remove = context.getApi().getMediaApi().remove(media.getHref());
- taskDoneEventually(remove);
- media = null;
- } catch (Exception e) {
- logger.warn(e, "Error when deleting media '%s'", media.getName());
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/KeyPairsApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/KeyPairsApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/KeyPairsApiLiveTest.java
deleted file mode 100644
index ae27c38..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/KeyPairsApiLiveTest.java
+++ /dev/null
@@ -1,210 +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.vcloud.director.v1_5.features;
-
-import static com.google.common.base.Predicates.and;
-import static com.google.common.collect.Iterables.find;
-import static com.google.common.collect.Iterables.getFirst;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_DEL;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_LIST_SIZE_EQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_LIST_SIZE_GE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_FIELD_REQ;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.relEquals;
-import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.typeEquals;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.io.Payloads;
-import org.jclouds.json.Json;
-import org.jclouds.ssh.SshKeys;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Checks;
-import org.jclouds.vcloud.director.v1_5.domain.File;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorApiLiveTest;
-import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.collections.Maps;
-
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
-
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "KeyPairsApiLiveTest")
-public class KeyPairsApiLiveTest extends BaseVCloudDirectorApiLiveTest {
-
- @Inject
- protected Json json;
- public static final String MEDIA = "media";
-
- protected VdcApi vdcApi;
- protected MediaApi mediaApi;
-
- private Map<String, String> sshKey;
- private String keyPairContainer = "keypairs";
-
- @Override
- @BeforeClass(alwaysRun = true)
- public void setupRequiredApis() {
- vdcApi = context.getApi().getVdcApi();
- mediaApi = context.getApi().getMediaApi();
- }
-
- @Test(description = "Create Key Pair")
- public void testCreateKeyPair() throws URISyntaxException {
- sshKey = SshKeys.generate();
- String keyPairName = "NewKeyPair";
- Vdc currentVDC = lazyGetVdc();
- Media keyPairsContainer = findOrCreateKeyPairContainerInVDCNamed(currentVDC,
- keyPairContainer, keyPairName);
- String keypairValue = context.getApi().getMetadataApi(
- keyPairsContainer.getHref()).get(keyPairName);
- assertEquals(keypairValue, generateKeyPair(keyPairName));
- }
-
- @Test(description = "DeleteKeyPair", dependsOnMethods = { "testCreateKeyPair" })
- public void testDeleteKeyPair() {
- String keyPairName = "NewKeyPair";
- Vdc currentVDC = lazyGetVdc();
- Media keyPairsContainer = findOrCreateKeyPairContainerInVDCNamed(currentVDC,
- keyPairContainer, keyPairName);
- Task removeMedia = mediaApi.remove(keyPairsContainer.getHref());
- Checks.checkTask(removeMedia);
- assertTrue(retryTaskSuccess.apply(removeMedia),
- String.format(TASK_COMPLETE_TIMELY, "removeMedia"));
-
- keyPairsContainer = mediaApi.get(keyPairsContainer.getHref());
- assertNull(keyPairsContainer, String.format(OBJ_DEL, MEDIA,
- keyPairsContainer != null ? keyPairsContainer.toString() : ""));
- }
-
- private Media findOrCreateKeyPairContainerInVDCNamed(Vdc currentVDC,
- String keyPairsContainerName, final String keyPairName) {
- Media keyPairsContainer = null;
-
- Optional<Media> optionalKeyPairsContainer = Iterables.tryFind(
- findAllEmptyMediaInOrg(), new Predicate<Media>() {
-
- @Override
- public boolean apply(Media input) {
- return context.getApi().getMetadataApi(input.getHref()).get(
- keyPairName) != null;
- }
- });
-
- if (optionalKeyPairsContainer.isPresent())
- keyPairsContainer = optionalKeyPairsContainer.get();
-
- if (keyPairsContainer == null) {
- keyPairsContainer = uploadKeyPairInVCD(currentVDC,
- keyPairsContainerName, keyPairName);
- }
- return keyPairsContainer;
- }
-
- private Media uploadKeyPairInVCD(Vdc currentVDC,
- String keyPairsContainerName, String keyPairName) {
- Media keyPairsContainer = addEmptyMediaInVDC(currentVDC,
- keyPairsContainerName);
- assertNotNull(keyPairsContainer.getFiles(),
- String.format(OBJ_FIELD_REQ, MEDIA, "files"));
- assertEquals(1, keyPairsContainer.getFiles().size(), String.format(
- OBJ_FIELD_LIST_SIZE_EQ, MEDIA, "files", 1, keyPairsContainer
- .getFiles().size()));
-
- Link uploadLink = getUploadLinkForMedia(keyPairsContainer);
- // generate an empty iso
- byte[] iso = new byte[] {};
- context.getApi()
- .getUploadApi()
- .upload(uploadLink.getHref(), Payloads.newPayload(iso));
-
- Checks.checkMediaFor(VCloudDirectorMediaType.MEDIA, keyPairsContainer);
- setKeyPairOnkeyPairsContainer(keyPairsContainer, keyPairName, generateKeyPair(keyPairName));
-
- return keyPairsContainer;
- }
-
- private Link getUploadLinkForMedia(Media emptyMedia) {
- File uploadFile = getFirst(emptyMedia.getFiles(), null);
- assertNotNull(uploadFile,
- String.format(OBJ_FIELD_REQ, MEDIA, "files.first"));
- assertEquals(uploadFile.getSize(), Long.valueOf(0));
- assertEquals(uploadFile.getSize().longValue(), emptyMedia.getSize(),
- String.format(OBJ_FIELD_EQ, MEDIA, "uploadFile.size()",
- emptyMedia.getSize(), uploadFile.getSize()));
-
- Set<Link> links = uploadFile.getLinks();
- assertNotNull(links,
- String.format(OBJ_FIELD_REQ, MEDIA, "uploadFile.links"));
- assertTrue(links.size() >= 1, String.format(OBJ_FIELD_LIST_SIZE_GE,
- MEDIA, "uploadfile.links", 1, links.size()));
- assertTrue(Iterables.all(links, Predicates.or(
- LinkPredicates.relEquals(Link.Rel.UPLOAD_DEFAULT),
- LinkPredicates.relEquals(Link.Rel.UPLOAD_ALTERNATE))),
- String.format(OBJ_FIELD_REQ, MEDIA, "uploadFile.links.first"));
-
- Link uploadLink = Iterables.find(links,
- LinkPredicates.relEquals(Link.Rel.UPLOAD_DEFAULT));
- return uploadLink;
- }
-
- private Media addEmptyMediaInVDC(Vdc currentVDC, String keyPairName) {
- Link addMedia = find(
- currentVDC.getLinks(),
- and(relEquals("add"), typeEquals(VCloudDirectorMediaType.MEDIA)));
-
- Media sourceMedia = Media.builder().type(VCloudDirectorMediaType.MEDIA)
- .name(keyPairName).size(0).imageType(Media.ImageType.ISO)
- .description("iso generated as KeyPair bucket").build();
-
- Media emptyMedia = mediaApi.add(addMedia.getHref(), sourceMedia);
- Checks.checkMediaFor(MEDIA, emptyMedia);
- return emptyMedia;
- }
-
- private String generateKeyPair(String keyPairName) {
- Map<String, String> key = Maps.newHashMap();
- key.put("keyName", keyPairName);
- key.put("keyFingerprint", SshKeys.sha1PrivateKey(sshKey.get("private")));
- key.put("publicKey", sshKey.get("public"));
- return json.toJson(key);
- }
-
- private void setKeyPairOnkeyPairsContainer(Media media, String keyPairName,
- String keyPair) {
- Task setKeyPair = context.getApi().getMetadataApi(media.getHref()).put(
- keyPairName, keyPair);
- Checks.checkTask(setKeyPair);
- assertTrue(retryTaskSuccess.apply(setKeyPair),
- String.format(TASK_COMPLETE_TIMELY, "setKeyPair"));
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiExpectTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiExpectTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiExpectTest.java
deleted file mode 100644
index 864ae36..0000000
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiExpectTest.java
+++ /dev/null
@@ -1,723 +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.vcloud.director.v1_5.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.fail;
-
-import java.net.URI;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Error;
-import org.jclouds.vcloud.director.v1_5.domain.File;
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.Media.ImageType;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
-import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminApiExpectTest;
-import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = { "unit", "user" }, singleThreaded = true, testName = "MediaApiExpectTest")
-public class MediaApiExpectTest extends VCloudDirectorAdminApiExpectTest {
-
- @Test
- public void testAddMedia() {
- URI uploadLink = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/media")
- .acceptMedia(VCloudDirectorMediaType.MEDIA)
- .xmlFilePayload("/media/addMediaSource.xml", VCloudDirectorMediaType.MEDIA)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/addMedia.xml", VCloudDirectorMediaType.MEDIA)
- .httpResponseBuilder().statusCode(201).build());
-
- Media source = Media.builder()
- .size(0)
- .imageType(ImageType.ISO)
- .name("Test media 1")
- .type("application/vnd.vmware.vcloud.media+xml")
- .description("Test media generated by testCreateMedia()")
- .build();
- Media expected = addMedia();
-
- assertEquals(api.getMediaApi().add(uploadLink, source), expected);
- }
-
- @Test
- public void testCloneMedia() {
- URI vdcURI = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneMedia")
- .acceptMedia(VCloudDirectorMediaType.MEDIA)
- .xmlFilePayload("/media/cloneMediaParams.xml", VCloudDirectorMediaType.CLONE_MEDIA_PARAMS)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/cloneMedia.xml", VCloudDirectorMediaType.MEDIA)
- .httpResponseBuilder().statusCode(201).build());
-
- CloneMediaParams params = CloneMediaParams.builder()
- .name("moved test media")
- .description("moved by testCloneMedia()")
- .source(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("copied test media")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/da8361af-cccd-4103-a71c-493513c49094"))
- .build())
- .isSourceDelete(false)
- .build();
- Media expected = cloneMedia();
-
- assertEquals(api.getMediaApi().clone(vdcURI, params), expected);
- }
-
- @Test
- public void testGetMedia() {
- URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/media.xml", VCloudDirectorMediaType.MEDIA)
- .httpResponseBuilder().build());
-
- Media expected = getMedia();
- assertEquals(api.getMediaApi().get(mediaUri), expected);
- }
-
- @Test
- public void testResponse400ForInvalidMedia() {
- URI mediaUri = URI.create(endpoint + "/media/NOTAUUID");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/media/NOTAUUID")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/error400.xml", VCloudDirectorMediaType.ERROR)
- .httpResponseBuilder().statusCode(400).build());
-
- Error expected = Error.builder()
- .message("validation error on field 'id': String value has invalid format or length")
- .majorErrorCode(400)
- .minorErrorCode("BAD_REQUEST")
- .build();
-
- try {
- api.getMediaApi().get(mediaUri);
- fail("Should give HTTP 400 error");
- } catch (VCloudDirectorException vde) {
- assertEquals(vde.getError(), expected);
- } catch (Exception e) {
- fail("Should have thrown a VCloudDirectorException", e);
- }
- }
-
- @Test
- public void testNullResponseForCatalogIdUsedAsMediaId() {
- URI mediaUri = URI.create(endpoint + "/media/e9cd3387-ac57-4d27-a481-9bee75e0690f");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/media/e9cd3387-ac57-4d27-a481-9bee75e0690f")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/error403-catalog.xml", VCloudDirectorMediaType.ERROR)
- .httpResponseBuilder().statusCode(403).build());
-
- assertNull(api.getMediaApi().get(mediaUri));
- }
-
- @Test
- public void testResponse403ForFakeMediaId() {
- URI mediaUri = URI.create(endpoint + "/media/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/media/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/error403-fake.xml", VCloudDirectorMediaType.ERROR)
- .httpResponseBuilder().statusCode(403).build());
-
- assertNull(api.getMediaApi().get(mediaUri));
- }
-
- @Test
- public void testEditMedia() {
- URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1")
- .xmlFilePayload("/media/editMedia.xml", VCloudDirectorMediaType.MEDIA)
- .acceptMedia(VCloudDirectorMediaType.TASK)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/editMediaTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Media edit = editMedia();
- Task expected = editMediaTask();
-
- assertEquals(api.getMediaApi().edit(mediaUri, edit), expected);
- }
-
- @Test
- public void testRemoveMedia() {
- URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("DELETE", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1")
- .acceptMedia(VCloudDirectorMediaType.TASK)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/removeMediaTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expected = removeMediaTask();
-
- assertEquals(api.getMediaApi().remove(mediaUri), expected);
- }
-
- @Test
- public void testGetMetadata() {
- URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/metadata.xml", VCloudDirectorMediaType.METADATA)
- .httpResponseBuilder().build());
-
-
- Metadata expected = metadata();
-
- assertEquals(api.getMetadataApi(mediaUri).get(), expected);
- }
-
- @Test
- public void testMergeMetadata() {
- URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("POST", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata")
- .xmlFilePayload("/media/mergeMetadata.xml", VCloudDirectorMediaType.METADATA)
- .acceptMedia(VCloudDirectorMediaType.TASK)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/mergeMetadataTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Metadata inputMetadata = metadata();
- Task expectedTask = mergeMetadataTask();
-
- assertEquals(api.getMetadataApi(mediaUri).putAll(inputMetadata), expectedTask);
- }
-
- public void testGetMetadataValue() {
- URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/metadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE)
- .httpResponseBuilder().build());
-
- assertEquals(api.getMetadataApi(mediaUri).get("key"), "value");
- }
-
- @Test
- public void testSetMetadataValue() {
- URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("PUT", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key")
- .xmlFilePayload("/media/setMetadataValue.xml", VCloudDirectorMediaType.METADATA_VALUE)
- .acceptMedia(VCloudDirectorMediaType.TASK)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/setMetadataValueTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expectedTask = setMetadataEntryTask();
-
- assertEquals(api.getMetadataApi(mediaUri).put("key", "value"), expectedTask);
- }
-
- @Test
- public void testRemoveMetadataValue() {
- URI mediaUri = URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("DELETE", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata/key")
- .acceptMedia(VCloudDirectorMediaType.TASK)
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/removeMetadataEntryTask.xml", VCloudDirectorMediaType.TASK)
- .httpResponseBuilder().build());
-
- Task expectedTask = removeTask();
-
- assertEquals(api.getMetadataApi(mediaUri).remove("key"), expectedTask);
- }
-
- @Test
- public void testGetOwner() {
- URI mediaUri = URI.create(endpoint + "/media/794eb334-754e-4917-b5a0-5df85cbd61d1");
-
- VCloudDirectorApi api = requestsSendResponses(loginRequest, sessionResponse,
- new VcloudHttpRequestPrimer()
- .apiCommand("GET", "/media/794eb334-754e-4917-b5a0-5df85cbd61d1/owner")
- .acceptAnyMedia()
- .httpRequestBuilder().build(),
- new VcloudHttpResponsePrimer()
- .xmlFilePayload("/media/owner.xml", VCloudDirectorMediaType.OWNER)
- .httpResponseBuilder().build());
-
- Owner expected = owner().toBuilder()
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.media+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .build();
-
- assertEquals(api.getMediaApi().getOwner(mediaUri), expected);
- }
-
- static Media addMedia() {
- return Media.builder()
- .size(0)
- .imageType(ImageType.ISO)
- .status(0)
- .name("Test media 1")
- .id("urn:vcloud:media:d51b0b9d-099c-499f-97f8-4fbe40ba06d7")
- .type("application/vnd.vmware.vcloud.media+xml")
- .description("Test media generated by testCreateMedia()")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/d51b0b9d-099c-499f-97f8-4fbe40ba06d7"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/d51b0b9d-099c-499f-97f8-4fbe40ba06d7"))
- .build())
- .files(ImmutableSet.of(File.builder()
- .size(0l)
- .bytesTransferred(0l)
- .name("file")
- .link(Link.builder()
- .rel("upload:default")
- .href(URI.create("https://mycloud.greenhousedata.com:443/transfer/b1fdf2d0-feff-4414-a8d1-3a8d86c4ccc5/file"))
- .build())
- .build()))
- .owner(owner())
- .build();
- }
-
- static Media cloneMedia() {
- return Media.builder()
- .size(175163392)
- .imageType(ImageType.ISO)
- .status(0)
- .name("copied test media-copy-671136ae-b8f0-4389-bca6-50e9c42268f2")
- .id("urn:vcloud:media:a6b023f2-7f90-4e89-a24d-56e0eba83a5a")
- .type("application/vnd.vmware.vcloud.media+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/a6b023f2-7f90-4e89-a24d-56e0eba83a5a"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/a6b023f2-7f90-4e89-a24d-56e0eba83a5a"))
- .build())
- .description("copied by testCloneMedia()")
- .tasks(ImmutableSet.<Task>builder()
- .add(Task.builder()
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-03-02T04:58:48.754-07:00"))
- .operationName("vdcCopyMedia")
- .operation("Copying Media File copied test media-copy-671136ae-b8f0-4389-bca6-50e9c42268f2(a6b023f2-7f90-4e89-a24d-56e0eba83a5a)")
- .expiryTime(dateService.iso8601DateParse("2012-05-31T04:58:48.754-06:00"))
- .name("task")
- .id("urn:vcloud:task:7e4f6baf-7ef0-43ea-93cc-62cc329afb5d")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/task/7e4f6baf-7ef0-43ea-93cc-62cc329afb5d"))
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://mycloud.greenhousedata.com/api/task/7e4f6baf-7ef0-43ea-93cc-62cc329afb5d/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("copied test media-copy-671136ae-b8f0-4389-bca6-50e9c42268f2")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/a6b023f2-7f90-4e89-a24d-56e0eba83a5a"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("acole")
- .href(URI.create("https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("cloudsoft")
- .href(URI.create("https://mycloud.greenhousedata.com/api/org/c076f90a-397a-49fa-89b8-b294c1599cd0"))
- .build())
- .build())
- .build())
- .owner(owner())
- .build();
- }
-
- private static Media getMedia() {
- return Media.builder()
- .size(175163392)
- .imageType(ImageType.ISO)
- .status(1)
- .name("DansTestMedia")
- .id("urn:vcloud:media:794eb334-754e-4917-b5a0-5df85cbd61d1")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"))
- .build())
- .link(Link.builder()
- .rel("catalogItem")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/catalogItem/1979d680-304e-4118-9283-9210c3b3ed8d"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.vcloud.media+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.owner+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1/owner"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata"))
- .build())
- .type("application/vnd.vmware.vcloud.media+xml")
- .description("Windows 2003 R2 Disk2 Standard 32bit & 64bit")
- .owner(owner())
- .build();
- }
-
- private static Media editMedia() {
- return Media.builder()
- .size(175163392)
- .imageType(ImageType.ISO)
- .status(1)
- .name("new testMedia1")
- .id("urn:vcloud:media:c93e5cdc-f29a-4749-8ed2-093df04cc75e")
- .type("application/vnd.vmware.vcloud.media+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.vdc+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"))
- .build())
- .link(Link.builder()
- .rel("catalogItem")
- .type("application/vnd.vmware.vcloud.catalogItem+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/catalogItem/1b317eb9-0e25-429a-ada2-3c7a74a0367b"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"))
- .build())
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.vcloud.media+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.owner+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/owner"))
- .build())
- .link(Link.builder()
- .rel("down")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"))
- .build())
- .description("new test description")
- .owner(Owner.builder()
- .type("application/vnd.vmware.vcloud.owner+xml")
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("dan")
- .href(URI.create("https://mycloud.greenhousedata.com/api/admin/user/7818d31c-df33-4d77-9bbc-0a0741cf3d44"))
- .build())
- .build())
- .build();
- }
-
- private static Task editMediaTask() {
- return Task.builder()
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .operationName("mediaUpdate")
- .operation("Updating Media (794eb334-754e-4917-b5a0-5df85cbd61d1)")
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- public static Task removeMediaTask() {
- return Task.builder()
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .operationName("vdcDeleteMedia")
- .operation("Deleting Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)")
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- private static Owner owner() {
- return Owner.builder()
- .type("application/vnd.vmware.vcloud.owner+xml")
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("acole")
- .href(URI.create("https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"))
- .build())
- .build();
- }
-
- private static Metadata metadata() {
- return Metadata.builder()
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.media+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e"))
- .build())
- .link(Link.builder()
- .rel("add")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"))
- .build())
- .entry(MetadataEntry.builder()
- .type("application/vnd.vmware.vcloud.metadata.value+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"))
- .link(Link.builder()
- .rel("up")
- .type("application/vnd.vmware.vcloud.metadata+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata"))
- .build())
- .link(Link.builder()
- .rel("edit")
- .type("application/vnd.vmware.vcloud.metadata.value+xml")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"))
- .build())
- .link(Link.builder()
- .rel("remove")
- .href(URI.create("https://mycloud.greenhousedata.com/api/media/c93e5cdc-f29a-4749-8ed2-093df04cc75e/metadata/key"))
- .build())
- .key("key").value("value").build())
- .build();
- }
-
- private Task mergeMetadataTask() {
- return Task.builder()
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .operationName("metadataUpdate")
- .operation("Updating metadata for Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)")
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- private Task setMetadataEntryTask() {
- return Task.builder()
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .operationName("metadataUpdate")
- .operation("Updating metadata for Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)")
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-
- public static Task removeTask() {
- return Task.builder()
- .name("task")
- .id("urn:vcloud:task:c6dca927-eab4-41fa-ad6a-3ac58602541c")
- .type("application/vnd.vmware.vcloud.task+xml")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c"))
- .status("running")
- .startTime(dateService.iso8601DateParse("2012-02-13T06:35:08.011-05:00"))
- .expiryTime(dateService.iso8601DateParse("2012-05-13T06:35:08.011-04:00"))
- .operationName("metadataDelete")
- .operation("Deleting metadata for Media File (794eb334-754e-4917-b5a0-5df85cbd61d1)")
- .link(Link.builder()
- .rel("task:cancel")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/task/c6dca927-eab4-41fa-ad6a-3ac58602541c/action/cancel"))
- .build())
- .owner(Reference.builder()
- .type("application/vnd.vmware.vcloud.media+xml")
- .name("")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"))
- .build())
- .user(Reference.builder()
- .type("application/vnd.vmware.admin.user+xml")
- .name("adk@cloudsoftcorp.com")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/admin/user/e9eb1b29-0404-4c5e-8ef7-e584acc51da9"))
- .build())
- .org(Reference.builder()
- .type("application/vnd.vmware.vcloud.org+xml")
- .name("JClouds")
- .href(URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0"))
- .build())
- .build();
- }
-}
[21/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java
deleted file mode 100644
index 77aa8bf..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java
+++ /dev/null
@@ -1,133 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "OrgNetwork")
-public class OrgNetwork extends Network {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromOrgNetwork(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> extends Network.Builder<T> {
- private Reference networkPool;
- private IpAddresses allowedExternalIpAddresses;
-
- /**
- * @see OrgNetwork#getNetworkPool()
- */
- public T networkPool(Reference networkPool) {
- this.networkPool = networkPool;
- return self();
- }
-
- /**
- * @see OrgNetwork#getAllowedExternalIpAddresses()
- */
- public T allowedExternalIpAddresses(IpAddresses allowedExternalIpAddresses) {
- this.allowedExternalIpAddresses = allowedExternalIpAddresses;
- return self();
- }
-
- @Override
- public OrgNetwork build() {
- return new OrgNetwork(this);
- }
-
- public T fromOrgNetwork(OrgNetwork in) {
- return fromEntityType(in).configuration(in.getConfiguration())
- .networkPool(in.getNetworkPool())
- .allowedExternalIpAddresses(in.getAllowedExternalIpAddresses());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- protected OrgNetwork() {
- // For JAXB
- }
-
- private OrgNetwork(Builder<?> b) {
- super(b);
- networkPool = b.networkPool;
- allowedExternalIpAddresses = b.allowedExternalIpAddresses;
- }
-
- @XmlElement(name = "NetworkPool")
- private Reference networkPool;
- @XmlElement(name = "AllowedExternalIpAddresses")
- private IpAddresses allowedExternalIpAddresses;
-
- /**
- * @return optional network pool
- */
- public Reference getNetworkPool() {
- return networkPool;
- }
-
- /**
- * @return optional network pool
- */
- public IpAddresses getAllowedExternalIpAddresses() {
- return allowedExternalIpAddresses;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o))
- return false;
- OrgNetwork that = OrgNetwork.class.cast(o);
- return super.equals(that) &&
- equal(networkPool, that.networkPool) &&
- equal(allowedExternalIpAddresses, that.allowedExternalIpAddresses);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- networkPool,
- allowedExternalIpAddresses);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("networkPool", networkPool)
- .add("allowedExternalIpAddresses", allowedExternalIpAddresses);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
deleted file mode 100644
index 78f957b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
+++ /dev/null
@@ -1,163 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "OrgPasswordPolicySettings")
-@XmlType(propOrder = {
- "accountLockoutEnabled",
- "invalidLoginsBeforeLockout",
- "accountLockoutIntervalMinutes"
-})
-public class OrgPasswordPolicySettings extends Resource {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgPasswordPolicySettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private boolean accountLockoutEnabled;
- private int invalidLoginsBeforeLockout;
- private int accountLockoutIntervalMinutes;
-
- /**
- * @see OrgPasswordPolicySettings#getAccountLockoutEnabled()
- */
- public B accountLockoutEnabled(boolean accountLockoutEnabled) {
- this.accountLockoutEnabled = accountLockoutEnabled;
- return self();
- }
-
- /**
- * @see OrgPasswordPolicySettings#getInvalidLoginsBeforeLockout()
- */
- public B invalidLoginsBeforeLockout(int invalidLoginsBeforeLockout) {
- this.invalidLoginsBeforeLockout = invalidLoginsBeforeLockout;
- return self();
- }
-
- /**
- * @see OrgPasswordPolicySettings#getAccountLockoutIntervalMinutes()
- */
- public B accountLockoutIntervalMinutes(int accountLockoutIntervalMinutes) {
- this.accountLockoutIntervalMinutes = accountLockoutIntervalMinutes;
- return self();
- }
-
- @Override
- public OrgPasswordPolicySettings build() {
- return new OrgPasswordPolicySettings(this);
- }
-
- public B fromOrgPasswordPolicySettings(OrgPasswordPolicySettings in) {
- return fromResource(in)
- .accountLockoutEnabled(in.isAccountLockoutEnabled())
- .invalidLoginsBeforeLockout(in.getInvalidLoginsBeforeLockout())
- .accountLockoutIntervalMinutes(in.getAccountLockoutIntervalMinutes());
- }
- }
-
- protected OrgPasswordPolicySettings() {
- // For JAXB
- }
-
- protected OrgPasswordPolicySettings(Builder<?> builder) {
- super(builder);
- this.accountLockoutEnabled = builder.accountLockoutEnabled;
- this.invalidLoginsBeforeLockout = builder.invalidLoginsBeforeLockout;
- this.accountLockoutIntervalMinutes = builder.accountLockoutIntervalMinutes;
- }
-
- @XmlElement(name = "AccountLockoutEnabled")
- protected boolean accountLockoutEnabled;
- @XmlElement(name = "InvalidLoginsBeforeLockout")
- protected int invalidLoginsBeforeLockout;
- @XmlElement(name = "AccountLockoutIntervalMinutes")
- protected int accountLockoutIntervalMinutes;
-
- /**
- * Gets the value of the accountLockoutEnabled property.
- *
- */
- public boolean isAccountLockoutEnabled() {
- return accountLockoutEnabled;
- }
-
- /**
- * Gets the value of the invalidLoginsBeforeLockout property.
- *
- */
- public Integer getInvalidLoginsBeforeLockout() {
- return invalidLoginsBeforeLockout;
- }
-
- /**
- * Gets the value of the accountLockoutIntervalMinutes property.
- *
- */
- public Integer getAccountLockoutIntervalMinutes() {
- return accountLockoutIntervalMinutes;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgPasswordPolicySettings that = OrgPasswordPolicySettings.class.cast(o);
- return super.equals(that) &&
- equal(accountLockoutEnabled, that.accountLockoutEnabled) &&
- equal(invalidLoginsBeforeLockout, that.invalidLoginsBeforeLockout) &&
- equal(accountLockoutIntervalMinutes, that.accountLockoutIntervalMinutes);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- accountLockoutEnabled,
- invalidLoginsBeforeLockout,
- accountLockoutIntervalMinutes);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("accountLockoutEnabled", accountLockoutEnabled)
- .add("invalidLoginsBeforeLockout", invalidLoginsBeforeLockout)
- .add("accountLockoutIntervalMinutes", accountLockoutIntervalMinutes);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
deleted file mode 100644
index dd1a7e1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
+++ /dev/null
@@ -1,268 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-/**
- * Describes various settings for some organization.
- * This type establishes quotas and policies for the organization.
- * It also contains elements that specify the details of
- * how the organization connects to LDAP and email services.
- */
-@XmlRootElement(name = "OrgSettings")
-@XmlType(propOrder = {
- "generalSettings",
- "vAppLeaseSettings",
- "vAppTemplateLeaseSettings",
- "ldapSettings",
- "emailSettings",
- "passwordPolicy"
-})
-public class OrgSettings extends Resource {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private OrgGeneralSettings generalSettings;
- private OrgLeaseSettings vAppLeaseSettings;
- private OrgVAppTemplateLeaseSettings vAppTemplateLeaseSettings;
- private OrgLdapSettings ldapSettings;
- private OrgEmailSettings emailSettings;
- private OrgPasswordPolicySettings passwordPolicy;
-
- /**
- * @see OrgSettings#getGeneralSettings()
- */
- public B generalSettings(OrgGeneralSettings generalSettings) {
- this.generalSettings = generalSettings;
- return self();
- }
-
- /**
- * @see OrgSettings#getVAppLeaseSettings()
- */
- public B vAppLeaseSettings(OrgLeaseSettings vAppLeaseSettings) {
- this.vAppLeaseSettings = vAppLeaseSettings;
- return self();
- }
-
- /**
- * @see OrgSettings#getVAppTemplateLeaseSettings()
- */
- public B vAppTemplateLeaseSettings(OrgVAppTemplateLeaseSettings vAppTemplateLeaseSettings) {
- this.vAppTemplateLeaseSettings = vAppTemplateLeaseSettings;
- return self();
- }
-
- /**
- * @see OrgSettings#getLdapSettings()
- */
- public B ldapSettings(OrgLdapSettings ldapSettings) {
- this.ldapSettings = ldapSettings;
- return self();
- }
-
- /**
- * @see OrgSettings#getEmailSettings()
- */
- public B emailSettings(OrgEmailSettings emailSettings) {
- this.emailSettings = emailSettings;
- return self();
- }
-
- /**
- * @see OrgSettings#getPasswordPolicy()
- */
- public B passwordPolicy(OrgPasswordPolicySettings passwordPolicy) {
- this.passwordPolicy = passwordPolicy;
- return self();
- }
-
- @Override
- public OrgSettings build() {
- return new OrgSettings(this);
- }
-
- public B fromOrgSettings(OrgSettings in) {
- return fromResource(in)
- .generalSettings(in.getGeneralSettings())
- .vAppLeaseSettings(in.getVAppLeaseSettings())
- .vAppTemplateLeaseSettings(in.getVAppTemplateLeaseSettings())
- .ldapSettings(in.getLdapSettings())
- .emailSettings(in.getEmailSettings())
- .passwordPolicy(in.getPasswordPolicy());
- }
- }
-
- @SuppressWarnings("unused")
- private OrgSettings() {
- // For JAXB
- }
-
- public OrgSettings(Builder<?> builder) {
- super(builder);
- this.generalSettings = builder.generalSettings;
- this.vAppLeaseSettings = builder.vAppLeaseSettings;
- this.vAppTemplateLeaseSettings = builder.vAppTemplateLeaseSettings;
- this.ldapSettings = builder.ldapSettings;
- this.emailSettings = builder.emailSettings;
- this.passwordPolicy = builder.passwordPolicy;
- }
-
- @XmlElement(name = "OrgGeneralSettings")
- private OrgGeneralSettings generalSettings;
- @XmlElement(name = "VAppLeaseSettings")
- private OrgLeaseSettings vAppLeaseSettings;
- @XmlElement(name = "VAppTemplateLeaseSettings")
- private OrgVAppTemplateLeaseSettings vAppTemplateLeaseSettings;
- @XmlElement(name = "OrgLdapSettings")
- private OrgLdapSettings ldapSettings;
- @XmlElement(name = "OrgEmailSettings")
- private OrgEmailSettings emailSettings;
- @XmlElement(name = "OrgPasswordPolicySettings")
- private OrgPasswordPolicySettings passwordPolicy;
-
- /**
- * Gets the value of the orgGeneralSettings property.
- *
- * @return
- * possible object is
- * {@link OrgGeneralSettings }
- *
- */
- public OrgGeneralSettings getGeneralSettings() {
- return generalSettings;
- }
-
- /**
- * Gets the value of the vAppLeaseSettings property.
- *
- * @return
- * possible object is
- * {@link OrgLeaseSettings }
- *
- */
- public OrgLeaseSettings getVAppLeaseSettings() {
- return vAppLeaseSettings;
- }
-
- /**
- * Gets the value of the vAppTemplateLeaseSettings property.
- *
- * @return
- * possible object is
- * {@link OrgVAppTemplateLeaseSettings }
- *
- */
- public OrgVAppTemplateLeaseSettings getVAppTemplateLeaseSettings() {
- return vAppTemplateLeaseSettings;
- }
-
- /**
- * Gets the value of the orgLdapSettings property.
- *
- * @return
- * possible object is
- * {@link OrgLdapSettings }
- *
- */
- public OrgLdapSettings getLdapSettings() {
- return ldapSettings;
- }
-
- /**
- * Gets the value of the orgEmailSettings property.
- *
- * @return
- * possible object is
- * {@link OrgEmailSettings }
- *
- */
- public OrgEmailSettings getEmailSettings() {
- return emailSettings;
- }
-
- /**
- * Gets the value of the orgPasswordPolicySettings property.
- *
- * @return
- * possible object is
- * {@link OrgPasswordPolicySettings }
- *
- */
- public OrgPasswordPolicySettings getPasswordPolicy() {
- return passwordPolicy;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgSettings that = OrgSettings.class.cast(o);
- return super.equals(that) &&
- equal(generalSettings, that.generalSettings) &&
- equal(vAppLeaseSettings, that.vAppLeaseSettings) &&
- equal(vAppTemplateLeaseSettings, that.vAppTemplateLeaseSettings) &&
- equal(ldapSettings, that.ldapSettings) &&
- equal(emailSettings, that.emailSettings) &&
- equal(passwordPolicy, that.passwordPolicy);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- generalSettings,
- vAppLeaseSettings,
- vAppTemplateLeaseSettings,
- ldapSettings,
- emailSettings,
- passwordPolicy);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("generalSettings", generalSettings)
- .add("vAppLeaseSettings", vAppLeaseSettings)
- .add("vAppTemplateLeaseSettings", vAppTemplateLeaseSettings)
- .add("ldapSettings", ldapSettings)
- .add("emailSettings", emailSettings)
- .add("passwordPolicy", passwordPolicy);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
deleted file mode 100644
index b60b5f5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
+++ /dev/null
@@ -1,150 +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.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Expiration and storage policy for vApp templates in an organization.
- */
-@XmlRootElement(name = "OrgVAppTemplateLeaseSettings")
-@XmlType(propOrder = {
- "deleteOnStorageLeaseExpiration",
- "storageLeaseSeconds"
-})
-public class OrgVAppTemplateLeaseSettings extends Resource {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgVAppTemplateLeaseSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Boolean deleteOnStorageLeaseExpiration;
- private Integer storageLeaseSeconds;
-
- /**
- * @see OrgVAppTemplateLeaseSettings#getDeleteOnStorageLeaseExpiration()
- */
- public B deleteOnStorageLeaseExpiration(Boolean deleteOnStorageLeaseExpiration) {
- this.deleteOnStorageLeaseExpiration = deleteOnStorageLeaseExpiration;
- return self();
- }
-
- /**
- * @see OrgVAppTemplateLeaseSettings#getStorageLeaseSeconds()
- */
- public B storageLeaseSeconds(Integer storageLeaseSeconds) {
- this.storageLeaseSeconds = storageLeaseSeconds;
- return self();
- }
-
-
- @Override
- public OrgVAppTemplateLeaseSettings build() {
- return new OrgVAppTemplateLeaseSettings(this);
- }
-
- public B fromOrgVAppTemplateLeaseSettings(OrgVAppTemplateLeaseSettings in) {
- return fromResource(in)
- .deleteOnStorageLeaseExpiration(in.deleteOnStorageLeaseExpiration())
- .storageLeaseSeconds(in.getStorageLeaseSeconds());
- }
- }
-
- protected OrgVAppTemplateLeaseSettings() {
- // For JAXB and B use
- }
-
- protected OrgVAppTemplateLeaseSettings(Builder<?> builder) {
- super(builder);
- this.deleteOnStorageLeaseExpiration = builder.deleteOnStorageLeaseExpiration;
- this.storageLeaseSeconds = builder.storageLeaseSeconds;
- }
-
- @XmlElement(name = "DeleteOnStorageLeaseExpiration")
- private Boolean deleteOnStorageLeaseExpiration;
- @XmlElement(name = "StorageLeaseSeconds")
- private Integer storageLeaseSeconds;
-
- /**
- * Gets the value of the deleteOnStorageLeaseExpiration property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean deleteOnStorageLeaseExpiration() {
- return deleteOnStorageLeaseExpiration;
- }
-
- /**
- * Gets the value of the storageLeaseSeconds property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getStorageLeaseSeconds() {
- return storageLeaseSeconds;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgVAppTemplateLeaseSettings that = OrgVAppTemplateLeaseSettings.class.cast(o);
- return super.equals(that) &&
- equal(deleteOnStorageLeaseExpiration, that.deleteOnStorageLeaseExpiration) &&
- equal(storageLeaseSeconds, that.storageLeaseSeconds);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- deleteOnStorageLeaseExpiration,
- storageLeaseSeconds);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("deleteOnStorageLeaseExpiration", deleteOnStorageLeaseExpiration)
- .add("storageLeaseSeconds", storageLeaseSeconds);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/package-info.java
deleted file mode 100644
index 26953e0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.org;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/package-info.java
deleted file mode 100644
index e187429..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
deleted file mode 100644
index 603b5d4..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
+++ /dev/null
@@ -1,220 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.DeploymentOptionSection;
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents the parameters for capturing a vApp to a vApp template.
- */
-@XmlType(name = "CaptureVAppParams", propOrder = {
- "source",
- "sections"
-})
-@XmlRootElement(name = "CaptureVAppParams")
-public class CaptureVAppParams extends ParamsType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCaptureVAppParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ParamsType.Builder<B> {
-
- private Reference source;
- private Set<SectionType> sections = Sets.newLinkedHashSet();
-
- /**
- * @see CaptureVAppParams#getSource()
- */
- public B source(Reference source) {
- this.source = source;
- return self();
- }
-
- /**
- * Sets source to a new Reference that uses this URI as the href.
- *
- * @see CaptureVAppParams#getSource()
- */
- public B source(URI source) {
- this.source = Reference.builder().href(source).build();
- return self();
- }
-
- /**
- * @see CaptureVAppParams#getSections()
- */
- public B section(SectionType section) {
- this.sections.add(checkNotNull(section, "section"));
- return self();
- }
-
- /**
- * @see CaptureVAppParams#getSections()
- */
- public B sections(Iterable<? extends SectionType> sections) {
- this.sections = Sets.newLinkedHashSet(checkNotNull(sections, "sections"));
- return self();
- }
-
- @Override
- public CaptureVAppParams build() {
- return new CaptureVAppParams(this);
- }
-
- public B fromCaptureVAppParams(CaptureVAppParams in) {
- return fromParamsType(in)
- .source(in.getSource())
- .sections(in.getSections());
- }
- }
-
- private CaptureVAppParams(Builder<?> builder) {
- super(builder);
- this.source = builder.source;
- this.sections = builder.sections.isEmpty() ? null : ImmutableSet.copyOf(builder.sections);
- }
-
- private CaptureVAppParams() {
- // for JAXB
- }
-
- private CaptureVAppParams(Set<? extends SectionType> sections) {
- this.sections = ImmutableSet.copyOf(sections);
- }
-
- @XmlElement(name = "Source", required = true)
- protected Reference source;
- @XmlElementRefs({
- @XmlElementRef(type = VirtualHardwareSection.class),
- @XmlElementRef(type = LeaseSettingsSection.class),
-// @XmlElementRef(type = EulaSection.class),
- @XmlElementRef(type = RuntimeInfoSection.class),
-// @XmlElementRef(type = AnnotationSection.class),
- @XmlElementRef(type = DeploymentOptionSection.class),
- @XmlElementRef(type = StartupSection.class),
-// @XmlElementRef(type = ResourceAllocationSection.class),
- @XmlElementRef(type = NetworkConnectionSection.class),
- @XmlElementRef(type = CustomizationSection.class),
- @XmlElementRef(type = ProductSection.class),
- @XmlElementRef(type = GuestCustomizationSection.class),
- @XmlElementRef(type = OperatingSystemSection.class),
- @XmlElementRef(type = NetworkConfigSection.class),
- @XmlElementRef(type = NetworkSection.class),
-// @XmlElementRef(type = InstallSection.class),
- @XmlElementRef(type = DiskSection.class)
- })
- protected Set<SectionType> sections = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the source property.
- */
- public Reference getSource() {
- return source;
- }
-
- /**
- * An {@code ovf:Section} to configure the captured vAppTemplate.
- *
- * Objects of the following type(s) are allowed in the list:
- * <ul>
- * <li>{@link VirtualHardwareSectionType}
- * <li>{@link LeaseSettingsSectionType}
- * <li>{@link EulaSectionType}
- * <li>{@link RuntimeInfoSectionType}
- * <li>{@link AnnotationSectionType}
- * <li>{@link DeploymentOptionSectionType}
- * <li>{@link StartupSectionType}
- * <li>{@link ResourceAllocationSectionType}
- * <li>{@link NetworkConnectionSectionType}
- * <li>{@link CustomizationSectionType}
- * <li>{@link ProductSectionType}
- * <li>{@link GuestCustomizationSectionType}
- * <li>{@link OperatingSystemSectionType}
- * <li>{@link NetworkConfigSectionType}
- * <li>{@link NetworkSectionType}
- * <li>{@link DiskSectionType}
- * <li>{@link InstallSectionType}
- * </ul>
- */
- public Set<SectionType> getSections() {
- return sections != null ? ImmutableSet.copyOf(sections) : ImmutableSet.<SectionType>of();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CaptureVAppParams that = CaptureVAppParams.class.cast(o);
- return equal(source, that.source)
- && equal(sections, that.sections);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(source,
- sections);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("source", source)
- .add("sections", sections).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
deleted file mode 100644
index 1baa54a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
+++ /dev/null
@@ -1,145 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents parameters for copying a media resource and optionally
- * deleting the source.
- */
-@XmlRootElement(name = "CloneMediaParams")
-@XmlType(propOrder = {
- "source",
- "isSourceDelete"
-})
-public class CloneMediaParams extends ParamsType {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCloneMediaParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ParamsType.Builder<B> {
-
- private Reference source;
- private Boolean isSourceDelete;
-
- /**
- * @see CloneMediaParams#getSource()
- */
- public B source(Reference source) {
- this.source = source;
- return self();
- }
-
- /**
- * @see CloneMediaParams#isSourceDelete()
- */
- public B isSourceDelete(Boolean isSourceDelete) {
- this.isSourceDelete = isSourceDelete;
- return self();
- }
-
- @Override
- public CloneMediaParams build() {
- return new CloneMediaParams(this);
- }
-
- public B fromCloneMediaParams(CloneMediaParams in) {
- return fromParamsType(in)
- .source(in.getSource())
- .isSourceDelete(in.isSourceDelete());
- }
- }
-
- private CloneMediaParams(Builder<?> builder) {
- super(builder);
- this.source = builder.source;
- isSourceDelete = builder.isSourceDelete;
- }
-
- private CloneMediaParams() {
- // for JAXB
- }
-
-
- @XmlElement(name = "Source", required = true)
- protected Reference source;
- @XmlElement(name = "IsSourceDelete")
- protected Boolean isSourceDelete;
-
- /**
- * Gets the value of the source property.
- *
- * @return possible object is
- * {@link Reference }
- */
- public Reference getSource() {
- return source;
- }
-
- /**
- * Gets the value of the isSourceDelete property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isSourceDelete() {
- return isSourceDelete;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CloneMediaParams that = CloneMediaParams.class.cast(o);
- return equal(source, that.source) &&
- equal(isSourceDelete, that.isSourceDelete);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(source,
- isSourceDelete);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("source", source)
- .add("isSourceDelete", isSourceDelete).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java
deleted file mode 100644
index 4e8cf3e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java
+++ /dev/null
@@ -1,66 +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.vcloud.director.v1_5.domain.params;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Represents parameters for copying a vApp and optionally deleting the source.
- */
-@XmlType(name = "CloneVAppParams")
-@XmlRootElement(name = "CloneVAppParams")
-public class CloneVAppParams extends InstantiateVAppParams {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCloneVAppParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends InstantiateVAppParams.Builder<B> {
-
- @SuppressWarnings("unchecked")
- @Override
- protected B self() {
- return (B) this;
- }
-
- @Override
- public CloneVAppParams build() {
- return new CloneVAppParams(this);
- }
-
- public B fromCloneVAppParams(CloneVAppParams in) {
- return fromInstantiateVAppParamsType(in);
- }
- }
-
- protected CloneVAppParams() {
- // For JAXB and B use
- }
-
- public CloneVAppParams(Builder<?> builder) {
- super(builder);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
deleted file mode 100644
index 8912fb5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
+++ /dev/null
@@ -1,158 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import java.net.URI;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-
-/**
- * Represents parameters for copying a vApp template and optionally
- * deleting the source.
- */
-@XmlType(name = "CloneVAppTemplateParams", propOrder = {
- "source",
- "isSourceDelete"
-})
-@XmlRootElement(name = "CloneVAppTemplateParams")
-public class CloneVAppTemplateParams extends ParamsType {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromCloneVAppTemplateParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ParamsType.Builder<B> {
-
- private Reference source;
- private Boolean isSourceDelete;
-
- @SuppressWarnings("unchecked")
- @Override
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see CloneVAppTemplateParams#getSource()
- */
- public B source(Reference source) {
- this.source = source;
- return self();
- }
-
- /**
- * Sets source to a new Reference that uses this URI as the href.
- *
- * @see CloneVAppTemplateParams#getSource()
- */
- public B source(URI source) {
- this.source = Reference.builder().href(source).build();
- return self();
- }
-
- /**
- * @see CloneVAppTemplateParams#isSourceDelete()
- */
- public B isSourceDelete(Boolean isSourceDelete) {
- this.isSourceDelete = isSourceDelete;
- return self();
- }
-
- @Override
- public CloneVAppTemplateParams build() {
- return new CloneVAppTemplateParams(this);
- }
-
- public B fromCloneVAppTemplateParams(CloneVAppTemplateParams in) {
- return fromParamsType(in)
- .source(in.getSource())
- .isSourceDelete(in.isSourceDelete());
- }
- }
-
- protected CloneVAppTemplateParams(Builder<?> builder) {
- super(builder);
- this.source = builder.source;
- isSourceDelete = builder.isSourceDelete;
- }
-
- protected CloneVAppTemplateParams() {
- // for JAXB
- }
-
-
- @XmlElement(name = "Source", required = true)
- protected Reference source;
- @XmlElement(name = "IsSourceDelete")
- protected Boolean isSourceDelete;
-
- /**
- * Gets the value of the source property.
- */
- public Reference getSource() {
- return source;
- }
-
- /**
- * Gets the value of the isSourceDelete property.
- */
- public Boolean isSourceDelete() {
- return isSourceDelete;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CloneVAppTemplateParams that = CloneVAppTemplateParams.class.cast(o);
- return super.equals(that) &&
- equal(this.source, that.source) &&
- equal(this.isSourceDelete, that.isSourceDelete);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), source, isSourceDelete);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("source", source)
- .add("isSourceDelete", isSourceDelete);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
deleted file mode 100644
index f201974..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
+++ /dev/null
@@ -1,184 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-/**
- * 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 api
- * makes a compose vApp request whose body is a ComposeVAppParams element, includes the
- * following information:
- * <ul>
- * <li>An InstantiationParams element that applies to the composed vApp itself and any vApp templates referenced in
- * Item elements.
- * <li>A SourcedItem element for each virtual machine, vApp, or vAppTemplate to include in the composition. Each
- * SourcedItem can contain the following elements:
- * <ul>
- * <li>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.
- * <li>An optional NetworkAssignment element that specifies how the network connections of child VM elements are
- * mapped to vApp networks in the parent.
- * </ul>
- * </ul>
- * 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.
- */
-@XmlRootElement(name = "ComposeVAppParams")
-@XmlType(name = "ComposeVAppParamsType")
-public class ComposeVAppParams extends VAppCreationParams {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromComposeVAppParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends VAppCreationParams.Builder<B> {
-
- private List<SourcedCompositionItemParam> sourcedItems = Lists.newArrayList();
- private Boolean allEULAsAccepted;
- private Boolean linkedClone;
-
- /**
- * @see ComposeVAppParams#getSourcedItems()
- */
- public B sourcedItems(List<SourcedCompositionItemParam> sourcedItems) {
- this.sourcedItems = Lists.newArrayList(checkNotNull(sourcedItems, "sourcedItems"));
- return self();
- }
-
- /**
- * @see ComposeVAppParams#getSourcedItem()
- */
- public B sourcedItem(SourcedCompositionItemParam sourcedItem) {
- this.sourcedItems.add(checkNotNull(sourcedItem, "sourcedItem"));
- return self();
- }
-
- /**
- * @see ComposeVAppParams#isAllEULAsAccepted()
- */
- public B allEULAsAccepted(Boolean allEULAsAccepted) {
- this.allEULAsAccepted = allEULAsAccepted;
- return self();
- }
-
- /**
- * @see ComposeVAppParams#isLinkedClone()
- */
- public B linkedClone(Boolean linkedClone) {
- this.linkedClone = linkedClone;
- return self();
- }
-
- @Override
- public ComposeVAppParams build() {
- return new ComposeVAppParams(this);
- }
-
- public B fromComposeVAppParams(ComposeVAppParams in) {
- return fromVAppCreationParamsType(in).sourcedItems(in.getSourcedItems()).allEULAsAccepted(in.isAllEULAsAccepted()).linkedClone(in.isLinkedClone());
- }
- }
-
- public ComposeVAppParams(Builder<?> builder) {
- super(builder);
- this.sourcedItems = ImmutableList.copyOf(builder.sourcedItems);
- this.allEULAsAccepted = builder.allEULAsAccepted;
- this.linkedClone = builder.linkedClone;
- }
-
- protected ComposeVAppParams() {
- // for JAXB
- }
-
- @XmlElement(name = "SourcedItem")
- protected List<SourcedCompositionItemParam> sourcedItems = Lists.newArrayList();
- @XmlElement(name = "AllEULAsAccepted")
- protected Boolean allEULAsAccepted;
- @XmlAttribute
- protected Boolean linkedClone;
-
- /**
- * Gets the value of the sourcedItems property.
- */
- public List<SourcedCompositionItemParam> getSourcedItems() {
- return ImmutableList.copyOf(sourcedItems);
- }
-
- /**
- * Used to confirm acceptance of all EULAs in a vApp template.
- *
- * Instantiation fails if this element is missing, empty, or set to
- * false and one or more EulaSection elements are present.
- */
- public Boolean isAllEULAsAccepted() {
- return allEULAsAccepted;
- }
-
- /**
- * Gets the value of the linkedClone property.
- */
- public Boolean isLinkedClone() {
- return linkedClone;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ComposeVAppParams that = ComposeVAppParams.class.cast(o);
- return super.equals(that) &&
- equal(this.sourcedItems, that.sourcedItems) && equal(this.allEULAsAccepted, that.allEULAsAccepted) && equal(this.linkedClone, that.linkedClone);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), sourcedItems, allEULAsAccepted, linkedClone);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("sourcedItems", sourcedItems).add("allEULAsAccepted", allEULAsAccepted).add("linkedClone", linkedClone);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
deleted file mode 100644
index 7e109f1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
+++ /dev/null
@@ -1,183 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.AccessSetting;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "ControlAccessParams")
-@XmlType(name = "ControlAccessParamsType")
-public class ControlAccessParams {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromControlAccessParams(this);
- }
-
- public static class Builder {
-
- private Boolean sharedToEveryone = Boolean.FALSE;
- private String everyoneAccessLevel;
- private Set<AccessSetting> accessSettings;
-
- /**
- * @see ControlAccessParams#getIsSharedToEveryone()
- */
- public Builder isSharedToEveryone(Boolean sharedToEveryone) {
- this.sharedToEveryone = sharedToEveryone;
- return this;
- }
-
- /**
- * @see ControlAccessParams#getIsSharedToEveryone()
- */
- public Builder sharedToEveryone() {
- this.sharedToEveryone = Boolean.TRUE;
- return this;
- }
-
- /**
- * @see ControlAccessParams#getIsSharedToEveryone()
- */
- public Builder notSharedToEveryone() {
- this.sharedToEveryone = Boolean.FALSE;
- return this;
- }
-
- /**
- * @see ControlAccessParams#getEveryoneAccessLevel()
- */
- public Builder everyoneAccessLevel(String everyoneAccessLevel) {
- this.everyoneAccessLevel = everyoneAccessLevel;
- return this;
- }
-
- /**
- * @see ControlAccessParams#getAccessSettings()
- */
- public Builder accessSettings(Iterable<AccessSetting> accessSettings) {
- this.accessSettings = Sets.newLinkedHashSet(checkNotNull(accessSettings));
- return this;
- }
-
- /**
- * @see ControlAccessParams#getAccessSettings()
- */
- public Builder accessSetting(AccessSetting accessSetting) {
- if (accessSettings == null) {
- accessSettings = Sets.newLinkedHashSet();
- }
- accessSettings.add(checkNotNull(accessSetting, "accessSetting"));
- return this;
- }
-
- public ControlAccessParams build() {
- ControlAccessParams controlAccessParams = new ControlAccessParams(sharedToEveryone, everyoneAccessLevel, accessSettings);
- return controlAccessParams;
- }
-
- public Builder fromControlAccessParams(ControlAccessParams in) {
- return isSharedToEveryone(in.isSharedToEveryone()).everyoneAccessLevel(in.getEveryoneAccessLevel()).accessSettings(in.getAccessSettings());
- }
- }
-
- protected ControlAccessParams() {
- // For JAXB and builder use
- }
-
- public ControlAccessParams(Boolean sharedToEveryone, String everyoneAccessLevel, Iterable<AccessSetting> accessSettings) {
- this.sharedToEveryone = sharedToEveryone;
- if (sharedToEveryone) {
- this.everyoneAccessLevel = checkNotNull(everyoneAccessLevel, "everyoneAccessLevel");
- this.accessSettings = null;
- } else {
- this.everyoneAccessLevel = null;
- this.accessSettings = Iterables.isEmpty(checkNotNull(accessSettings, "accessSettings")) ? null : ImmutableList.copyOf(accessSettings);
- }
- }
-
- @XmlElement(name = "IsSharedToEveryone", required = true)
- protected Boolean sharedToEveryone;
- @XmlElement(name = "EveryoneAccessLevel")
- protected String everyoneAccessLevel;
- @XmlElementWrapper(name = "AccessSettings")
- @XmlElement(name = "AccessSetting")
- protected List<AccessSetting> accessSettings;
-
- /**
- * If true, this means that the resource is shared with everyone in the organization.
- *
- * Defaults to false. Sharing settings must be manipulated through the organization.
- */
- public Boolean isSharedToEveryone() {
- return sharedToEveryone;
- }
-
- /**
- * If {@link #isSharedToEveryone()} is true, this element must be present and determines the access level.
- */
- public String getEveryoneAccessLevel() {
- return everyoneAccessLevel;
- }
-
- /**
- * The access settings to be applied if {@link #isSharedToEveryone()} is false.
- *
- * Required on create and edit if {@link #isSharedToEveryone()} is false.
- */
- public List<AccessSetting> getAccessSettings() {
- return accessSettings == null ? ImmutableList.<AccessSetting>of() : accessSettings;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ControlAccessParams that = ControlAccessParams.class.cast(o);
- return equal(this.sharedToEveryone, that.sharedToEveryone) && equal(this.everyoneAccessLevel, that.everyoneAccessLevel) && equal(this.accessSettings, that.accessSettings);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(sharedToEveryone, everyoneAccessLevel, accessSettings);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("sharedToEveryone", sharedToEveryone).add("everyoneAccessLevel", everyoneAccessLevel).add("accessSettings", accessSettings).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
deleted file mode 100644
index b50c930..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
+++ /dev/null
@@ -1,180 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents vApp/VM deployment parameters.
- */
-@XmlRootElement(name = "DeployVAppParams")
-@XmlType(name = "DeployVAppParamsType")
-public class DeployVAppParams {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromDeployVAppParams(this);
- }
-
- public static class Builder {
-
- private Boolean powerOn = Boolean.TRUE;
- private Integer deploymentLeaseSeconds;
- private Boolean forceCustomization = Boolean.FALSE;
-
- /**
- * @see DeployVAppParams#isPowerOn()
- */
- public Builder powerOn(Boolean powerOn) {
- this.powerOn = powerOn;
- return this;
- }
-
- /**
- * @see DeployVAppParams#isPowerOn()
- */
- public Builder powerOn() {
- this.powerOn = Boolean.TRUE;
- return this;
- }
-
- /**
- * @see DeployVAppParams#isPowerOn()
- */
- public Builder notPowerOn() {
- this.powerOn = Boolean.FALSE;
- return this;
- }
-
- /**
- * @see DeployVAppParams#getDeploymentLeaseSeconds()
- */
- public Builder deploymentLeaseSeconds(Integer deploymentLeaseSeconds) {
- this.deploymentLeaseSeconds = deploymentLeaseSeconds;
- return this;
- }
-
- /**
- * @see DeployVAppParams#isForceCustomization()
- */
- public Builder forceCustomization(Boolean forceCustomization) {
- this.forceCustomization = forceCustomization;
- return this;
- }
-
- /**
- * @see DeployVAppParams#isForceCustomization()
- */
- public Builder forceCustomization() {
- this.forceCustomization = Boolean.TRUE;
- return this;
- }
-
- /**
- * @see DeployVAppParams#isForceCustomization()
- */
- public Builder notForceCustomization() {
- this.forceCustomization = Boolean.FALSE;
- return this;
- }
-
- public DeployVAppParams build() {
- DeployVAppParams deployVAppParams = new DeployVAppParams(powerOn, deploymentLeaseSeconds, forceCustomization);
- return deployVAppParams;
- }
-
- public Builder fromDeployVAppParams(DeployVAppParams in) {
- return powerOn(in.isPowerOn()).deploymentLeaseSeconds(in.getDeploymentLeaseSeconds()).forceCustomization(in.isForceCustomization());
- }
- }
-
- protected DeployVAppParams() {
- // For JAXB and builder use
- }
-
- public DeployVAppParams(Boolean powerOn, Integer deploymentLeaseSeconds, Boolean forceCustomization) {
- this.powerOn = powerOn;
- this.deploymentLeaseSeconds = deploymentLeaseSeconds;
- this.forceCustomization = forceCustomization;
- }
-
- @XmlAttribute
- protected Boolean powerOn;
- @XmlAttribute
- protected Integer deploymentLeaseSeconds;
- @XmlAttribute
- protected Boolean forceCustomization;
-
- /**
- * Used to specify whether to power on vapp on deployment, if not set default value is true.
- */
- public Boolean isPowerOn() {
- return powerOn;
- }
-
- public void setPowerOn(Boolean value) {
- this.powerOn = value;
- }
-
- /**
- * Lease in seconds for deployment.
- */
- public Integer getDeploymentLeaseSeconds() {
- return deploymentLeaseSeconds;
- }
-
- public void setDeploymentLeaseSeconds(Integer value) {
- this.deploymentLeaseSeconds = value;
- }
-
- /**
- * Used to specify whether to force customization on deployment, if not set default value is false.
- */
- public Boolean isForceCustomization() {
- return forceCustomization;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- DeployVAppParams that = DeployVAppParams.class.cast(o);
- return equal(powerOn, that.powerOn) && equal(deploymentLeaseSeconds, that.deploymentLeaseSeconds) && equal(forceCustomization, that.forceCustomization);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(powerOn, deploymentLeaseSeconds, forceCustomization);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("powerOn", powerOn).add("deploymentLeaseSeconds", deploymentLeaseSeconds).add("forceCustomization", forceCustomization).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
deleted file mode 100644
index b0b52d7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
+++ /dev/null
@@ -1,207 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import java.net.URI;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "InstantiateVAppParams")
-@XmlType(name = "InstantiateVAppParamsType")
-public class InstantiateVAppParams extends VAppCreationParams {
-
- public static final String MEDIA_TYPe = VCloudDirectorMediaType.INSTANTIATE_VAPP_TEMPLATE_PARAMS;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromInstantiateVAppParamsType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends VAppCreationParams.Builder<B> {
-
- private Reference source;
- private Boolean sourceDelete;
- private Boolean linkedClone;
-
- @SuppressWarnings("unchecked")
- @Override
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see InstantiateVAppParamsType#getSource()
- */
- public B source(Reference source) {
- this.source = source;
- return self();
- }
-
- /**
- * Sets source to a new Reference that uses this URI as the href.
- *
- * @see InstantiateVAppParamsType#getSource()
- */
- public B source(URI source) {
- this.source = Reference.builder().href(source).build();
- return self();
- }
-
- /**
- * @see InstantiateVAppParamsType#isSourceDelete()
- */
- public B isSourceDelete(Boolean sourceDelete) {
- this.sourceDelete = sourceDelete;
- return self();
- }
-
- /**
- * @see InstantiateVAppParamsType#isSourceDelete()
- */
- public B sourceDelete() {
- this.sourceDelete = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see InstantiateVAppParamsType#isSourceDelete()
- */
- public B notSourceDelete() {
- this.sourceDelete = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see InstantiateVAppParamsType#isLinkedClone()
- */
- public B isLinkedClone(Boolean linkedClone) {
- this.linkedClone = linkedClone;
- return self();
- }
-
- /**
- * @see InstantiateVAppParamsType#isLinkedClone()
- */
- public B linkedClone() {
- this.linkedClone = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see InstantiateVAppParamsType#isLinkedClone()
- */
- public B notLinkedClone() {
- this.linkedClone = Boolean.FALSE;
- return self();
- }
-
- @Override
- public InstantiateVAppParams build() {
- return new InstantiateVAppParams(this);
- }
-
- public B fromInstantiateVAppParamsType(InstantiateVAppParams in) {
- return fromVAppCreationParamsType(in)
- .source(in.getSource())
- .isSourceDelete(in.isSourceDelete())
- .isLinkedClone(in.isLinkedClone());
- }
- }
-
- protected InstantiateVAppParams() {
- // For JAXB and builder use
- }
-
- public InstantiateVAppParams(Builder<?> builder) {
- super(builder);
- this.source = builder.source;
- this.sourceDelete = builder.sourceDelete;
- this.linkedClone = builder.linkedClone;
- }
-
- @XmlElement(name = "Source", required = true)
- private Reference source;
- @XmlElement(name = "IsSourceDelete")
- private Boolean sourceDelete;
- @XmlAttribute
- private Boolean linkedClone;
-
- /**
- * Gets the value of the source property.
- */
- public Reference getSource() {
- return source;
- }
-
- /**
- * Gets the value of the isSourceDelete property.
- */
- public Boolean isSourceDelete() {
- return sourceDelete;
- }
-
- /**
- * Gets the value of the linkedClone property.
- */
- public Boolean isLinkedClone() {
- return linkedClone;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- InstantiateVAppParams that = InstantiateVAppParams.class.cast(o);
- return super.equals(that) &&
- equal(this.source, that.source) &&
- equal(this.sourceDelete, that.sourceDelete) &&
- equal(this.linkedClone, that.linkedClone);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), source, sourceDelete, linkedClone);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("source", source)
- .add("isSourceDelete", sourceDelete)
- .add("linkedClone", linkedClone);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
deleted file mode 100644
index b67a5f1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
+++ /dev/null
@@ -1,107 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "InstantiateVAppTemplateParams")
-public class InstantiateVAppTemplateParams extends InstantiateVAppParams {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromInstantiateVAppTemplateParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends InstantiateVAppParams.Builder<B> {
-
- private Boolean allEULAsAccepted;
-
- /**
- * @see InstantiateVAppTemplateParams#isAllEULAsAccepted()
- */
- public B allEULAsAccepted(Boolean allEULAsAccepted) {
- this.allEULAsAccepted = allEULAsAccepted;
- return self();
- }
-
- @Override
- public InstantiateVAppTemplateParams build() {
- return new InstantiateVAppTemplateParams(this);
- }
-
- public B fromInstantiateVAppTemplateParams(InstantiateVAppTemplateParams in) {
- return fromInstantiateVAppParamsType(in).allEULAsAccepted(in.isAllEULAsAccepted());
- }
- }
-
- protected InstantiateVAppTemplateParams(Builder<?> builder) {
- super(builder);
- this.allEULAsAccepted = builder.allEULAsAccepted;
- }
-
- protected InstantiateVAppTemplateParams() {
- // for JAXB
- }
-
-
- @XmlElement(name = "AllEULAsAccepted")
- protected Boolean allEULAsAccepted;
-
- /**
- * Used to confirm acceptance of all EULAs in a
- * vApp template. Instantiation fails if this
- * element is missing, empty, or set to false
- * and one or more EulaSection elements are
- * present.
- */
- public Boolean isAllEULAsAccepted() {
- return allEULAsAccepted;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- InstantiateVAppTemplateParams that = InstantiateVAppTemplateParams.class.cast(o);
- return super.equals(that) && equal(this.allEULAsAccepted, that.allEULAsAccepted);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), allEULAsAccepted);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("allEULAsAccepted", allEULAsAccepted);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
deleted file mode 100644
index 913cc9a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
+++ /dev/null
@@ -1,166 +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.vcloud.director.v1_5.domain.params;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.DeploymentOptionSection;
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "InstantiationParams")
-@XmlType(name = "InstantiationParamsType")
-public class InstantiationParams {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromInstantiationParams(this);
- }
-
- public static class Builder {
- private Set<SectionType> sections = Sets.newLinkedHashSet();
-
- /**
- * @see InstantiationParams#getSections()
- */
- public Builder sections(Iterable<? extends SectionType> sections) {
- this.sections = Sets.newLinkedHashSet(checkNotNull(sections, "sections"));
- return this;
- }
-
- /**
- * @see InstantiationParams#getSections()
- */
- public Builder section(SectionType section) {
- this.sections.add(checkNotNull(section, "section"));
- return this;
- }
-
- public InstantiationParams build() {
- InstantiationParams instantiationParams = new InstantiationParams(sections);
- return instantiationParams;
- }
-
- public Builder fromInstantiationParams(InstantiationParams in) {
- return sections(in.getSections());
- }
- }
-
- private InstantiationParams() {
- // for JAXB
- }
-
- private InstantiationParams(Set<? extends SectionType> sections) {
- this.sections = sections.isEmpty() ? null : ImmutableSet.copyOf(sections);
- }
-
- @XmlElementRefs({
- @XmlElementRef(type = VirtualHardwareSection.class),
- @XmlElementRef(type = LeaseSettingsSection.class),
-// @XmlElementRef(type = EulaSection.class),
- @XmlElementRef(type = RuntimeInfoSection.class),
-// @XmlElementRef(type = AnnotationSection.class),
- @XmlElementRef(type = DeploymentOptionSection.class),
- @XmlElementRef(type = StartupSection.class),
-// @XmlElementRef(type = ResourceAllocationSection.class),
- @XmlElementRef(type = NetworkConnectionSection.class),
- @XmlElementRef(type = CustomizationSection.class),
- @XmlElementRef(type = ProductSection.class),
- @XmlElementRef(type = GuestCustomizationSection.class),
- @XmlElementRef(type = OperatingSystemSection.class),
- @XmlElementRef(type = NetworkConfigSection.class),
- @XmlElementRef(type = NetworkSection.class),
-// @XmlElementRef(type = InstallSection.class),
- @XmlElementRef(type = DiskSection.class)
- })
- protected Set<SectionType> sections = Sets.newLinkedHashSet();
-
- /**
- * An {@code ovf:Section} to configure for instantiation.
- *
- * Objects of the following type(s) are allowed in the list:
- * <ul>
- * <li>{@link VirtualHardwareSection}
- * <li>{@link LeaseSettingsSection}
- * <li>{@link EulaSection}
- * <li>{@link RuntimeInfoSection}
- * <li>{@link AnnotationSection}
- * <li>{@link DeploymentOptionSection}
- * <li>{@link StartupSection}
- * <li>{@link ResourceAllocationSection}
- * <li>{@link NetworkConnectionSection}
- * <li>{@link CustomizationSection}
- * <li>{@link ProductSection}
- * <li>{@link GuestCustomizationSection}
- * <li>{@link OperatingSystemSection}
- * <li>{@link NetworkConfigSection}
- * <li>{@link NetworkSection}
- * <li>{@link DiskSection}
- * <li>{@link InstallSection}
- * </ul>
- */
- public Set<SectionType> getSections() {
- return sections != null ? ImmutableSet.copyOf(sections) : ImmutableSet.<SectionType>of();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- InstantiationParams that = InstantiationParams.class.cast(o);
- return equal(this.sections, that.sections);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(sections);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("sections", sections).toString();
- }
-
-}
[26/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
deleted file mode 100644
index 415e6df..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
+++ /dev/null
@@ -1,224 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Arrays;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * Base type that represents a resource entity such as a vApp template or virtual media.
- */
-@XmlType(name = "ResourceEntityType")
-public abstract class ResourceEntity extends Entity {
-
- @XmlType(name = "ResourceEntityTypeStatus")
- @XmlEnum(Integer.class)
- public static enum Status {
-
- @XmlEnumValue("-1") FAILED_CREATION(-1, "The object could not be created.", true, true, true),
- /** The unresolved status typically means a task is in process. */
- @XmlEnumValue("0") UNRESOLVED(0, "The object is unresolved or not ready.", true, true, true),
- @XmlEnumValue("1") RESOLVED(1, "The object is resolved.", true, true, true),
- @XmlEnumValue("2") DEPLOYED(2, "The object is deployed.", false, false, false),
- @XmlEnumValue("3") SUSPENDED(3, "The object is suspended.", false, true, true),
- @XmlEnumValue("4") POWERED_ON(4, "The object is powered on.", false, true, true),
- @XmlEnumValue("5") WAITING_FOR_INPUT(5, "The object is waiting for user input.", false, true, true),
- @XmlEnumValue("6") UNKNOWN(6, "The object is in an unknown state.", true, true, true),
- @XmlEnumValue("7") UNRECOGNIZED(7, "The object is in an unrecognized state.", true, true, true),
- @XmlEnumValue("8") POWERED_OFF(8, "The object is powered off.", true, true, true),
- @XmlEnumValue("9") INCONSISTENT_STATE(9, "The object is in an inconsistent state.", false, true, true),
- @XmlEnumValue("10") MIXED(10, "Children do not all have the same status.", true, true, false),
- @XmlEnumValue("11") UPLOAD_OVF_PENDING(11, "Upload initiated, OVF descriptor pending.", true, false, false),
- @XmlEnumValue("12") UPLOAD_COPYING(12, "Upload initiated, copying contents.", true, false, false),
- @XmlEnumValue("13") UPLOAD_DISK_PENDING(13, "Upload initiated , disk contents pending.", true, false, false),
- @XmlEnumValue("14") UPLOAD_QUARANTINED(14, "Upload has been quarantined.", true, false, false),
- @XmlEnumValue("15") UPLOAD_QUARANTINE_EXPIRED(15, "Upload quarantine period has expired.", true, false, false),
-
- // Convention is "UNRECOGNIZED", but that is already a valid state name! so using UNRECOGNIZED_VALUE
- @XmlEnumValue("65535") UNRECOGNIZED_VALUE(65535, "Unrecognized", false, false, false);
-
- private Integer value;
- private String description;
- private boolean vAppTemplate;
- private boolean vApp;
- private boolean vm;
-
- private Status(int value, String description, boolean vAppTemplate, boolean vApp, boolean vm) {
- this.value = value;
- this.description = description;
- this.vAppTemplate = vAppTemplate;
- this.vApp = vApp;
- this.vm = vm;
- }
-
- public Integer getValue() {
- return value;
- }
-
- public String getDescription() {
- return description;
- }
-
- public boolean isVAppTemplate() {
- return vAppTemplate;
- }
-
- public boolean isVApp() {
- return vApp;
- }
-
- public boolean isVm() {
- return vm;
- }
-
- public static Status fromValue(final int value) {
- Optional<Status> found = Iterables.tryFind(Arrays.asList(values()), new Predicate<Status>() {
- @Override
- public boolean apply(Status status) {
- return status.getValue() == value;
- }
- });
- if (found.isPresent()) {
- return found.get();
- } else {
- logger.warn("Illegal status value '%d'", value);
- return UNRECOGNIZED_VALUE;
- }
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromResourceEntityType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
- private Set<File> files;
- private Status status;
-
- /**
- * @see ResourceEntityType#getFiles()
- */
- public B files(Set<File> files) {
- this.files = files;
- return self();
- }
-
- /**
- * @see ResourceEntityType#getStatus()
- */
- public B status(Status status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see ResourceEntityType#getStatus()
- */
- public B status(Integer status) {
- this.status = Status.fromValue(status);
- return self();
- }
-
- public B fromResourceEntityType(ResourceEntity in) {
- return fromEntityType(in).files(in.getFiles()).status(in.getStatus());
- }
- }
-
- @XmlElementWrapper(name = "Files")
- @XmlElement(name = "File")
- private Set<File> files;
- @XmlAttribute
- private Status status;
-
- public ResourceEntity(Builder<?> builder) {
- super(builder);
- this.files = builder.files;
- this.status = builder.status;
- }
-
- protected ResourceEntity() {
- // for JAXB
- }
-
- /**
- * Gets the value of the files property.
- */
- public Set<File> getFiles() {
- return files;
- }
-
- /**
- * Gets the value of the status property.
- */
- public Status getStatus() {
- return status;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ResourceEntity that = ResourceEntity.class.cast(o);
- return super.equals(that) && equal(this.files, that.files) && equal(this.status, that.status);
- }
-
- @Override
- public boolean clone(Object o) {
- if (this == o)
- return false;
- if (o == null || getClass() != o.getClass())
- return false;
- ResourceEntity that = ResourceEntity.class.cast(o);
- return super.clone(that) && equal(this.files, that.files);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), files, status);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("files", files).add("status", status);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java
deleted file mode 100644
index 2dfd911..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Role.java
+++ /dev/null
@@ -1,69 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-public class Role { //TODO: placeholder for implementation
-
- @XmlType
- @XmlEnum(String.class)
- public static enum DefaultRoles {
- @XmlEnumValue("vApp User") USER("vApp User"),
- @XmlEnumValue("vApp Author") AUTHOR("vApp Author"),
- @XmlEnumValue("Catalog Author") CATALOG_AUTHOR("Catalog Author"),
- @XmlEnumValue("Console Access Only") CONSOLE("Console Access Only"),
- @XmlEnumValue("Organization Administrator") ORG_ADMIN("Organization Administrator");
-
- public static final List<DefaultRoles> ALL = ImmutableList.of(
- USER, AUTHOR, CATALOG_AUTHOR, CONSOLE, ORG_ADMIN);
-
- protected final String stringValue;
-
- DefaultRoles(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, DefaultRoles> DEFAULT_ROLES_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(DefaultRoles.values()), new Function<DefaultRoles, String>() {
- @Override
- public String apply(DefaultRoles input) {
- return input.stringValue;
- }
- });
-
- public static DefaultRoles fromValue(String value) {
- return DEFAULT_ROLES_BY_ID.get(checkNotNull(value, "stringValue"));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReference.java
deleted file mode 100644
index 74f3681..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReference.java
+++ /dev/null
@@ -1,73 +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.vcloud.director.v1_5.domain;
-
-import java.net.URI;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "RoleReference")
-public class RoleReference extends Reference {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromRoleReference(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Reference.Builder<B> {
-
- @Override
- public RoleReference build() {
- return new RoleReference(this);
- }
-
- protected B fromRoleReference(RoleReference in) {
- return fromReference(in);
- }
- }
-
- public RoleReference(Builder<?> builder) {
- super(builder);
- }
-
- public RoleReference(URI href, String name, String type) {
- super(href, name, type);
- }
-
- protected RoleReference() {
- // For JAXB
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RoleReference that = RoleReference.class.cast(o);
- return super.equals(that);
- }
-
- // NOTE hashcode inherited from Reference
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java
deleted file mode 100644
index 1522184..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultReferences;
-
-@XmlRootElement(name = "RoleReferences")
-public class RoleReferences extends QueryResultReferences {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromRoleReferences(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends QueryResultReferences.Builder<B> {
-
- @Override
- public RoleReferences build() {
- return new RoleReferences(this);
- }
-
- public B fromRoleReferences(RoleReferences in) {
- return fromQueryResultReferences(in);
- }
- }
-
- protected RoleReferences(Builder<?> builder) {
- super(builder);
- }
-
- protected RoleReferences() {
- // for JAXB
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RoleReferences that = RoleReferences.class.cast(o);
- return super.equals(that);
- }
-
- // NOTE hashcode inherited from QueryResultReferences
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
deleted file mode 100644
index e720894..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
+++ /dev/null
@@ -1,106 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-import com.google.common.base.Objects;
-
-/**
- * The ticket for accessing the console of a VM.
- *
- * <p /> A screen ticket is a string that includes the virtual machine's IP address, its managed object
- * reference, and a string that has been encoded as described in RFC 2396. Each VM element in a
- * vApp includes a link where rel="screen:acquireTicket". You can use that link to request a
- * screen ticket that you can use with the vmware-vmrc utility to open a VMware Remote Console
- * for the virtual machine represented by that VM element. The vApp should be running to get a
- * valid screen ticket.
- */
-@XmlRootElement(name = "ScreenTicket")
-@XmlType(name = "ScreenTicketType")
-public class ScreenTicket {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return builder().fromScreenTicket(this);
- }
-
- public static class Builder {
- private String value;
-
- /**
- * @see VmQuestionAnswer#getChoiceId()
- */
- public Builder value(String value) {
- this.value = value;
- return this;
- }
-
- public ScreenTicket build() {
- return new ScreenTicket(value);
- }
-
- public Builder fromScreenTicket(ScreenTicket in) {
- return value(in.getValue());
- }
- }
-
- protected ScreenTicket() {
- // For JAXB
- }
-
- public ScreenTicket(String value) {
- this.value = value;
- }
-
- @XmlValue
- private String value;
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ScreenTicket that = ScreenTicket.class.cast(o);
- return equal(this.value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(value);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("value", value).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
deleted file mode 100644
index dbc8d9d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
+++ /dev/null
@@ -1,174 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Returns a representation of the current session that can serve as a single entry point to the
- * system, as it provides user, admin, and extension (sysadmin) entry links depending on the
- * privileges of the current user.
- */
-@XmlRootElement(name = "Session")
-public class Session {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.SESSION;
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromSession(this);
- }
-
- public static class Builder {
- private String user;
- private String org;
- private URI href;
- private Set<Link> links = Sets.newLinkedHashSet();
-
- /**
- * @see Session#getUser()
- */
- public Builder user(String user) {
- this.user = user;
- return this;
- }
-
- /**
- * @see Session#get()
- */
- public Builder org(String org) {
- this.org = org;
- return this;
- }
-
- /**
- * @see Session#getHref()
- */
- public Builder href(URI href) {
- this.href = href;
- return this;
- }
-
- /**
- * @see Session#getLinks()
- */
- public Builder links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return this;
- }
-
- /**
- * @see Session#getLinks()
- */
- public Builder addLink(Link link) {
- links.add(checkNotNull(link, "link"));
- return this;
- }
-
- public Session build() {
- return new Session(user, org, href, links);
- }
-
- public Builder fromSession(Session in) {
- return user(in.getUser()).org(in.get()).href(in.getHref()).links(in.getLinks());
- }
- }
-
- private Session() {
- // for JAXB
- }
-
- private Session(String user, String org, URI href, Set<Link> links) {
- this.user = user;
- this.org = org;
- this.href = href;
- this.links = ImmutableSet.copyOf(links);
- }
-
- @XmlElement(name = "Link")
- private Set<Link> links = Sets.newLinkedHashSet();
- @XmlAttribute
- private String user;
- @XmlAttribute
- private String org;
- @XmlAttribute
- private URI href;
-
- public Set<Link> getLinks() {
- return Collections.unmodifiableSet(links);
- }
-
- /**
- * @return the user's login name.
- */
- public String getUser() {
- return user;
- }
-
- /**
- * @return is the name of an organization of which the user is a member
- */
- public String get() {
- return org;
- }
-
- /**
- * @return a reference to the current session
- */
- public URI getHref() {
- return href;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Session that = Session.class.cast(o);
- return equal(user, that.user) && equal(org, that.org) && equal(href, that.href) && equal(links, that.links);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(org, user, href, links);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("user", user).add("org", org).add("href", href).add("links", links)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
deleted file mode 100644
index 1276c71..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
+++ /dev/null
@@ -1,117 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import com.google.common.base.Objects;
-
-public class SessionWithToken {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromSessionWithToken(this);
- }
-
- public static class Builder {
-
- protected Session session;
- protected String token;
-
- /**
- * @see SessionWithToken#getSession()
- */
- public Builder session(Session session) {
- this.session = session;
- return this;
- }
-
- /**
- * @see SessionWithToken#getToken()
- */
- public Builder token(String token) {
- this.token = token;
- return this;
- }
-
- public SessionWithToken build() {
- return new SessionWithToken(token, session);
- }
-
- protected Builder fromSessionWithToken(SessionWithToken in) {
- return session(in.getSession()).token(in.getToken());
- }
-
- }
-
- private Session session;
- private String token;
-
- protected SessionWithToken(String token, Session session) {
- this.session = session;
- this.token = token;
- }
-
- protected SessionWithToken() {
- // For JAXB
- }
-
- /**
- * TODO
- */
- public Session getSession() {
- return session;
- }
-
- /**
- * An object reference, expressed in URL format. Because this URL includes the object identifier
- * portion of the id attribute value, it uniquely identifies the object, persists for the life of
- * the object, and is never reused. The value of the token attribute is a reference to a view of
- * the object, and can be used to access a representation of the object that is valid in a
- * particular context. Although URLs have a well-known syntax and a well-understood
- * interpretation, a api should treat each token as an opaque string. The rules that govern
- * how the server constructs token strings might change in future releases.
- *
- * @return an opaque reference and should never be parsed
- */
- public String getToken() {
- return token;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- SessionWithToken that = SessionWithToken.class.cast(o);
- return equal(token, that.token) && equal(session, that.session);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(session, token);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("session", session).add("token", token).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
deleted file mode 100644
index 61ae8ff..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
+++ /dev/null
@@ -1,412 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Represents an asynchronous or long-running task in the vCloud environment.
- *
- * <p/>When a return value, the operation is asynchronous and the user should
- * {@link org.jclouds.vcloud.director.v1_5.features.TaskApi#get monitor the returned task status}
- * in order to check when it is completed.
- */
-// TODO: this object and the hierarchy is wrong. it is literally a Task with a Task container. please review class diagram
-@XmlRootElement(name = "Task")
-public class Task extends Entity {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.TASK;
-
- @XmlType(name = "TaskStatus")
- @XmlEnum(String.class)
- public static enum Status {
- /** The task has been queued for execution. */
- @XmlEnumValue("queued") QUEUED("queued"),
- /** The task is awaiting preprocessing or, if it is a blocking task, administrative action. */
- @XmlEnumValue("preRunning") PRE_RUNNING("preRunning"),
- /** The task is running. */
- @XmlEnumValue("running") RUNNING("running"),
- /** The task completed with a status of success. */
- @XmlEnumValue("success") SUCCESS("success"),
- /** The task encountered an error while running. */
- @XmlEnumValue("error") ERROR("error"),
- /** The task was canceled by the owner or an administrator. */
- @XmlEnumValue("canceled") CANCELED("canceled"),
- /** The task was aborted by an administrative action. */
- @XmlEnumValue("aborted") ABORTED("aborted"),
- @XmlEnumValue("") UNRECOGNIZED("unrecognized");
-
- public static final List<Status> ALL = ImmutableList.of(QUEUED, PRE_RUNNING, RUNNING, SUCCESS, ERROR, CANCELED, ABORTED);
-
- protected final String stringValue;
-
- Status(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, Status> STATUS_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(Status.values()), new Function<Status, String>() {
- @Override
- public String apply(Status input) {
- return input.stringValue;
- }
- });
-
- public static Status fromValue(String value) {
- Status status = STATUS_BY_ID.get(checkNotNull(value, "stringValue"));
- return status == null ? UNRECOGNIZED : status;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromTask(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private Error error;
- private Reference org;
- private Reference owner;
- private Reference user;
- private Object params;
- private Integer progress;
- private Status status;
- private String operation;
- private String operationName;
- private Date startTime;
- private Date endTime;
- private Date expiryTime;
-
- /**
- * @see Task#getError()
- */
- public B error(Error error) {
- this.error = error;
- return self();
- }
-
- /**
- * @see Task#get()
- */
- public B org(Reference org) {
- this.org = org;
- return self();
- }
-
- /**
- * @see Task#getOwner()
- */
- public B owner(Reference owner) {
- this.owner = owner;
- return self();
- }
-
- /**
- * @see Task#getUser()
- */
- public B user(Reference user) {
- this.user = user;
- return self();
- }
-
- /**
- * @see Task#getParams()
- */
- public B params(Object params) {
- this.params = params;
- return self();
- }
-
- /**
- * @see Task#getProgress()
- */
- public B progress(Integer progress) {
- this.progress = progress;
- return self();
- }
-
- /**
- * @see Task#getStatus()
- */
- public B status(String status) {
- this.status = Status.fromValue(status);
- return self();
- }
-
- /**
- * @see Task#getStatus()
- */
- public B status(Status status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see Task#getOperation()
- */
- public B operation(String operation) {
- this.operation = operation;
- return self();
- }
-
- /**
- * @see Task#getOperationName()
- */
- public B operationName(String operationName) {
- this.operationName = operationName;
- return self();
- }
-
- /**
- * @see Task#getStartTime()
- */
- public B startTime(Date startTime) {
- this.startTime = startTime;
- return self();
- }
-
- /**
- * @see Task#getEndTime()
- */
- public B endTime(Date endTime) {
- this.endTime = endTime;
- return self();
- }
-
- /**
- * @see Task#getExpiryTime()
- */
- public B expiryTime(Date expiryTime) {
- this.expiryTime = expiryTime;
- return self();
- }
-
- @Override
- public Task build() {
- return new Task(this);
- }
-
- public B fromTask(Task in) {
- return fromEntityType(in)
- .error(in.getError())
- .org(in.get())
- .progress(in.getProgress())
- .owner(in.getOwner())
- .user(in.getUser())
- .params(in.getParams())
- .status(in.getStatus())
- .operation(in.getOperation())
- .operationName(in.getOperationName())
- .startTime(in.getStartTime())
- .endTime(in.getEndTime())
- .expiryTime(in.getExpiryTime());
- }
- }
-
- protected Task(Builder<?> builder) {
- super(builder);
- this.error = builder.error;
- this.org = builder.org;
- this.progress = builder.progress;
- this.owner = builder.owner;
- this.user = builder.user;
- this.params = builder.params;
- this.status = builder.status;
- this.operation = builder.operation;
- this.operationName = builder.operationName;
- this.startTime = builder.startTime;
- this.endTime = builder.endTime;
- this.expiryTime = builder.expiryTime;
- }
-
- protected Task() {
- // for JAXB
- }
-
- @XmlElement(name = "Error")
- private Error error;
- @XmlElement(name = "Organization")
- private Reference org;
- @XmlElement(name = "Progress")
- private Integer progress;
- @XmlElement(name = "Owner")
- private Reference owner;
- @XmlElement(name = "User")
- private Reference user;
- @XmlElement(name = "Params")
- private Object params;
- @XmlAttribute
- private Status status;
- @XmlAttribute
- private String operation;
- @XmlAttribute
- private String operationName;
- @XmlAttribute
- private Date startTime;
- @XmlAttribute
- private Date endTime;
- @XmlAttribute
- private Date expiryTime;
-
- /**
- * Represents an error information if the task failed.
- */
- public Error getError() {
- return error;
- }
-
- /**
- * The organization that started the task.
- */
- public Reference get() {
- return org;
- }
-
- /**
- * Reference to the owner of the task.
- */
- public Reference getOwner() {
- return owner;
- }
-
- /**
- * The user who started the task.
- */
- public Reference getUser() {
- return user;
- }
-
- /**
- * The parameters with which this task has been run.
- */
- public Object getParams() {
- return params;
- }
-
- /**
- * The progress of a long running asynchronous task.
- * <p/>
- * The value is between 0 - 100. Not all tasks have progress, the value is not
- * present for task which progress is not available.
- */
- public Integer getProgress() {
- return progress;
- }
-
- /**
- * The execution status of the task.
- */
- public Status getStatus() {
- return status;
- }
-
- /**
- * The display name of the operation that is tracked by this task.
- */
- public String getOperation() {
- return operation;
- }
-
- /**
- * The name of the operation that is tracked by this task.
- */
- public String getOperationName() {
- return operationName;
- }
-
- /**
- * The date and time the system started executing the task.
- * <p/>
- * May not be present if the task hasn't been executed yet.
- */
- public Date getStartTime() {
- return startTime;
- }
-
- /**
- * The date and time that processing of the task was completed.
- * <p/>
- * May not be present if the task is still being executed.
- */
- public Date getEndTime() {
- return endTime;
- }
-
- /**
- * The date and time at which the task resource will be destroyed and no longer available for retrieval.
- * <p/>
- * May not be present if the task has not been executed or is still being executed.
- */
- public Date getExpiryTime() {
- return expiryTime;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Task that = Task.class.cast(o);
- return super.equals(that) && equal(this.getHref(), that.getHref());
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), getHref());
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("error", error).add("org", org).add("progress", progress).add("status", status)
- .add("operation", operation).add("operationName", operationName).add("startTime", startTime)
- .add("endTime", endTime).add("expiryTime", expiryTime);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
deleted file mode 100644
index 034ba0d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
+++ /dev/null
@@ -1,207 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "TasksList")
-public class TasksList extends Resource implements Set<Task> {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromTasksList(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
- private String name;
- private Set<Task> tasks;
-
- /**
- * @see TasksList#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see TasksList#getTasks()
- */
- public B tasks(Set<Task> tasks) {
- if (checkNotNull(tasks, "tasks").size() > 0)
- this.tasks = Sets.newLinkedHashSet(tasks);
- return self();
- }
-
- /**
- * @see TasksList#getTasks()
- */
- public B task(Task task) {
- if (tasks == null)
- tasks = Sets.newLinkedHashSet();
- this.tasks.add(checkNotNull(task, "task"));
- return self();
- }
-
- @Override
- public TasksList build() {
- return new TasksList(this);
- }
-
- public B fromTasksList(TasksList in) {
- return fromResource(in).tasks(in);
- }
- }
-
- @XmlAttribute(required = true)
- private String name;
- @XmlElement(name = "Task")
- private Set<Task> tasks;
-
- public TasksList(Builder<?> builder) {
- super(builder);
- this.tasks = builder.tasks;
- this.name = builder.name;
- }
-
- protected TasksList() {
- // For JAXB
- }
-
-
- /**
- * Contains the name of the the entity.
- */
- public String getName() {
- return name;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- TasksList that = TasksList.class.cast(o);
- return super.equals(that) && equal(this.delegate(), that.delegate()) && equal(this.name, that.name);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), delegate(), name);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("tasks", delegate());
- }
-
- /*
- * Methods below are for implementing Set; annoying lack of multiple inheritance for using ForwardingSet!
- */
-
- private Set<Task> delegate() {
- return tasks == null ? ImmutableSet.<Task>of() : Collections.unmodifiableSet(tasks);
- }
-
- @Override
- public Iterator<Task> iterator() {
- return delegate().iterator();
- }
-
- @Override
- public int size() {
- return delegate().size();
- }
-
- @Override
- public boolean removeAll(Collection<?> collection) {
- return delegate().removeAll(collection);
- }
-
- @Override
- public boolean isEmpty() {
- return delegate().isEmpty();
- }
-
- @Override
- public boolean contains(Object object) {
- return delegate().contains(object);
- }
-
- @Override
- public boolean add(Task element) {
- return delegate().add(element);
- }
-
- @Override
- public boolean remove(Object object) {
- return delegate().remove(object);
- }
-
- @Override
- public boolean containsAll(Collection<?> collection) {
- return delegate().containsAll(collection);
- }
-
- @Override
- public boolean addAll(Collection<? extends Task> collection) {
- return delegate().addAll(collection);
- }
-
- @Override
- public boolean retainAll(Collection<?> collection) {
- return delegate().retainAll(collection);
- }
-
- @Override
- public void clear() {
- delegate().clear();
- }
-
- @Override
- public Object[] toArray() {
- return delegate().toArray();
- }
-
- @Override
- public <T> T[] toArray(T[] array) {
- return delegate().toArray(array);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
deleted file mode 100644
index 67f7084..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
+++ /dev/null
@@ -1,591 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "User")
-@XmlType(propOrder = {
- "fullName",
- "emailAddress",
- "telephone",
- "isEnabled",
- "isLocked",
- "im",
- "nameInSource",
- "isAlertEnabled",
- "alertEmailPrefix",
- "alertEmail",
- "isExternal",
- "isDefaultCached",
- "isGroupRole",
- "storedVmQuota",
- "deployedVmQuota",
- "role",
- "password",
- "groups"
-})
-public class User extends Entity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromUser(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private String fullName;
- private String emailAddress;
- private String telephone;
- private Boolean isEnabled;
- private Boolean isLocked;
- private String im;
- private String nameInSource;
- private Boolean isAlertEnabled;
- private String alertEmailPrefix;
- private String alertEmail;
- private Boolean isExternal;
- private Boolean isDefaultCached;
- private Boolean isGroupRole;
- private Integer storedVmQuota;
- private Integer deployedVmQuota;
- private Reference role;
- private String password;
- private List<Reference> groups = Lists.newArrayList();
-
- /**
- * @see EntityType#getName()
- */
- @Override
- public B name(String name) {
- return super.name(name.toLowerCase());
- }
-
- /**
- * @see User#getFullName()
- */
- public B fullName(String fullName) {
- this.fullName = fullName;
- return self();
- }
-
- /**
- * @see User#getEmailAddress()
- */
- public B emailAddress(String emailAddress) {
- this.emailAddress = emailAddress;
- return self();
- }
-
- /**
- * @see User#getTelephone()
- */
- public B telephone(String telephone) {
- this.telephone = telephone;
- return self();
- }
-
- /**
- * @see User#isEnabled()
- */
- public B isEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled;
- return self();
- }
-
- /**
- * @see User#isLocked()
- */
- public B isLocked(Boolean isLocked) {
- this.isLocked = isLocked;
- return self();
- }
-
- /**
- * @see User#getIM()
- */
- public B im(String im) {
- this.im = im;
- return self();
- }
-
- /**
- * @see User#getNameInSource()
- */
- public B nameInSource(String nameInSource) {
- this.nameInSource = nameInSource;
- return self();
- }
-
- /**
- * @see User#isAlertEnabled()
- */
- public B isAlertEnabled(Boolean isAlertEnabled) {
- this.isAlertEnabled = isAlertEnabled;
- return self();
- }
-
- /**
- * @see User#getAlertEmailPrefix()
- */
- public B alertEmailPrefix(String alertEmailPrefix) {
- this.alertEmailPrefix = alertEmailPrefix;
- return self();
- }
-
- /**
- * @see User#getAlertEmail()
- */
- public B alertEmail(String alertEmail) {
- this.alertEmail = alertEmail;
- return self();
- }
-
- /**
- * @see User#isExternal()
- */
- public B isExternal(Boolean isExternal) {
- this.isExternal = isExternal;
- return self();
- }
-
- /**
- * @see User#isDefaultCached()
- */
- public B isDefaultCached(Boolean isDefaultCached) {
- this.isDefaultCached = isDefaultCached;
- return self();
- }
-
- /**
- * @see User#isGroupRole()
- */
- public B isGroupRole(Boolean isGroupRole) {
- this.isGroupRole = isGroupRole;
- return self();
- }
-
- /**
- * @see User#getStoredVmQuota()
- */
- public B storedVmQuota(Integer storedVmQuota) {
- this.storedVmQuota = storedVmQuota;
- return self();
- }
-
- /**
- * @see User#getDeployedVmQuota()
- */
- public B deployedVmQuota(Integer deployedVmQuota) {
- this.deployedVmQuota = deployedVmQuota;
- return self();
- }
-
- /**
- * @see User#getRole()
- */
- public B role(Reference role) {
- this.role = role;
- return self();
- }
-
- /**
- * @see User#getPassword()
- */
- public B password(String password) {
- this.password = password;
- return self();
- }
-
- /**
- * @see User#getGroups()
- */
- public B groups(List<Reference> groups) {
- this.groups = groups == null ? null : ImmutableList.copyOf(groups);
- return self();
- }
-
- /**
- * @see User#getGroups()
- */
- public B group(Reference group) {
- this.groups.add(checkNotNull(group, "group"));
- return self();
- }
-
- @Override
- public User build() {
- return new User(this);
- }
-
- public B fromUser(User in) {
- return fromEntityType(in)
- .fullName(in.getFullName())
- .emailAddress(in.getEmailAddress())
- .telephone(in.getTelephone())
- .isEnabled(in.isEnabled())
- .isLocked(in.isLocked())
- .im(in.getIM())
- .nameInSource(in.getNameInSource())
- .isAlertEnabled(in.isAlertEnabled())
- .alertEmailPrefix(in.getAlertEmailPrefix())
- .alertEmail(in.getAlertEmail())
- .isExternal(in.isExternal())
- .isDefaultCached(in.isDefaultCached())
- .isGroupRole(in.isGroupRole())
- .storedVmQuota(in.getStoredVmQuota())
- .deployedVmQuota(in.getDeployedVmQuota())
- .role(in.getRole())
- .password(in.getPassword())
- .groups(in.getGroups());
- }
- }
-
- @XmlElement(name = "FullName")
- private String fullName;
- @XmlElement(name = "EmailAddress")
- private String emailAddress;
- @XmlElement(name = "Telephone")
- private String telephone;
- @XmlElement(name = "IsEnabled")
- private Boolean isEnabled;
- @XmlElement(name = "IsLocked")
- private Boolean isLocked;
- @XmlElement(name = "IM")
- private String im;
- @XmlElement(name = "NameInSource")
- private String nameInSource;
- @XmlElement(name = "IsAlertEnabled")
- private Boolean isAlertEnabled;
- @XmlElement(name = "AlertEmailPrefix")
- private String alertEmailPrefix;
- @XmlElement(name = "AlertEmail")
- private String alertEmail;
- @XmlElement(name = "IsExternal")
- private Boolean isExternal;
- @XmlElement(name = "IsDefaultCached")
- private Boolean isDefaultCached;
- @XmlElement(name = "IsGroupRole")
- private Boolean isGroupRole;
- @XmlElement(name = "StoredVmQuota")
- private Integer storedVmQuota;
- @XmlElement(name = "DeployedVmQuota")
- private Integer deployedVmQuota;
- @XmlElement(name = "Role")
- private Reference role;
- @XmlElement(name = "Password")
- private String password;
- @XmlElementWrapper(name = "GroupReferences")
- private List<Reference> groups;
-
- protected User(Builder<?> builder) {
- super(builder);
- this.fullName = builder.fullName;
- this.emailAddress = builder.emailAddress;
- this.telephone = builder.telephone;
- isEnabled = builder.isEnabled;
- isLocked = builder.isLocked;
- this.im = builder.im;
- this.nameInSource = builder.nameInSource;
- isAlertEnabled = builder.isAlertEnabled;
- this.alertEmailPrefix = builder.alertEmailPrefix;
- this.alertEmail = builder.alertEmail;
- isExternal = builder.isExternal;
- isDefaultCached = builder.isDefaultCached;
- isGroupRole = builder.isGroupRole;
- this.storedVmQuota = builder.storedVmQuota;
- this.deployedVmQuota = builder.deployedVmQuota;
- this.role = builder.role;
- this.password = builder.password;
- this.groups = builder.groups;
- }
-
- protected User() {
- // For JAXB
- }
-
- /**
- * Gets the value of the fullName property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getFullName() {
- return fullName;
- }
-
- /**
- * Gets the value of the emailAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getEmailAddress() {
- return emailAddress;
- }
-
- /**
- * Gets the value of the telephone property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getTelephone() {
- return telephone;
- }
-
- /**
- * Gets the value of the isEnabled property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Gets the value of the isLocked property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isLocked() {
- return isLocked;
- }
-
- /**
- * Gets the value of the im property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getIM() {
- return im;
- }
-
- /**
- * Gets the value of the nameInSource property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getNameInSource() {
- return nameInSource;
- }
-
- /**
- * Gets the value of the isAlertEnabled property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isAlertEnabled() {
- return isAlertEnabled;
- }
-
- /**
- * Gets the value of the alertEmailPrefix property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getAlertEmailPrefix() {
- return alertEmailPrefix;
- }
-
- /**
- * Gets the value of the alertEmail property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getAlertEmail() {
- return alertEmail;
- }
-
- /**
- * Gets the value of the isExternal property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isExternal() {
- return isExternal;
- }
-
- /**
- * Gets the value of the isDefaultCached property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isDefaultCached() {
- return isDefaultCached;
- }
-
- /**
- * Gets the value of the isGroupRole property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isGroupRole() {
- return isGroupRole;
- }
-
- /**
- * Gets the value of the storedVmQuota property.
- *
- * @return possible object is
- * {@link Integer }
- */
- public Integer getStoredVmQuota() {
- return storedVmQuota;
- }
-
- /**
- * Gets the value of the deployedVmQuota property.
- *
- * @return possible object is
- * {@link Integer }
- */
- public Integer getDeployedVmQuota() {
- return deployedVmQuota;
- }
-
- /**
- * Gets the value of the role property.
- *
- * @return possible object is
- * {@link Reference }
- */
- public Reference getRole() {
- return role;
- }
-
- /**
- * Gets the value of the password property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Gets the value of the groupReferences property.
- *
- * @return possible object is
- * {@link GroupsListType }
- */
- public List<Reference> getGroups() {
- return groups == null ? Lists.<Reference>newArrayList() : groups;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- User that = User.class.cast(o);
- return equal(fullName, that.fullName) &&
- equal(emailAddress, that.emailAddress) &&
- equal(telephone, that.telephone) &&
- equal(isEnabled, that.isEnabled) &&
- equal(isLocked, that.isLocked) &&
- equal(im, that.im) &&
- equal(nameInSource, that.nameInSource) &&
- equal(isAlertEnabled, that.isAlertEnabled) &&
- equal(alertEmailPrefix, that.alertEmailPrefix) &&
- equal(alertEmail, that.alertEmail) &&
- equal(isExternal, that.isExternal) &&
- equal(isDefaultCached, that.isDefaultCached) &&
- equal(isGroupRole, that.isGroupRole) &&
- equal(storedVmQuota, that.storedVmQuota) &&
- equal(deployedVmQuota, that.deployedVmQuota) &&
- equal(role, that.role) &&
- equal(password, that.password) &&
- equal(groups, that.groups);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(fullName,
- emailAddress,
- telephone,
- isEnabled,
- isLocked,
- im,
- nameInSource,
- isAlertEnabled,
- alertEmailPrefix,
- alertEmail,
- isExternal,
- isDefaultCached,
- isGroupRole,
- storedVmQuota,
- deployedVmQuota,
- role,
- password,
- groups);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("fullName", fullName)
- .add("emailAddress", emailAddress)
- .add("telephone", telephone)
- .add("isEnabled", isEnabled)
- .add("isLocked", isLocked)
- .add("im", im)
- .add("nameInSource", nameInSource)
- .add("isAlertEnabled", isAlertEnabled)
- .add("alertEmailPrefix", alertEmailPrefix)
- .add("alertEmail", alertEmail)
- .add("isExternal", isExternal)
- .add("isDefaultCached", isDefaultCached)
- .add("isGroupRole", isGroupRole)
- .add("storedVmQuota", storedVmQuota)
- .add("deployedVmQuota", deployedVmQuota)
- .add("role", role)
- .add("password", password)
- .add("groups", groups).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java
deleted file mode 100644
index 46ebdbd..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java
+++ /dev/null
@@ -1,239 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * A vApp can be in one of these states:
- * <ul>
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#FAILED_CREATION
- * FAILED_CREATION(-1)} - Transient entity state, e.g., model object is addd but the
- * corresponding VC backing does not exist yet. This is further sub-categorized in the respective
- * entities.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#UNRESOLVED
- * UNRESOLVED(0)} - Entity is whole, e.g., VM creation is complete and all the required model
- * objects and VC backings are created.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#RESOLVED
- * RESOLVED(1)} - Entity is resolved.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#DEPLOYED
- * DEPLOYED(2)} - Entity is deployed.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#SUSPENDED
- * SUSPENDED(3)} - All VMs of the vApp are suspended.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#POWERED_ON
- * POWERED_ON(4)} - All VMs of the vApp are powered on.
- * <li>
- * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#WAITING_FOR_INPUT
- * WAITING_FOR_INPUT(5)} - VM is pending response on a question.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#UNKNOWN
- * UNKNOWN(6)} - Entity state could not be retrieved from the inventory, e.g., VM power state is
- * null.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#UNRECOGNIZED
- * UNRECOGNIZED(7)} - Entity state was retrieved from the inventory but could not be mapped to an
- * internal state.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#POWERED_OFF
- * POWERED_OFF(8)} - All VMs of the vApp are powered off.
- * <li>
- * {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#INCONSISTENT_STATE
- * INCONSISTENT_STATE(9)} - Apply to VM status, if a vm is {@code POWERED_ON}, or
- * {@code WAITING_FOR_INPUT}, but is undeployed, it is in an inconsistent state.
- * <li>{@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status#MIXED MIXED(10)}
- * - vApp status is set to {@code MIXED} when the VMs in the vApp are in different power states
- * </ul>
- * <pre>
- * <complexType name="VApp" />
- * </pre>
- */
-@XmlRootElement(name = "VApp")
-@XmlType(name = "VAppType")
-public class VApp extends AbstractVApp {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVApp(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends AbstractVApp.Builder<B> {
-
- private Owner owner;
- private Boolean inMaintenanceMode;
- private VAppChildren children;
- private Boolean ovfDescriptorUploaded;
-
- /**
- * @see VApp#getOwner()
- */
- public B owner(Owner owner) {
- this.owner = owner;
- return self();
- }
-
- /**
- * @see VApp#isInMaintenanceMode()
- */
- public B isInMaintenanceMode(Boolean inMaintenanceMode) {
- this.inMaintenanceMode = inMaintenanceMode;
- return self();
- }
-
- /**
- * @see VApp#isInMaintenanceMode()
- */
- public B inMaintenanceMode() {
- this.inMaintenanceMode = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see VApp#isInMaintenanceMode()
- */
- public B notInMaintenanceMode() {
- this.inMaintenanceMode = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see VApp#getChildren()
- */
- public B children(VAppChildren children) {
- this.children = children;
- return self();
- }
-
- /**
- * @see VApp#isOvfDescriptorUploaded()
- */
- public B isOvfDescriptorUploaded(Boolean ovfDescriptorUploaded) {
- this.ovfDescriptorUploaded = ovfDescriptorUploaded;
- return self();
- }
-
- /**
- * @see VApp#isOvfDescriptorUploaded()
- */
- public B ovfDescriptorUploaded() {
- this.ovfDescriptorUploaded = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see VApp#isOvfDescriptorUploaded()
- */
- public B ovfDescriptorNotUploaded() {
- this.ovfDescriptorUploaded = Boolean.FALSE;
- return self();
- }
-
- @Override
- public VApp build() {
- return new VApp(this);
- }
-
- public B fromVApp(VApp in) {
- return fromAbstractVAppType(in)
- .owner(in.getOwner()).isInMaintenanceMode(in.isInMaintenanceMode())
- .children(in.getChildren()).isOvfDescriptorUploaded(in.isOvfDescriptorUploaded());
- }
- }
-
- protected VApp() {
- // For JAXB and builder use
- }
-
- protected VApp(Builder<?> builder) {
- super(builder);
- this.owner = builder.owner;
- this.inMaintenanceMode = builder.inMaintenanceMode;
- this.children = builder.children;
- this.ovfDescriptorUploaded = builder.ovfDescriptorUploaded;
- }
-
- @XmlElement(name = "Owner")
- private Owner owner;
- @XmlElement(name = "InMaintenanceMode")
- private Boolean inMaintenanceMode;
- @XmlElement(name = "Children")
- private VAppChildren children;
- @XmlAttribute
- private Boolean ovfDescriptorUploaded;
-
- /**
- * Gets the value of the owner property.
- */
- public Owner getOwner() {
- return owner;
- }
-
- /**
- * Gets the value of the inMaintenanceMode property.
- */
- public Boolean isInMaintenanceMode() {
- return inMaintenanceMode;
- }
-
- /**
- * Gets the value of the children property.
- */
- public VAppChildren getChildren() {
- return children;
- }
-
- /**
- * Gets the value of the ovfDescriptorUploaded property.
- */
- public Boolean isOvfDescriptorUploaded() {
- return ovfDescriptorUploaded;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VApp that = VApp.class.cast(o);
- return super.equals(that) &&
- equal(this.owner, that.owner) && equal(this.inMaintenanceMode, that.inMaintenanceMode) &&
- equal(this.children, that.children) && equal(this.ovfDescriptorUploaded, that.ovfDescriptorUploaded);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), owner, inMaintenanceMode, children, ovfDescriptorUploaded);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("owner", owner).add("inMaintenanceMode", inMaintenanceMode)
- .add("children", children).add("ovfDescriptorUploaded", ovfDescriptorUploaded);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java
deleted file mode 100644
index ec6f2a7..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java
+++ /dev/null
@@ -1,137 +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.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
-
-@XmlType(name = "VAppChildren")
-public class VAppChildren {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromVAppChildren(this);
- }
-
- public static class Builder {
-
- private List<VApp> vApps = Lists.newArrayList();
- private List<Vm> vms = Lists.newArrayList();
-
- /**
- * @see VAppChildren#getVApps()
- */
- public Builder vApps(List<VApp> vApps) {
- this.vApps = checkNotNull(vApps, "vApps");
- return this;
- }
-
- /**
- * @see VAppChildren#getVApps()
- */
- public Builder vApp(VApp vApp) {
- this.vApps.add(checkNotNull(vApp, "vApp"));
- return this;
- }
-
- /**
- * @see VAppChildren#getVms()
- */
- public Builder vms(List<Vm> vms) {
- this.vms = checkNotNull(vms, "vms");
- return this;
- }
-
- /**
- * @see VAppChildren#getVms()
- */
- public Builder vm(Vm vm) {
- this.vms.add(checkNotNull(vm, "vm"));
- return this;
- }
-
- public VAppChildren build() {
- VAppChildren vAppChildren = new VAppChildren(vApps, vms);
- return vAppChildren;
- }
-
- public Builder fromVAppChildren(VAppChildren in) {
- return vApps(in.getVApps()).vms(in.getVms());
- }
- }
-
- private VAppChildren() {
- // For JAXB and builder use
- }
-
- private VAppChildren(List<VApp> vApps, List<Vm> vms) {
- this.vApps = vApps;
- this.vms = vms;
- }
-
- @XmlElement(name = "VApp")
- protected List<VApp> vApps = Lists.newArrayList();
- @XmlElement(name = "Vm")
- protected List<Vm> vms = Lists.newArrayList();
-
- /**
- * Reserved.
- *
- * Unimplemented.
- */
- public List<VApp> getVApps() {
- return vApps;
- }
-
- /**
- * Child VMs.
- */
- public List<Vm> getVms() {
- return vms;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VAppChildren that = VAppChildren.class.cast(o);
- return equal(this.vApps, that.vApps) && equal(this.vms, that.vms);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(vApps, vms);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("vApps", vApps).add("vms", vms).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppReference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppReference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppReference.java
deleted file mode 100644
index 1e93d93..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppReference.java
+++ /dev/null
@@ -1,73 +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.vcloud.director.v1_5.domain;
-
-import java.net.URI;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "VAppReference")
-public class VAppReference extends Reference {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVAppReference(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends Reference.Builder<B> {
-
- @Override
- public VAppReference build() {
- return new VAppReference(this);
- }
-
- protected B fromVAppReference(VAppReference in) {
- return fromReference(in);
- }
- }
-
- public VAppReference(Builder<?> builder) {
- super(builder);
- }
-
- public VAppReference(URI href, String name, String type) {
- super(href, name, type);
- }
-
- protected VAppReference() {
- // For JAXB
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- VAppReference that = VAppReference.class.cast(o);
- return super.equals(that);
- }
-
- // NOTE hashcode inherited from Reference
-}
[17/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
deleted file mode 100644
index e50c6d3..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
+++ /dev/null
@@ -1,204 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_VMW_NS;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "OperatingSystemSection", namespace = OVF_NS)
-@XmlType(name = "OperatingSystemSection_Type")
-@XmlSeeAlso({ org.jclouds.dmtf.ovf.OperatingSystemSection.class })
-public class OperatingSystemSection extends org.jclouds.dmtf.ovf.OperatingSystemSection {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOperatingSystemSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends org.jclouds.dmtf.ovf.OperatingSystemSection.Builder<B> {
-
- private String osType;
- private URI href;
- private String type;
- private Set<Link> links;
-
- /**
- * @see OperatingSystemSection#getOsType()
- */
- public B osType(String osType) {
- this.osType = osType;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getLinks()
- */
- public B link(Link link) {
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public OperatingSystemSection build() {
- return new OperatingSystemSection(this);
- }
-
- public B fromOperatingSystemSection(OperatingSystemSection in) {
- return super.fromOperatingSystemSection(in)
- .osType(in.getOsType())
- .href(in.getHref())
- .type(in.getType())
- .links(in.getLinks());
- }
- }
-
- @XmlAttribute(namespace = VCLOUD_VMW_NS)
- protected String osType;
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- private URI href;
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- private String type;
- @XmlElement(name = "Link", namespace = VCLOUD_1_5_NS)
- private Set<Link> links = Sets.newLinkedHashSet();
-
- public OperatingSystemSection(Builder<?> builder) {
- super(builder);
- this.osType = builder.osType;
- this.href = builder.href;
- this.type = builder.type;
- this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
- }
-
- protected OperatingSystemSection() {
- // For Builders and JAXB
- }
-
- /**
- * Gets the osType
- */
- public String getOsType() {
- return osType;
- }
-
- /**
- * Contains the URI to the entity.
- *
- * @see ResourceType#getHref()
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Contains the type of the the entity.
- *
- * @see ResourceType#getType()
- */
- public String getType() {
- return type;
- }
-
- /**
- * Set of optional links to an entity or operation associated with this object.
- *
- * @see ResourceType#getLinks()
- */
- public Set<Link> getLinks() {
- return links != null ? ImmutableSet.copyOf(links) : Sets.<Link>newLinkedHashSet();
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), osType, href, type, links);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- OperatingSystemSection that = (OperatingSystemSection) obj;
- return super.equals(that)
- && equal(this.osType, that.osType)
- && equal(this.href, that.href)
- && equal(this.links, that.links)
- && equal(this.type, that.type);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("osType", osType)
- .add("type", type)
- .add("href", href)
- .add("links", links);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
deleted file mode 100644
index f0a2cce..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.VMWareTools;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "RuntimeInfoSection")
-@XmlType(name = "RuntimeInfoSectionType")
-public class RuntimeInfoSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromRuntimeInfoSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private VMWareTools vmWareTools;
- private List<Object> any = Lists.newArrayList();
-
- /**
- * @see RuntimeInfoSection#getVmWareTools()
- */
- public B vmWareTools(VMWareTools vmWareTools) {
- this.vmWareTools = vmWareTools;
- return self();
- }
-
- /**
- * @see RuntimeInfoSection#getAny()
- */
- public B any(List<Object> any) {
- this.any = any;
- return self();
- }
-
- @Override
- public RuntimeInfoSection build() {
- RuntimeInfoSection runtimeInfoSection = new RuntimeInfoSection(this);
- return runtimeInfoSection;
- }
-
- public B fromRuntimeInfoSection(RuntimeInfoSection in) {
- return fromSectionType(in)
- .vmWareTools(in.getVMWareTools())
- .any(in.getAny());
- }
- }
-
- protected RuntimeInfoSection() {
- // For JAXB and B use
- }
-
- protected RuntimeInfoSection(Builder<?> builder) {
- super(builder);
- this.vmWareTools = builder.vmWareTools;
- this.any = builder.any;
- }
-
-
- @XmlElement(name = "VMWareTools")
- private VMWareTools vmWareTools;
- @XmlAnyElement(lax = true)
- private List<Object> any = Lists.newArrayList();
-
- /**
- * Gets the value of the vmWareTools property.
- */
- public VMWareTools getVMWareTools() {
- return vmWareTools;
- }
-
- /**
- * Gets the value of the any property.
- */
- public List<Object> getAny() {
- return this.any;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RuntimeInfoSection that = RuntimeInfoSection.class.cast(o);
- return super.equals(that) &&
- equal(vmWareTools, that.vmWareTools) && equal(any, that.any);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), vmWareTools, any);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("vmWareTools", vmWareTools).add("any", any);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
deleted file mode 100644
index d6a0591..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
+++ /dev/null
@@ -1,187 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "VirtualHardwareSection", namespace = OVF_NS)
-@XmlType(name = "VirtualHardwareSection_Type")
-@XmlSeeAlso({ org.jclouds.dmtf.ovf.VirtualHardwareSection.class })
-public class VirtualHardwareSection extends org.jclouds.dmtf.ovf.VirtualHardwareSection {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVirtualHardwareSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends org.jclouds.dmtf.ovf.VirtualHardwareSection.Builder<B> {
-
- private URI href;
- private String type;
- private Set<Link> links = Sets.newLinkedHashSet();
-
- @Override
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see VirtualHardwareSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getLinks()
- */
- public B link(Link link) {
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- @Override
- public VirtualHardwareSection build() {
- return new VirtualHardwareSection(this);
- }
-
- public B fromVirtualHardwareSection(VirtualHardwareSection in) {
- return super.fromVirtualHardwareSection(in)
- .type(in.getType())
- .href(in.getHref())
- .links(in.getLinks());
- }
- }
-
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- protected String type;
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- @XmlSchemaType(name = "anyURI")
- protected URI href;
- @XmlElement(name = "Link", namespace = VCLOUD_1_5_NS)
- protected Set<Link> links = Sets.newLinkedHashSet();
-
-
- protected VirtualHardwareSection(Builder<?> builder) {
- super(builder);
- this.type = builder.type;
- this.href = builder.href;
- this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
- }
-
- protected VirtualHardwareSection() {
- // for JAXB
- }
-
- /**
- * Contains the URI to the entity.
- *
- * @see ResourceType#getHref()
- */
- public String getType() {
- return type;
- }
-
- /**
- * Contains the type of the the entity.
- *
- * @see ResourceType#getType()
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Set of optional links to an entity or operation associated with this object.
- *
- * @see ResourceType#getLinks()
- */
- public Set<Link> getLinks() {
- return links != null ? ImmutableSet.copyOf(links) : Sets.<Link>newLinkedHashSet();
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("type", type)
- .add("href", href)
- .add("links", links);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), type, href, links);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- VirtualHardwareSection that = VirtualHardwareSection.class.cast(obj);
- return super.equals(that)
- && equal(this.type, that.type)
- && equal(this.href, that.href)
- && equal(this.links, that.links);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java
deleted file mode 100644
index f084095..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java
+++ /dev/null
@@ -1,33 +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.
- */
-@XmlSchema(namespace = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.section;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java
deleted file mode 100644
index b37de68..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Catalog {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java
deleted file mode 100644
index e50150a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Network {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java
deleted file mode 100644
index b63207f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Org {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java
deleted file mode 100644
index 69b5067..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface OrgList {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java
deleted file mode 100644
index 87f8d2d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface TasksList {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java
deleted file mode 100644
index b23cc0e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface VCloudLogin {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java
deleted file mode 100644
index d1811ea..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Vdc {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java
deleted file mode 100644
index effe33e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java
+++ /dev/null
@@ -1,79 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CATALOG_ITEM;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Catalog;
-import org.jclouds.vcloud.director.v1_5.domain.CatalogItem;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface CatalogApi {
-
- /** Returns the catalog or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Catalog get(@EndpointParam URI catalogHref);
-
- @POST
- @Path("/catalogItems")
- @Consumes(CATALOG_ITEM)
- @Produces(CATALOG_ITEM)
- @JAXBResponseParser
- CatalogItem addItem(@EndpointParam URI catalogHref, @BinderParam(BindToXMLPayload.class) CatalogItem catalogItem);
-
- /** Returns the item or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- CatalogItem getItem(@EndpointParam URI catalogItemHref);
-
- @PUT
- @Consumes(CATALOG_ITEM)
- @Produces(CATALOG_ITEM)
- @JAXBResponseParser
- CatalogItem editItem(@EndpointParam URI catalogItemHref,
- @BinderParam(BindToXMLPayload.class) CatalogItem catalogItem);
-
- @DELETE
- @Consumes
- @JAXBResponseParser
- void removeItem(@EndpointParam URI catalogItemHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java
deleted file mode 100644
index 259a3a5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java
+++ /dev/null
@@ -1,94 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CLONE_MEDIA_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.MEDIA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface MediaApi {
-
- /** Returns the media or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Media get(@EndpointParam URI mediaHref);
-
- /**
- * Creates a media (and present upload link for the floppy/iso file).
- *
- * @return The response will return a link to transfer site to be able to continue with uploading
- * the media.
- */
- @POST
- @Consumes(MEDIA)
- @Produces(MEDIA)
- @JAXBResponseParser
- Media add(@EndpointParam URI updateHref, @BinderParam(BindToXMLPayload.class) Media media);
-
- @POST
- @Path("/action/cloneMedia")
- @Consumes(MEDIA)
- @Produces(CLONE_MEDIA_PARAMS)
- @JAXBResponseParser
- Media clone(@EndpointParam URI mediaHref, @BinderParam(BindToXMLPayload.class) CloneMediaParams params);
-
- /** Updates the name/description of a media. */
- @PUT
- @Consumes(TASK)
- @Produces(MEDIA)
- @JAXBResponseParser
- Task edit(@EndpointParam URI mediaHref, @BinderParam(BindToXMLPayload.class) Media media);
-
- @DELETE
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@EndpointParam URI mediaHref);
-
- @GET
- @Path("/owner")
- @Consumes
- @JAXBResponseParser
- Owner getOwner(@EndpointParam URI mediaHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java
deleted file mode 100644
index ca8ae2e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java
+++ /dev/null
@@ -1,90 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA_VALUE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.vcloud.director.v1_5.binders.BindMapAsMetadata;
-import org.jclouds.vcloud.director.v1_5.binders.BindStringAsMetadataValue;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-import org.jclouds.vcloud.director.v1_5.functions.RegexValueParser;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface MetadataApi {
-
- /** Returns the metadata or null if the associated resource was not found. */
- @GET
- @Path("/metadata")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Metadata get();
-
- /** Returns the metadata value or null if the {@code key} was not found. */
- @GET
- @Path("/metadata/{key}")
- @Consumes
- @ResponseParser(RegexValueParser.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- String get(@PathParam("key") String key);
-
- /** Merges the metadata for a media with the information provided. */
- @POST
- @Path("/metadata")
- @Consumes(TASK)
- @Produces(METADATA)
- @JAXBResponseParser
- Task putAll(@BinderParam(BindMapAsMetadata.class) Map<String, String> metadata);
-
- /** Replace the metadata value for the specified {@code key}. */
- @PUT
- @Path("/metadata/{key}")
- @Consumes(TASK)
- @Produces(METADATA_VALUE)
- @JAXBResponseParser
- Task put(@PathParam("key") String key, @BinderParam(BindStringAsMetadataValue.class) String metadataValue);
-
- @DELETE
- @Path("/metadata/{key}")
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@PathParam("key") String key);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java
deleted file mode 100644
index f8e9c1e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java
+++ /dev/null
@@ -1,44 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface NetworkApi {
-
- /** Returns the network or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Network get(@EndpointParam URI networkHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java
deleted file mode 100644
index e48e18b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java
+++ /dev/null
@@ -1,52 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgList;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface OrgApi {
-
- @GET
- @Path("/org/")
- @Consumes
- @JAXBResponseParser
- OrgList list();
-
- /** Returns the org or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Org get(@EndpointParam URI orgHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java
deleted file mode 100644
index c1a5582..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java
+++ /dev/null
@@ -1,156 +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.vcloud.director.v1_5.features;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface QueryApi {
-
- // TODO Add a typed object for filter syntax, or at least a fluent builder
-
- /**
- * Retrieves a list of entities.
- *
- * If filter is provided it will be applied to the corresponding result set.
- * Format determines the elements representation - references or records.
- * Default format is references.
- *
- * <pre>
- * GET /query
- * </pre>
- */
- @GET
- @Path("/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords queryAll(@QueryParam("type") String type);
-
- @GET
- @Path("/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords query(@QueryParam("type") String type, @QueryParam("filter") String filter);
-
- @GET
- @Path("/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords query(@QueryParam("page") Integer page, @QueryParam("pageSize") Integer pageSize,
- @QueryParam("format") String format, @QueryParam("type") String type, @QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link Catalog}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/catalogs/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords catalogsQueryAll();
-
- /**
- * Retrieves a list of {@link CatalogReference}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/catalogs/query")
- @Consumes
- @QueryParams(keys = { "format" }, values = { "references" })
- @JAXBResponseParser
- CatalogReferences catalogReferencesQueryAll();
-
- /**
- * Retrieves a list of {@link VAppTemplate}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/vAppTemplates/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppTemplatesQueryAll();
-
- @GET
- @Path("/vAppTemplates/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppTemplatesQuery(@QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link VApp}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/vApps/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppsQueryAll();
-
- @GET
- @Path("/vApps/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppsQuery(@QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link Vm}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/vms/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vmsQueryAll();
-
- @GET
- @Path("/vms/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vmsQuery(@QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link Media}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/mediaList/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords mediaListQueryAll();
-
- @GET
- @Path("/mediaList/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords mediaListQuery(@QueryParam("filter") String filter);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java
deleted file mode 100644
index efba9ce..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java
+++ /dev/null
@@ -1,67 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.TasksList;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface TaskApi {
-
- /**
- * Returns the task list or null if not found.
- *
- * @param tasksListHref
- * from {@link Org#getLinks()} where {@link Link#getType} is
- * {@link VCloudDirectorMediaType#TASKS_LIST}
- */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- TasksList getTasksList(@EndpointParam URI tasksListHref);
-
- /** Returns the task or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Task get(@EndpointParam URI taskURI);
-
- @POST
- @Path("/action/cancel")
- @Consumes
- @JAXBResponseParser
- void cancel(@EndpointParam URI taskURI);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java
deleted file mode 100644
index 6b576ad..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java
+++ /dev/null
@@ -1,32 +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.vcloud.director.v1_5.features;
-
-import java.net.URI;
-
-import javax.ws.rs.PUT;
-
-import org.jclouds.io.Payload;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface UploadApi {
-
- @PUT void upload(@EndpointParam URI location, Payload payload);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java
deleted file mode 100644
index 8d08640..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java
+++ /dev/null
@@ -1,339 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CONTROL_ACCESS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.DEPLOY_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.LEASE_SETTINGS_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_CONFIG_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OWNER;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.PRODUCT_SECTION_LIST;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.RECOMPOSE_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.STARTUP_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VAppApi {
-
- /** Returns the vApp or null if not found. */
- @GET
- @Consumes(VAPP)
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- VApp get(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#edit(URI, VApp)
- */
- @PUT
- @Produces(VAPP)
- @Consumes(TASK)
- @JAXBResponseParser
- Task edit(@EndpointParam URI vAppHref, @BinderParam(BindToXMLPayload.class) VApp vApp);
-
- /**
- * @see VAppApi#remove(URI)
- */
- @DELETE
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editControlAccess(URI, ControlAccessParams)
- */
- @POST
- @Path("/action/controlAccess")
- @Produces(CONTROL_ACCESS)
- @Consumes(CONTROL_ACCESS)
- @JAXBResponseParser
- ControlAccessParams editControlAccess(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) ControlAccessParams params);
-
- /**
- * @see VAppApi#deploy(URI, DeployVAppParams)
- */
- @POST
- @Path("/action/deploy")
- @Produces(DEPLOY_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task deploy(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) DeployVAppParams params);
-
- /**
- * @see VAppApi#discardSuspendedState(URI)
- */
- @POST
- @Path("/action/discardSuspendedState")
- @Consumes(TASK)
- @JAXBResponseParser
- Task discardSuspendedState(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#enterMaintenanceMode(URI)
- */
- @POST
- @Path("/action/enterMaintenanceMode")
- @Consumes
- @JAXBResponseParser
- void enterMaintenanceMode(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#exitMaintenanceMode(URI)
- */
- @POST
- @Path("/action/exitMaintenanceMode")
- @Consumes
- @JAXBResponseParser
- void exitMaintenanceMode(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#recompose(URI, RecomposeVAppParams)
- */
- @POST
- @Path("/action/recomposeVApp")
- @Produces(RECOMPOSE_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task recompose(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) RecomposeVAppParams params);
-
- /**
- * @see VAppApi#undeploy(URI, UndeployVAppParams)
- */
- @POST
- @Path("/action/undeploy")
- @Produces(UNDEPLOY_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task undeploy(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) UndeployVAppParams params);
-
- /**
- * @see VAppApi#getAccessControl(URI)
- */
- @GET
- @Path("/controlAccess")
- @Consumes(CONTROL_ACCESS)
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- ControlAccessParams getAccessControl(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#powerOff(URI)
- */
- @POST
- @Path("/power/action/powerOff")
- @Consumes(TASK)
- @JAXBResponseParser
- Task powerOff(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#powerOn(URI)
- */
- @POST
- @Path("/power/action/powerOn")
- @Consumes(TASK)
- @JAXBResponseParser
- Task powerOn(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#reboot(URI)
- */
- @POST
- @Path("/power/action/reboot")
- @Consumes(TASK)
- @JAXBResponseParser
- Task reboot(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#reset(URI)
- */
- @POST
- @Path("/power/action/reset")
- @Consumes(TASK)
- @JAXBResponseParser
- Task reset(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#shutdown(URI)
- */
- @POST
- @Path("/power/action/shutdown")
- @Consumes(TASK)
- @JAXBResponseParser
- Task shutdown(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#suspend(URI)
- */
- @POST
- @Path("/power/action/suspend")
- @Consumes(TASK)
- @JAXBResponseParser
- Task suspend(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#getLeaseSettingsSection(URI)
- */
- @GET
- @Path("/leaseSettingsSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- LeaseSettingsSection getLeaseSettingsSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editLeaseSettingsSection(URI, LeaseSettingsSection)
- */
- @PUT
- @Path("/leaseSettingsSection")
- @Produces(LEASE_SETTINGS_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editLeaseSettingsSection(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) LeaseSettingsSection section);
-
- /**
- * @see VAppApi#getNetworkConfigSection(URI)
- */
- @GET
- @Path("/networkConfigSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- NetworkConfigSection getNetworkConfigSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editNetworkConfigSection(URI, NetworkConfigSection)
- */
- @PUT
- @Path("/networkConfigSection")
- @Produces(NETWORK_CONFIG_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editNetworkConfigSection(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) NetworkConfigSection section);
-
- /**
- * @see VAppApi#getNetworkSection(URI)
- */
- @GET
- @Path("/networkSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- NetworkSection getNetworkSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#getOwner(URI)
- */
- @GET
- @Path("/owner")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- Owner getOwner(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editOwner(URI, Owner)
- */
- @PUT
- @Path("/owner")
- @Produces(OWNER)
- @Consumes(TASK)
- @JAXBResponseParser
- void editOwner(@EndpointParam URI vAppHref, @BinderParam(BindToXMLPayload.class) Owner owner);
-
- /**
- * @see VAppApi#getProductSections(URI)
- */
- @GET
- @Path("/productSections")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- ProductSectionList getProductSections(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editProductSections(URI, ProductSectionList)
- */
- @PUT
- @Path("/productSections")
- @Produces(PRODUCT_SECTION_LIST)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editProductSections(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) ProductSectionList sectionList);
-
- /**
- * @see VAppApi#getStartupSection(URI)
- */
- @GET
- @Path("/startupSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- StartupSection getStartupSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editStartupSection(URI, StartupSection)
- */
- @PUT
- @Path("/startupSection")
- @Produces(STARTUP_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editStartupSection(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) StartupSection section);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java
deleted file mode 100644
index d9240f0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java
+++ /dev/null
@@ -1,171 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CUSTOMIZATION_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.LEASE_SETTINGS_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_CONFIG_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OWNER;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.PRODUCT_SECTION_LIST;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP_TEMPLATE;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.References;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VAppTemplateApi {
-
- /** Returns the vApp template or null if not found. */
- @GET
- @Consumes(VAPP_TEMPLATE)
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- VAppTemplate get(@EndpointParam URI reference);
-
- /**
- * Modifies only the name/description of a vApp template.
- */
- @PUT
- @Produces(VAPP_TEMPLATE)
- @Consumes(TASK)
- @JAXBResponseParser
- Task edit(@EndpointParam URI templateHref,
- @BinderParam(BindToXMLPayload.class) VAppTemplate template);
-
- @DELETE
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@EndpointParam URI templateUri);
-
- /**
- * Disables the download link to the ovf of a vApp template.
- */
- @POST
- @Path("/action/disableDownload")
- @JAXBResponseParser
- void disableDownload(@EndpointParam URI templateHref);
-
- /**
- * Enables downloading of the ovf of a vApp template.
- */
- @POST
- @Consumes(TASK)
- @Path("/action/enableDownload")
- @JAXBResponseParser
- Task enableDownload(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(CUSTOMIZATION_SECTION)
- @Path("/customizationSection")
- @JAXBResponseParser
- CustomizationSection getCustomizationSection(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(LEASE_SETTINGS_SECTION)
- @Path("/leaseSettingsSection")
- @JAXBResponseParser
- LeaseSettingsSection getLeaseSettingsSection(@EndpointParam URI templateHref);
-
- @PUT
- @Produces(LEASE_SETTINGS_SECTION)
- @Consumes(TASK)
- @Path("/leaseSettingsSection")
- @JAXBResponseParser
- Task editLeaseSettingsSection(@EndpointParam URI templateHref,
- @BinderParam(BindToXMLPayload.class) LeaseSettingsSection settingsSection);
-
- @GET
- @Consumes(NETWORK_CONFIG_SECTION)
- @Path("/networkConfigSection")
- @JAXBResponseParser
- NetworkConfigSection getNetworkConfigSection(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(NETWORK_SECTION)
- @Path("/networkSection")
- @JAXBResponseParser
- NetworkSection getNetworkSection(@EndpointParam URI templateHref);
-
- /**
- * Retrieves an OVF descriptor of a vApp template.
- *
- * <p/> This OVF represents the vApp template as it is, with all vCloud specific information (like mac
- * address, parent networks, etc). The OVF which could be downloaded by enabling for download
- * will not contain this information. There are no specific states bound to this entity.
- */
- @GET
- @Consumes
- @Path("/ovf")
- @JAXBResponseParser
- Envelope getOvf(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(OWNER)
- @Path("/owner")
- @JAXBResponseParser
- Owner getOwner(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(PRODUCT_SECTION_LIST)
- @Path("/productSections")
- @JAXBResponseParser
- ProductSectionList getProductSections(@EndpointParam URI templateHref);
-
- @PUT
- @Produces(PRODUCT_SECTION_LIST)
- @Consumes(TASK)
- @Path("/productSections")
- @JAXBResponseParser
- Task editProductSections(@EndpointParam URI templateHref,
- @BinderParam(BindToXMLPayload.class) ProductSectionList sections);
-
- @GET
- @Consumes
- @Path("/shadowVms")
- @JAXBResponseParser
- References getShadowVms(@EndpointParam URI templateHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java
deleted file mode 100644
index 64eef1c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CLONE_MEDIA_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CLONE_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.INSTANTIATE_VAPP_TEMPLATE_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.MEDIA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.UPLOAD_VAPP_TEMPLATE_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP_TEMPLATE;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VdcApi {
-
- /** Returns the virtual datacenter or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Vdc get(@EndpointParam URI vdcHref);
-
- /** Captures a vApp into vApp template. */
- @POST
- @Path("/action/captureVApp")
- @Consumes(VAPP_TEMPLATE)
- @Produces(CAPTURE_VAPP_PARAMS)
- @JAXBResponseParser
- VAppTemplate captureVApp(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) CaptureVAppParams params);
-
- /** Clones a media into new one. */
- @POST
- @Path("/action/cloneMedia")
- @Consumes(MEDIA)
- @Produces(CLONE_MEDIA_PARAMS)
- @JAXBResponseParser
- Media cloneMedia(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) CloneMediaParams params);
-
- /** Clones a vApp into new one. */
- @POST
- @Path("/action/cloneVApp")
- @Consumes(VAPP)
- @Produces(CLONE_VAPP_PARAMS)
- // TODO fix these etc.
- @JAXBResponseParser
- VApp cloneVApp(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) CloneVAppParams params);
-
- /** Clones a vApp template into new one. */
- @POST
- @Path("/action/cloneVAppTemplate")
- @Consumes(VAPP_TEMPLATE)
- @Produces(VCloudDirectorMediaType.CLONE_VAPP_TEMPLATE_PARAMS)
- @JAXBResponseParser
- VAppTemplate cloneVAppTemplate(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) CloneVAppTemplateParams params);
-
- /**
- * Composes a new vApp using VMs from other vApps or vApp templates.
- *
- * <p /> The composed vApp must be deployed and powered on before it can be used.
- */
- @POST
- @Path("/action/composeVApp")
- @Consumes(VAPP)
- @Produces(VCloudDirectorMediaType.COMPOSE_VAPP_PARAMS)
- @JAXBResponseParser
- VApp composeVApp(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) ComposeVAppParams params);
-
- /** Instantiate a vApp template into a new vApp. */
- @POST
- @Path("/action/instantiateVAppTemplate")
- @Consumes(VAPP)
- @Produces(INSTANTIATE_VAPP_TEMPLATE_PARAMS)
- @JAXBResponseParser
- VApp instantiateVApp(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) InstantiateVAppParams params);
-
- /**
- * Uploading vApp template to a vDC.
- *
- * The operation is separate on several steps:
- * <ol>
- * <li>creating empty vApp template entity
- * <li>uploading an OVF of vApp template
- * <li>uploading disks described from the OVF
- * <li>finishing task for uploading
- * </ol>
- */
- @POST
- @Path("/action/uploadVAppTemplate")
- @Consumes(VAPP_TEMPLATE)
- @Produces(UPLOAD_VAPP_TEMPLATE_PARAMS)
- @JAXBResponseParser
- VAppTemplate uploadVAppTemplate(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) UploadVAppTemplateParams params);
-
- /**
- * Creates a media (and present upload link for the floppy/iso file).
- *
- * @return The response will return a link to transfer site to be able to continue with uploading the media.
- */
- @POST
- @Path("/media")
- @Consumes(MEDIA)
- @Produces(MEDIA)
- @JAXBResponseParser
- Media addMedia(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) Media media);
-}