merging master branch to 4.0.0-grouping - 6th Sept
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/397d9926 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/397d9926 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/397d9926 Branch: refs/heads/4.0.0-grouping Commit: 397d99264525e6f91bca4b6e4bad449dba6e058a Parents: feeca27 Author: Isuru Haththotuwa <[email protected]> Authored: Sat Sep 6 21:23:43 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Sat Sep 6 21:23:43 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.cloud.controller/pom.xml | 340 ++++--- .../controller/iaases/OpenstackNovaIaas.java | 66 +- .../console/cartridge_info.jag | 18 +- .../console/cartridge_info_sg.jag | 29 +- .../console/cartridges.jag | 5 + .../console/configure_stratos.jag | 33 +- .../console/configure_stratos_wizard.jag | 38 +- .../console/index.jag | 6 +- .../console/subscribe_cartridge.jag | 24 +- .../console/tenant_management.jag | 5 + .../theme1/renderers/configure_stratos.js | 6 +- .../renderers/configure_stratos_wizard.js | 8 +- .../console/themes/theme1/renderers/index.js | 3 + .../theme1/renderers/subscribe_cartridge.js | 18 +- .../theme1/renderers/tenant_management.js | 6 +- .../console/util/utility.jag | 140 +-- .../rest/endpoint/services/StratosAdmin.java | 3 +- .../stratos-test/WEB-INF/schemas/schema.xsd | 9 +- .../webapp/stratos/WEB-INF/schemas/schema.xsd | 9 +- .../jclouds/apis/docker/1.7.1-stratos/README.md | 52 - .../jclouds/apis/docker/1.7.1-stratos/pom.xml | 145 --- .../main/java/org/jclouds/docker/DockerApi.java | 38 - .../org/jclouds/docker/DockerApiMetadata.java | 100 -- .../binders/BindInputStreamToRequest.java | 74 -- .../DockerComputeServiceContextModule.java | 73 -- .../extensions/DockerImageExtension.java | 120 --- .../docker/compute/features/RemoteApi.java | 275 ------ .../compute/features/internal/Archives.java | 96 -- .../functions/ContainerToNodeMetadata.java | 131 --- .../docker/compute/functions/ImageToImage.java | 104 -- .../docker/compute/functions/StateToStatus.java | 40 - .../compute/options/DockerTemplateOptions.java | 365 ------- .../strategy/DockerComputeServiceAdapter.java | 223 ----- .../docker/config/DockerHttpApiModule.java | 42 - .../docker/config/DockerParserModule.java | 101 -- .../jclouds/docker/config/DockerProperties.java | 29 - .../java/org/jclouds/docker/domain/Config.java | 460 --------- .../org/jclouds/docker/domain/Container.java | 372 ------- .../org/jclouds/docker/domain/ExposedPorts.java | 105 -- .../org/jclouds/docker/domain/HostConfig.java | 180 ---- .../java/org/jclouds/docker/domain/Image.java | 240 ----- .../jclouds/docker/domain/NetworkSettings.java | 176 ---- .../java/org/jclouds/docker/domain/Port.java | 91 -- .../java/org/jclouds/docker/domain/State.java | 169 ---- .../java/org/jclouds/docker/domain/Version.java | 169 ---- .../docker/handlers/DockerErrorHandler.java | 108 -- .../jclouds/docker/options/BuildOptions.java | 73 -- .../jclouds/docker/options/CommitOptions.java | 111 --- .../docker/options/CreateImageOptions.java | 129 --- .../docker/options/DeleteImageOptions.java | 46 - .../docker/options/ListContainerOptions.java | 97 -- .../docker/options/ListImageOptions.java | 43 - .../docker/options/RemoveContainerOptions.java | 57 -- .../services/org.jclouds.apis.ApiMetadata | 1 - .../src/main/resources/centos/Dockerfile | 29 - .../src/main/resources/ubuntu/Dockerfile | 30 - .../jclouds/docker/DockerApiMetadataTest.java | 49 - .../docker/compute/BaseDockerApiLiveTest.java | 96 -- .../DockerComputeServiceAdapterLiveTest.java | 138 --- .../compute/DockerExperimentLiveTest.java | 144 --- .../compute/features/RemoteApiLiveTest.java | 136 --- .../compute/features/RemoteApiMockTest.java | 358 ------- .../functions/ContainerToNodeMetadataTest.java | 162 --- .../compute/functions/ImageToImageTest.java | 75 -- .../compute/functions/StateToStatusTest.java | 83 -- .../docker/config/DockerParserModuleTest.java | 102 -- .../docker/internal/BaseDockerMockTest.java | 119 --- .../1.7.1-stratos/src/test/resources/Dockerfile | 29 - .../src/test/resources/container-creation.json | 1 - .../src/test/resources/container.json | 87 -- .../src/test/resources/containers.json | 20 - .../src/test/resources/logback.xml | 34 - .../jclouds/apis/docker/1.8.0-stratos/README.md | 52 + .../jclouds/apis/docker/1.8.0-stratos/pom.xml | 145 +++ .../main/java/org/jclouds/docker/DockerApi.java | 37 + .../org/jclouds/docker/DockerApiMetadata.java | 98 ++ .../binders/BindInputStreamToRequest.java | 68 ++ .../DockerComputeServiceContextModule.java | 59 ++ .../functions/ContainerToNodeMetadata.java | 126 +++ .../docker/compute/functions/ImageToImage.java | 98 ++ .../docker/compute/functions/StateToStatus.java | 38 + .../compute/options/DockerTemplateOptions.java | 485 +++++++++ .../strategy/DockerComputeServiceAdapter.java | 232 +++++ .../docker/config/DockerHttpApiModule.java | 40 + .../docker/config/DockerParserModule.java | 62 ++ .../jclouds/docker/config/DockerProperties.java | 26 + .../java/org/jclouds/docker/domain/Config.java | 457 +++++++++ .../org/jclouds/docker/domain/Container.java | 389 ++++++++ .../org/jclouds/docker/domain/ExposedPorts.java | 106 ++ .../org/jclouds/docker/domain/HostConfig.java | 242 +++++ .../java/org/jclouds/docker/domain/Image.java | 239 +++++ .../jclouds/docker/domain/NetworkSettings.java | 175 ++++ .../java/org/jclouds/docker/domain/Port.java | 88 ++ .../java/org/jclouds/docker/domain/State.java | 166 ++++ .../java/org/jclouds/docker/domain/Version.java | 166 ++++ .../org/jclouds/docker/features/RemoteApi.java | 272 +++++ .../docker/features/internal/Archives.java | 60 ++ .../docker/handlers/DockerErrorHandler.java | 102 ++ .../jclouds/docker/options/BuildOptions.java | 71 ++ .../jclouds/docker/options/CommitOptions.java | 109 ++ .../docker/options/CreateImageOptions.java | 95 ++ .../docker/options/DeleteImageOptions.java | 44 + .../docker/options/ListContainerOptions.java | 97 ++ .../docker/options/ListImageOptions.java | 43 + .../docker/options/RemoveContainerOptions.java | 55 ++ .../services/org.jclouds.apis.ApiMetadata | 1 + .../jclouds/docker/DockerApiMetadataTest.java | 47 + .../binders/BindInputStreamToRequestTest.java | 66 ++ .../docker/compute/BaseDockerApiLiveTest.java | 91 ++ .../DockerComputeServiceAdapterLiveTest.java | 95 ++ .../compute/DockerComputeServiceLiveTest.java | 142 +++ .../functions/ContainerToNodeMetadataTest.java | 203 ++++ .../compute/functions/ImageToImageTest.java | 73 ++ .../compute/functions/StateToStatusTest.java | 81 ++ .../options/DockerTemplateOptionsTest.java | 62 ++ .../docker/config/DockerParserModuleTest.java | 52 + .../docker/features/RemoteApiLiveTest.java | 121 +++ .../docker/features/RemoteApiMockTest.java | 376 +++++++ .../docker/features/internal/ArchivesTest.java | 112 +++ .../docker/internal/BaseDockerMockTest.java | 118 +++ .../1.8.0-stratos/src/test/resources/Dockerfile | 29 + .../src/test/resources/container-creation.json | 1 + .../src/test/resources/container.json | 81 ++ .../src/test/resources/containers.json | 20 + .../src/test/resources/logback.xml | 34 + .../jclouds/apis/ec2/1.7.1-stratos/README.txt | 15 - .../jclouds/apis/ec2/1.7.1-stratos/pom.xml | 144 --- .../src/main/clojure/org/jclouds/ec2/ami2.clj | 84 -- .../src/main/clojure/org/jclouds/ec2/ebs2.clj | 286 ------ .../clojure/org/jclouds/ec2/elastic_ip2.clj | 80 -- .../clojure/org/jclouds/ec2/security_group2.clj | 99 -- .../src/main/java/org/jclouds/ec2/EC2Api.java | 167 ---- .../java/org/jclouds/ec2/EC2ApiMetadata.java | 91 -- .../main/java/org/jclouds/ec2/EC2Fallbacks.java | 50 - ...ndBlockDeviceMappingToIndexedFormParams.java | 67 -- .../BindBundleIdsToIndexedFormParams.java | 37 - .../binders/BindFiltersToIndexedFormParams.java | 57 -- .../BindGroupIdsToIndexedFormParams.java | 37 - .../BindGroupNamesToIndexedFormParams.java | 37 - .../BindInstanceIdsToIndexedFormParams.java | 37 - .../BindIpPermissionToIndexedFormParams.java | 40 - .../BindIpPermissionsToIndexedFormParams.java | 48 - .../BindKeyNamesToIndexedFormParams.java | 37 - .../BindProductCodesToIndexedFormParams.java | 37 - .../BindPublicIpsToIndexedFormParams.java | 42 - .../BindResourceIdsToIndexedFormParams.java | 40 - .../binders/BindS3UploadPolicyAndSignature.java | 57 -- .../binders/BindTagKeysToIndexedFormParams.java | 46 - .../binders/BindTagsToIndexedFormParams.java | 54 - .../BindUserGroupsToIndexedFormParams.java | 52 - ...roupPairToSourceSecurityGroupFormParams.java | 49 - .../binders/BindUserIdsToIndexedFormParams.java | 37 - .../BindVolumeIdsToIndexedFormParams.java | 37 - ...fNotNullBindAvailabilityZoneToFormParam.java | 55 -- .../jclouds/ec2/compute/EC2ComputeService.java | 331 ------- .../ec2/compute/EC2ComputeServiceContext.java | 32 - .../config/EC2BindComputeStrategiesByClass.java | 97 -- .../config/EC2BindComputeSuppliersByClass.java | 41 - .../config/EC2ComputeServiceContextModule.java | 144 --- .../EC2ComputeServiceDependenciesModule.java | 197 ---- .../compute/config/EC2ResolveImagesModule.java | 36 - .../ec2/compute/domain/EC2HardwareBuilder.java | 599 ----------- .../domain/PasswordDataAndPrivateKey.java | 76 -- .../ec2/compute/domain/RegionAndName.java | 111 --- .../domain/RegionNameAndIngressRules.java | 44 - .../compute/extensions/EC2ImageExtension.java | 143 --- .../extensions/EC2SecurityGroupExtension.java | 380 ------- .../functions/AddElasticIpsToNodemetadata.java | 77 -- .../compute/functions/CreateUniqueKeyPair.java | 79 -- .../functions/CredentialsForInstance.java | 79 -- .../ec2/compute/functions/EC2ImageParser.java | 148 --- .../functions/EC2SecurityGroupIdFromName.java | 51 - .../EC2SecurityGroupToSecurityGroup.java | 98 -- .../functions/ImagesToRegionAndIdMap.java | 55 -- .../PasswordCredentialsFromWindowsInstance.java | 122 --- .../ec2/compute/functions/PresentInstances.java | 84 -- .../RunningInstanceToNodeMetadata.java | 257 ----- ...indowsLoginCredentialsFromEncryptedData.java | 79 -- .../internal/EC2ComputeServiceContextImpl.java | 47 - .../internal/EC2TemplateBuilderImpl.java | 117 --- .../loaders/CreateSecurityGroupIfNeeded.java | 106 -- .../loaders/LoadPublicIpForInstanceOrNull.java | 60 -- .../ec2/compute/loaders/RegionAndIdToImage.java | 68 -- .../ec2/compute/options/EC2TemplateOptions.java | 624 ------------ .../compute/predicates/EC2ImagePredicates.java | 50 - .../predicates/SecurityGroupPresent.java | 68 -- ...curityGroupsAsNeededAndReturnRunOptions.java | 200 ---- .../strategy/DescribeImagesParallel.java | 86 -- .../EC2CreateNodesInGroupThenAddToSet.java | 244 ----- .../strategy/EC2DestroyNodeStrategy.java | 105 -- .../compute/strategy/EC2GetImageStrategy.java | 70 -- .../strategy/EC2GetNodeMetadataStrategy.java | 71 -- .../compute/strategy/EC2ListNodesStrategy.java | 164 --- ...DefaultLoginCredentialsForImageStrategy.java | 75 -- .../compute/strategy/EC2RebootNodeStrategy.java | 53 - .../compute/strategy/EC2ResumeNodeStrategy.java | 53 - .../strategy/EC2SuspendNodeStrategy.java | 53 - .../ec2/compute/strategy/ReviseParsedImage.java | 44 - .../compute/suppliers/EC2HardwareSupplier.java | 46 - .../ec2/compute/suppliers/EC2ImageSupplier.java | 120 --- .../suppliers/RegionAndNameToImageSupplier.java | 53 - .../ec2/compute/util/EC2ComputeUtils.java | 35 - .../ec2/config/BaseEC2HttpApiModule.java | 61 -- .../jclouds/ec2/config/EC2HttpApiModule.java | 37 - .../java/org/jclouds/ec2/domain/Attachment.java | 226 ----- .../ec2/domain/AvailabilityZoneInfo.java | 129 --- .../org/jclouds/ec2/domain/BlockDevice.java | 109 -- .../jclouds/ec2/domain/BlockDeviceMapping.java | 234 ----- .../ec2/domain/BundleInstanceS3Storage.java | 150 --- .../java/org/jclouds/ec2/domain/BundleTask.java | 295 ------ .../java/org/jclouds/ec2/domain/Hypervisor.java | 49 - .../main/java/org/jclouds/ec2/domain/Image.java | 496 ---------- .../org/jclouds/ec2/domain/ImageAttribute.java | 98 -- .../org/jclouds/ec2/domain/InstanceState.java | 97 -- .../jclouds/ec2/domain/InstanceStateChange.java | 119 --- .../org/jclouds/ec2/domain/InstanceType.java | 388 -------- .../java/org/jclouds/ec2/domain/KeyPair.java | 206 ---- .../org/jclouds/ec2/domain/PasswordData.java | 153 --- .../java/org/jclouds/ec2/domain/Permission.java | 93 -- .../ec2/domain/PublicIpInstanceIdPair.java | 111 --- .../org/jclouds/ec2/domain/Reservation.java | 228 ----- .../ec2/domain/ReservedInstancesOffering.java | 182 ---- .../org/jclouds/ec2/domain/RootDeviceType.java | 48 - .../org/jclouds/ec2/domain/RunningInstance.java | 525 ---------- .../org/jclouds/ec2/domain/SecurityGroup.java | 229 ----- .../java/org/jclouds/ec2/domain/Snapshot.java | 235 ----- .../java/org/jclouds/ec2/domain/Subnet.java | 253 ----- .../main/java/org/jclouds/ec2/domain/Tag.java | 196 ---- .../org/jclouds/ec2/domain/UserIdGroupPair.java | 100 -- .../jclouds/ec2/domain/VirtualizationType.java | 47 - .../java/org/jclouds/ec2/domain/Volume.java | 296 ------ .../java/org/jclouds/ec2/features/AMIApi.java | 366 ------- .../features/AvailabilityZoneAndRegionApi.java | 90 -- .../ec2/features/ElasticBlockStoreApi.java | 602 ----------- .../ec2/features/ElasticIPAddressApi.java | 200 ---- .../org/jclouds/ec2/features/InstanceApi.java | 803 --------------- .../org/jclouds/ec2/features/KeyPairApi.java | 159 --- .../jclouds/ec2/features/SecurityGroupApi.java | 324 ------ .../org/jclouds/ec2/features/SubnetApi.java | 94 -- .../java/org/jclouds/ec2/features/TagApi.java | 201 ---- .../org/jclouds/ec2/features/WindowsApi.java | 229 ----- ...vertUnencodedBytesToBase64EncodedString.java | 43 - .../functions/EncodedRSAPublicKeyToBase64.java | 51 - .../options/BundleInstanceS3StorageOptions.java | 95 -- .../jclouds/ec2/options/CreateImageOptions.java | 94 -- .../ec2/options/CreateSnapshotOptions.java | 70 -- .../DescribeAvailabilityZonesOptions.java | 68 -- .../ec2/options/DescribeImagesOptions.java | 115 --- .../ec2/options/DescribeRegionsOptions.java | 68 -- .../ec2/options/DescribeSnapshotsOptions.java | 109 -- .../ec2/options/DetachVolumeOptions.java | 86 -- .../RegisterImageBackedByEbsOptions.java | 235 ----- .../ec2/options/RegisterImageOptions.java | 128 --- .../ec2/options/RunInstancesOptions.java | 206 ---- .../options/internal/BaseEC2RequestOptions.java | 59 -- .../ec2/predicates/InstanceHasIpAddress.java | 66 -- .../ec2/predicates/InstanceStateRunning.java | 69 -- .../ec2/predicates/InstanceStateStopped.java | 62 -- .../ec2/predicates/InstanceStateTerminated.java | 68 -- .../ec2/predicates/SnapshotCompleted.java | 60 -- .../jclouds/ec2/predicates/VolumeAttached.java | 63 -- .../jclouds/ec2/predicates/VolumeAvailable.java | 57 -- .../jclouds/ec2/predicates/VolumeDetached.java | 69 -- .../org/jclouds/ec2/reference/EC2Constants.java | 49 - .../DescribeAvailabilityZonesInRegion.java | 92 -- .../suppliers/DescribeRegionsForRegionURIs.java | 50 - .../org/jclouds/ec2/util/IpPermissions.java | 197 ---- .../jclouds/ec2/util/SubnetFilterBuilder.java | 251 ----- .../org/jclouds/ec2/util/TagFilterBuilder.java | 223 ----- .../main/java/org/jclouds/ec2/util/Tags.java | 101 -- .../ec2/xml/AllocateAddressResponseHandler.java | 56 -- .../org/jclouds/ec2/xml/AttachmentHandler.java | 86 -- .../jclouds/ec2/xml/BaseReservationHandler.java | 217 ---- .../ec2/xml/BlockDeviceMappingHandler.java | 82 -- .../jclouds/ec2/xml/BooleanValueHandler.java | 46 - .../org/jclouds/ec2/xml/BundleTaskHandler.java | 111 --- .../ec2/xml/CreateVolumeResponseHandler.java | 198 ---- .../xml/DescribeAddressesResponseHandler.java | 80 -- ...escribeAvailabilityZonesResponseHandler.java | 104 -- .../xml/DescribeBundleTasksResponseHandler.java | 73 -- .../ec2/xml/DescribeImagesResponseHandler.java | 223 ----- .../xml/DescribeInstancesResponseHandler.java | 109 -- .../xml/DescribeKeyPairsResponseHandler.java | 84 -- .../ec2/xml/DescribeRegionsResponseHandler.java | 67 -- .../DescribeSecurityGroupsResponseHandler.java | 126 --- .../xml/DescribeSnapshotsResponseHandler.java | 76 -- .../ec2/xml/DescribeSubnetsResponseHandler.java | 91 -- .../ec2/xml/DescribeTagsResponseHandler.java | 99 -- .../ec2/xml/DescribeVolumesResponseHandler.java | 79 -- .../xml/GetConsoleOutputResponseHandler.java | 55 -- .../ec2/xml/GetPasswordDataResponseHandler.java | 61 -- .../org/jclouds/ec2/xml/ImageIdHandler.java | 49 - ...nstanceInitiatedShutdownBehaviorHandler.java | 48 - .../ec2/xml/InstanceStateChangeHandler.java | 112 --- .../jclouds/ec2/xml/InstanceTypeHandler.java | 47 - .../jclouds/ec2/xml/IpPermissionHandler.java | 94 -- .../jclouds/ec2/xml/KeyPairResponseHandler.java | 79 -- .../org/jclouds/ec2/xml/PermissionHandler.java | 55 -- .../ec2/xml/RunInstancesResponseHandler.java | 48 - .../jclouds/ec2/xml/SecurityGroupHandler.java | 143 --- .../org/jclouds/ec2/xml/SnapshotHandler.java | 107 -- .../org/jclouds/ec2/xml/StringValueHandler.java | 47 - .../java/org/jclouds/ec2/xml/SubnetHandler.java | 95 -- .../java/org/jclouds/ec2/xml/TagHandler.java | 77 -- .../java/org/jclouds/ec2/xml/TagSetHandler.java | 78 -- .../ec2/xml/UnencodeStringValueHandler.java | 37 - .../services/org.jclouds.apis.ApiMetadata | 1 - ...dApplicationArchitecturesEC2ApiLiveTest.java | 427 -------- .../org/jclouds/ec2/EBSBootEC2ApiLiveTest.java | 607 ------------ .../org/jclouds/ec2/EC2ApiMetadataTest.java | 32 - .../org/jclouds/ec2/EC2ContextBuilderText.java | 36 - ...ockDeviceMappingToIndexedFormParamsTest.java | 70 -- .../BindBundleIdsToIndexedFormParamsTest.java | 57 -- .../BindFiltersToIndexedFormParamsTest.java | 63 -- .../BindGroupNamesToIndexedFormParamsTest.java | 57 -- .../BindInstanceIdsToIndexedFormParamsTest.java | 57 -- .../BindKeyNamesToIndexedFormParamsTest.java | 57 -- ...BindProductCodesToIndexedFormParamsTest.java | 58 -- .../BindPublicIpsToIndexedFormParamsTest.java | 57 -- .../BindResourceIdsToIndexedFormParamsTest.java | 57 -- .../BindS3UploadPolicyAndSignatureTest.java | 61 -- .../BindTagKeysToIndexedFormParamsTest.java | 54 - .../BindTagsToIndexedFormParamsTest.java | 62 -- .../BindUserGroupsToIndexedFormParamsTest.java | 63 -- ...PairToSourceSecurityGroupFormParamsTest.java | 60 -- .../BindUserIdsToIndexedFormParamsTest.java | 58 -- .../BindVolumeIdsToIndexedFormParamsTest.java | 57 -- ...NullBindAvailabilityZoneToFormParamTest.java | 59 -- .../compute/EC2ComputeServiceExpectTest.java | 148 --- .../ec2/compute/EC2ComputeServiceLiveTest.java | 362 ------- .../ec2/compute/EC2TemplateBuilderLiveTest.java | 94 -- .../ec2/compute/EC2TemplateBuilderTest.java | 240 ----- .../compute/TestCanRecreateGroupLiveTest.java | 57 -- .../EC2ComputeServiceContextModuleTest.java | 65 -- .../extensions/EC2ImageExtensionExpectTest.java | 84 -- .../extensions/EC2ImageExtensionLiveTest.java | 64 -- .../EC2SecurityGroupExtensionExpectTest.java | 583 ----------- .../EC2SecurityGroupExtensionLiveTest.java | 36 - .../AddElasticIpsToNodemetadataTest.java | 90 -- .../functions/CreateUniqueKeyPairTest.java | 116 --- .../compute/functions/EC2ImageParserTest.java | 124 --- .../EC2SecurityGroupToSecurityGroupTest.java | 83 -- .../compute/functions/PresentInstancesTest.java | 69 -- .../RunningInstanceToNodeMetadataTest.java | 298 ------ ...wsLoginCredentialsFromEncryptedDataTest.java | 77 -- .../BaseEC2ComputeServiceContextExpectTest.java | 42 - .../BaseEC2ComputeServiceExpectTest.java | 246 ----- .../internal/EC2TemplateBuilderImplTest.java | 237 ----- .../CreateSecurityGroupIfNeededTest.java | 108 -- .../LoadPublicIpForInstanceOrNullTest.java | 106 -- .../compute/loaders/RegionAndIdToImageTest.java | 143 --- .../compute/options/EC2TemplateOptionsTest.java | 288 ------ ...tyGroupsAsNeededAndReturnRunOptionsTest.java | 577 ----------- .../EC2CreateNodesInGroupThenAddToSetTest.java | 343 ------- .../strategy/EC2DestroyNodeStrategyTest.java | 189 ---- .../ec2/config/EC2HttpApiModuleExpectTest.java | 145 --- .../jclouds/ec2/features/AMIApiExpectTest.java | 76 -- .../jclouds/ec2/features/AMIApiLiveTest.java | 249 ----- .../org/jclouds/ec2/features/AMIApiTest.java | 521 ---------- .../AvailabilityZoneAndRegionApiLiveTest.java | 91 -- .../AvailabilityZoneAndRegionApiTest.java | 116 --- .../jclouds/ec2/features/BaseEC2ApiTest.java | 145 --- .../EC2ElasticBlockStoreApiExpectTest.java | 172 ---- .../features/ElasticBlockStoreApiLiveTest.java | 291 ------ .../ec2/features/ElasticBlockStoreApiTest.java | 401 -------- .../features/ElasticIPAddressApiExpectTest.java | 102 -- .../features/ElasticIPAddressApiLiveTest.java | 77 -- .../ec2/features/ElasticIPAddressApiTest.java | 140 --- .../ec2/features/InstanceApiExpectTest.java | 101 -- .../ec2/features/InstanceApiLiveTest.java | 97 -- .../jclouds/ec2/features/InstanceApiTest.java | 593 ----------- .../ec2/features/KeyPairApiExpectTest.java | 76 -- .../ec2/features/KeyPairApiLiveTest.java | 143 --- .../jclouds/ec2/features/KeyPairApiTest.java | 88 -- .../features/SecurityGroupApiExpectTest.java | 76 -- .../ec2/features/SecurityGroupApiLiveTest.java | 334 ------- .../ec2/features/SecurityGroupApiTest.java | 236 ----- .../ec2/features/SubnetApiExpectTest.java | 119 --- .../jclouds/ec2/features/SubnetApiLiveTest.java | 84 -- .../jclouds/ec2/features/TagApiExpectTest.java | 285 ------ .../ec2/features/WindowsApiExpectTest.java | 115 --- .../ec2/features/WindowsApiLiveTest.java | 37 - .../jclouds/ec2/features/WindowsApiTest.java | 162 --- .../features/internal/BaseTagApiLiveTest.java | 159 --- ...UnencodedBytesToBase64EncodedStringTest.java | 44 - .../EncodedRSAPublicKeyToBase64Test.java | 44 - .../ec2/internal/BaseEC2ApiExpectTest.java | 67 -- .../ec2/internal/BaseEC2ApiLiveTest.java | 30 - .../jclouds/ec2/internal/BaseEC2ExpectTest.java | 85 -- .../BundleInstanceS3StorageOptionsTest.java | 74 -- .../ec2/options/CreateImageOptionsTest.java | 80 -- .../ec2/options/CreateSnapshotOptionsTest.java | 66 -- .../ec2/options/DescribeImagesOptionsTest.java | 134 --- .../options/DescribeSnapshotsOptionsTest.java | 129 --- .../ec2/options/DetachVolumeOptionsTest.java | 91 -- .../RegisterImageBackedByEbsOptionsTest.java | 329 ------- .../ec2/options/RegisterImageOptionsTest.java | 146 --- .../ec2/options/RunInstancesOptionsTest.java | 247 ----- .../ec2/parse/DescribeSubnetsResponseTest.java | 71 -- .../ec2/parse/DescribeTagsResponseTest.java | 74 -- .../ec2/parse/GetPasswordDataResponseTest.java | 55 -- .../ec2/predicates/VolumeDetachedTest.java | 112 --- .../DescribeAvailabilityZonesInRegionTest.java | 124 --- .../org/jclouds/ec2/util/IpPermissionsTest.java | 106 -- .../java/org/jclouds/ec2/util/TagsTest.java | 55 -- .../xml/AllocateAddressResponseHandlerTest.java | 44 - .../jclouds/ec2/xml/AttachmentHandlerTest.java | 53 - .../org/jclouds/ec2/xml/BaseEC2HandlerTest.java | 86 -- .../ec2/xml/BlockDeviceMappingHandlerTest.java | 57 -- .../jclouds/ec2/xml/BundleTaskHandlerTest.java | 68 -- .../xml/CreateVolumeResponseHandlerTest.java | 60 -- .../DescribeAddressesResponseHandlerTest.java | 57 -- ...ibeAvailabilityZonesResponseHandlerTest.java | 85 -- .../DescribeBundleTasksResponseHandlerTest.java | 56 -- .../xml/DescribeImagesResponseHandlerTest.java | 151 --- .../ec2/xml/DescribeInstanceAttributeTest.java | 80 -- .../DescribeInstancesResponseHandlerTest.java | 173 ---- .../DescribeKeyPairsResponseHandlerTest.java | 53 - .../xml/DescribeRegionsResponseHandlerTest.java | 136 --- ...scribeSecurityGroupsResponseHandlerTest.java | 89 -- .../DescribeSnapshotsResponseHandlerTest.java | 59 -- .../xml/DescribeVolumesResponseHandlerTest.java | 67 -- .../GetConsoleOutputResponseHandlerTest.java | 55 -- .../ec2/xml/InstanceStateChangeHandlerTest.java | 93 -- .../ec2/xml/KeyPairResponseHandlerTest.java | 80 -- .../jclouds/ec2/xml/PermissionHandlerTest.java | 48 - .../xml/RunInstancesResponseHandlerTest.java | 110 --- .../jclouds/ec2/xml/SnapshotHandlerTest.java | 53 - .../src/test/resources/allocate_address.xml | 3 - .../src/test/resources/amzn_images.xml | 113 --- .../1.7.1-stratos/src/test/resources/attach.xml | 7 - ...authorize_securitygroup_ingress_response.xml | 4 - .../availabilityZones-ap-northeast-1.xml | 17 - .../availabilityZones-ap-southeast-1.xml | 17 - .../resources/availabilityZones-eu-west-1.xml | 23 - .../resources/availabilityZones-sa-east-1.xml | 17 - .../resources/availabilityZones-us-east-1.xml | 35 - .../resources/availabilityZones-us-west-1.xml | 23 - .../resources/availabilityZones-us-west-2.xml | 23 - .../src/test/resources/availabilityZones.xml | 35 - .../src/test/resources/bundle_instance.xml | 18 - .../src/test/resources/cancel_bundle_task.xml | 16 - .../src/test/resources/create_keypair.xml | 28 - .../test/resources/created_securitygroup.xml | 6 - .../src/test/resources/created_snapshot.xml | 10 - .../src/test/resources/created_volume.xml | 9 - .../src/test/resources/delete_securitygroup.xml | 4 - .../src/test/resources/describe_addresses.xml | 11 - .../resources/describe_addresses_single.xml | 8 - .../test/resources/describe_bundle_tasks.xml | 18 - ...cribe_image_attribute_blockDeviceMapping.xml | 24 - ...escribe_image_attribute_launchPermission.xml | 11 - .../src/test/resources/describe_images.xml | 23 - .../src/test/resources/describe_images_ebs.xml | 40 - .../describe_images_imageextension0.xml | 24 - .../describe_images_imageextension1.xml | 24 - .../describe_images_imageextension2.xml | 24 - .../src/test/resources/describe_images_nova.xml | 21 - .../src/test/resources/describe_images_tags.xml | 33 - .../test/resources/describe_images_windows.xml | 22 - .../src/test/resources/describe_instances.xml | 85 -- .../test/resources/describe_instances_ebs.xml | 63 -- .../resources/describe_instances_multiple.xml | 130 --- .../resources/describe_instances_running-1.xml | 74 -- .../describe_instances_running-named.xml | 74 -- .../resources/describe_instances_running.xml | 45 - ...escribe_instances_running_securitygroups.xml | 74 -- .../src/test/resources/describe_keypairs.xml | 8 - .../test/resources/describe_securitygroups.xml | 39 - .../resources/describe_securitygroups_empty.xml | 41 - .../describe_securitygroups_extension_cidr.xml | 24 - .../describe_securitygroups_extension_group.xml | 26 - .../describe_securitygroups_extension_new.xml | 27 - ...describe_securitygroups_extension_single.xml | 12 - .../src/test/resources/describe_snapshots.xml | 20 - .../src/test/resources/describe_subnets.xml | 33 - .../src/test/resources/describe_tags.xml | 29 - .../src/test/resources/describe_volumes.xml | 32 - .../test/resources/describe_volumes_single.xml | 15 - .../test/resources/disableApiTermination.xml | 8 - .../resources/get_console_output_response.xml | 13 - .../src/test/resources/get_passworddata.xml | 6 - .../instanceInitiatedShutdownBehavior.xml | 7 - .../src/test/resources/instanceType.xml | 9 - .../1.7.1-stratos/src/test/resources/log4j.xml | 166 ---- .../src/test/resources/new_instance.xml | 56 -- .../src/test/resources/new_securitygroup.xml | 14 - .../src/test/resources/ramdisk.xml | 8 - .../resources/regionEndpoints-additional.xml | 22 - .../src/test/resources/regionEndpoints-all.xml | 34 - .../src/test/resources/regionEndpoints.xml | 18 - .../src/test/resources/run_instances.xml | 74 -- .../resources/run_instances_cloudbridge.xml | 68 -- .../src/test/resources/start_instances.xml | 15 - .../src/test/resources/stop_instances.xml | 15 - .../src/test/resources/terminate_instances.xml | 15 - .../src/test/resources/userData.xml | 8 - .../jclouds/apis/ec2/1.8.0-stratos/README.txt | 15 + .../jclouds/apis/ec2/1.8.0-stratos/pom.xml | 144 +++ .../src/main/clojure/org/jclouds/ec2/ami2.clj | 84 ++ .../src/main/clojure/org/jclouds/ec2/ebs2.clj | 286 ++++++ .../clojure/org/jclouds/ec2/elastic_ip2.clj | 80 ++ .../clojure/org/jclouds/ec2/security_group2.clj | 99 ++ .../src/main/java/org/jclouds/ec2/EC2Api.java | 165 ++++ .../java/org/jclouds/ec2/EC2ApiMetadata.java | 91 ++ .../main/java/org/jclouds/ec2/EC2Fallbacks.java | 50 + ...ndBlockDeviceMappingToIndexedFormParams.java | 63 ++ .../BindBundleIdsToIndexedFormParams.java | 35 + .../binders/BindFiltersToIndexedFormParams.java | 55 ++ .../BindGroupIdsToIndexedFormParams.java | 35 + .../BindGroupNamesToIndexedFormParams.java | 35 + .../BindInstanceIdsToIndexedFormParams.java | 35 + .../BindIpPermissionToIndexedFormParams.java | 37 + .../BindIpPermissionsToIndexedFormParams.java | 45 + .../BindKeyNamesToIndexedFormParams.java | 35 + .../BindProductCodesToIndexedFormParams.java | 35 + .../BindPublicIpsToIndexedFormParams.java | 40 + .../BindResourceIdsToIndexedFormParams.java | 38 + .../binders/BindS3UploadPolicyAndSignature.java | 53 + .../binders/BindTagKeysToIndexedFormParams.java | 44 + .../binders/BindTagsToIndexedFormParams.java | 51 + .../BindUserGroupsToIndexedFormParams.java | 50 + ...roupPairToSourceSecurityGroupFormParams.java | 47 + .../binders/BindUserIdsToIndexedFormParams.java | 35 + .../BindVolumeIdsToIndexedFormParams.java | 35 + ...fNotNullBindAvailabilityZoneToFormParam.java | 53 + .../jclouds/ec2/compute/EC2ComputeService.java | 328 ++++++ .../ec2/compute/EC2ComputeServiceContext.java | 29 + .../config/EC2BindComputeStrategiesByClass.java | 94 ++ .../config/EC2BindComputeSuppliersByClass.java | 38 + .../config/EC2ComputeServiceContextModule.java | 142 +++ .../EC2ComputeServiceDependenciesModule.java | 193 ++++ .../compute/config/EC2ResolveImagesModule.java | 33 + .../ec2/compute/domain/EC2HardwareBuilder.java | 608 ++++++++++++ .../domain/PasswordDataAndPrivateKey.java | 74 ++ .../ec2/compute/domain/RegionAndName.java | 107 ++ .../domain/RegionNameAndIngressRules.java | 40 + .../compute/extensions/EC2ImageExtension.java | 140 +++ .../extensions/EC2SecurityGroupExtension.java | 378 +++++++ .../functions/AddElasticIpsToNodemetadata.java | 75 ++ .../compute/functions/CreateUniqueKeyPair.java | 75 ++ .../functions/CredentialsForInstance.java | 75 ++ .../ec2/compute/functions/EC2ImageParser.java | 145 +++ .../functions/EC2SecurityGroupIdFromName.java | 48 + .../EC2SecurityGroupToSecurityGroup.java | 96 ++ .../functions/ImagesToRegionAndIdMap.java | 52 + .../PasswordCredentialsFromWindowsInstance.java | 119 +++ .../ec2/compute/functions/PresentInstances.java | 82 ++ .../RunningInstanceToNodeMetadata.java | 254 +++++ ...indowsLoginCredentialsFromEncryptedData.java | 77 ++ .../internal/EC2ComputeServiceContextImpl.java | 44 + .../internal/EC2TemplateBuilderImpl.java | 116 +++ .../loaders/CreateSecurityGroupIfNeeded.java | 102 ++ .../loaders/LoadPublicIpForInstanceOrNull.java | 57 ++ .../ec2/compute/loaders/RegionAndIdToImage.java | 64 ++ .../ec2/compute/options/EC2TemplateOptions.java | 686 +++++++++++++ .../compute/predicates/EC2ImagePredicates.java | 48 + .../predicates/SecurityGroupPresent.java | 64 ++ ...curityGroupsAsNeededAndReturnRunOptions.java | 199 ++++ .../strategy/DescribeImagesParallel.java | 82 ++ .../EC2CreateNodesInGroupThenAddToSet.java | 252 +++++ .../strategy/EC2DestroyNodeStrategy.java | 101 ++ .../compute/strategy/EC2GetImageStrategy.java | 66 ++ .../strategy/EC2GetNodeMetadataStrategy.java | 67 ++ .../compute/strategy/EC2ListNodesStrategy.java | 160 +++ ...DefaultLoginCredentialsForImageStrategy.java | 72 ++ .../compute/strategy/EC2RebootNodeStrategy.java | 49 + .../compute/strategy/EC2ResumeNodeStrategy.java | 49 + .../strategy/EC2SuspendNodeStrategy.java | 49 + .../ec2/compute/strategy/ReviseParsedImage.java | 40 + .../compute/suppliers/EC2HardwareSupplier.java | 42 + .../ec2/compute/suppliers/EC2ImageSupplier.java | 116 +++ .../suppliers/RegionAndNameToImageSupplier.java | 49 + .../ec2/compute/util/EC2ComputeUtils.java | 31 + .../ec2/config/BaseEC2HttpApiModule.java | 59 ++ .../jclouds/ec2/config/EC2HttpApiModule.java | 35 + .../java/org/jclouds/ec2/domain/Attachment.java | 225 +++++ .../ec2/domain/AvailabilityZoneInfo.java | 128 +++ .../org/jclouds/ec2/domain/BlockDevice.java | 108 ++ .../jclouds/ec2/domain/BlockDeviceMapping.java | 292 ++++++ .../ec2/domain/BundleInstanceS3Storage.java | 149 +++ .../java/org/jclouds/ec2/domain/BundleTask.java | 293 ++++++ .../java/org/jclouds/ec2/domain/Hypervisor.java | 47 + .../main/java/org/jclouds/ec2/domain/Image.java | 530 ++++++++++ .../org/jclouds/ec2/domain/ImageAttribute.java | 96 ++ .../org/jclouds/ec2/domain/InstanceState.java | 95 ++ .../jclouds/ec2/domain/InstanceStateChange.java | 118 +++ .../org/jclouds/ec2/domain/InstanceType.java | 386 ++++++++ .../java/org/jclouds/ec2/domain/KeyPair.java | 205 ++++ .../org/jclouds/ec2/domain/PasswordData.java | 151 +++ .../java/org/jclouds/ec2/domain/Permission.java | 92 ++ .../ec2/domain/PublicIpInstanceIdPair.java | 110 +++ .../org/jclouds/ec2/domain/Reservation.java | 227 +++++ .../ec2/domain/ReservedInstancesOffering.java | 181 ++++ .../org/jclouds/ec2/domain/RootDeviceType.java | 46 + .../org/jclouds/ec2/domain/RunningInstance.java | 524 ++++++++++ .../org/jclouds/ec2/domain/SecurityGroup.java | 228 +++++ .../java/org/jclouds/ec2/domain/Snapshot.java | 234 +++++ .../java/org/jclouds/ec2/domain/Subnet.java | 250 +++++ .../main/java/org/jclouds/ec2/domain/Tag.java | 194 ++++ .../org/jclouds/ec2/domain/UserIdGroupPair.java | 99 ++ .../jclouds/ec2/domain/VirtualizationType.java | 45 + .../java/org/jclouds/ec2/domain/Volume.java | 352 +++++++ .../java/org/jclouds/ec2/features/AMIApi.java | 364 +++++++ .../features/AvailabilityZoneAndRegionApi.java | 88 ++ .../ec2/features/ElasticBlockStoreApi.java | 631 ++++++++++++ .../ec2/features/ElasticIPAddressApi.java | 198 ++++ .../org/jclouds/ec2/features/InstanceApi.java | 801 +++++++++++++++ .../org/jclouds/ec2/features/KeyPairApi.java | 157 +++ .../jclouds/ec2/features/SecurityGroupApi.java | 322 ++++++ .../org/jclouds/ec2/features/SubnetApi.java | 92 ++ .../java/org/jclouds/ec2/features/TagApi.java | 200 ++++ .../org/jclouds/ec2/features/WindowsApi.java | 228 +++++ ...vertUnencodedBytesToBase64EncodedString.java | 41 + .../functions/EncodedRSAPublicKeyToBase64.java | 50 + .../options/BundleInstanceS3StorageOptions.java | 94 ++ .../jclouds/ec2/options/CreateImageOptions.java | 93 ++ .../ec2/options/CreateSnapshotOptions.java | 69 ++ .../ec2/options/CreateVolumeOptions.java | 146 +++ .../DescribeAvailabilityZonesOptions.java | 67 ++ .../ec2/options/DescribeImagesOptions.java | 114 +++ .../ec2/options/DescribeRegionsOptions.java | 67 ++ .../ec2/options/DescribeSnapshotsOptions.java | 108 ++ .../ec2/options/DetachVolumeOptions.java | 85 ++ .../RegisterImageBackedByEbsOptions.java | 345 +++++++ .../ec2/options/RegisterImageOptions.java | 127 +++ .../ec2/options/RunInstancesOptions.java | 229 +++++ .../options/internal/BaseEC2RequestOptions.java | 55 ++ .../ec2/predicates/InstanceHasIpAddress.java | 64 ++ .../ec2/predicates/InstanceStateRunning.java | 67 ++ .../ec2/predicates/InstanceStateStopped.java | 60 ++ .../ec2/predicates/InstanceStateTerminated.java | 66 ++ .../ec2/predicates/SnapshotCompleted.java | 58 ++ .../jclouds/ec2/predicates/VolumeAttached.java | 61 ++ .../jclouds/ec2/predicates/VolumeAvailable.java | 55 ++ .../jclouds/ec2/predicates/VolumeDetached.java | 67 ++ .../org/jclouds/ec2/reference/EC2Constants.java | 50 + .../DescribeAvailabilityZonesInRegion.java | 92 ++ .../suppliers/DescribeRegionsForRegionURIs.java | 50 + .../org/jclouds/ec2/util/IpPermissions.java | 195 ++++ .../jclouds/ec2/util/SubnetFilterBuilder.java | 249 +++++ .../org/jclouds/ec2/util/TagFilterBuilder.java | 222 +++++ .../main/java/org/jclouds/ec2/util/Tags.java | 97 ++ .../ec2/xml/AllocateAddressResponseHandler.java | 53 + .../org/jclouds/ec2/xml/AttachmentHandler.java | 82 ++ .../jclouds/ec2/xml/BaseReservationHandler.java | 213 ++++ .../ec2/xml/BlockDeviceMappingHandler.java | 78 ++ .../jclouds/ec2/xml/BooleanValueHandler.java | 45 + .../org/jclouds/ec2/xml/BundleTaskHandler.java | 107 ++ .../ec2/xml/CreateVolumeResponseHandler.java | 207 ++++ .../xml/DescribeAddressesResponseHandler.java | 76 ++ ...escribeAvailabilityZonesResponseHandler.java | 100 ++ .../xml/DescribeBundleTasksResponseHandler.java | 70 ++ .../ec2/xml/DescribeImagesResponseHandler.java | 232 +++++ .../xml/DescribeInstancesResponseHandler.java | 108 ++ .../xml/DescribeKeyPairsResponseHandler.java | 83 ++ .../ec2/xml/DescribeRegionsResponseHandler.java | 63 ++ .../DescribeSecurityGroupsResponseHandler.java | 125 +++ .../xml/DescribeSnapshotsResponseHandler.java | 73 ++ .../ec2/xml/DescribeSubnetsResponseHandler.java | 88 ++ .../ec2/xml/DescribeTagsResponseHandler.java | 97 ++ .../ec2/xml/DescribeVolumesResponseHandler.java | 76 ++ .../xml/GetConsoleOutputResponseHandler.java | 54 + .../ec2/xml/GetPasswordDataResponseHandler.java | 58 ++ .../org/jclouds/ec2/xml/ImageIdHandler.java | 48 + ...nstanceInitiatedShutdownBehaviorHandler.java | 47 + .../ec2/xml/InstanceStateChangeHandler.java | 111 +++ .../jclouds/ec2/xml/InstanceTypeHandler.java | 46 + .../jclouds/ec2/xml/IpPermissionHandler.java | 90 ++ .../jclouds/ec2/xml/KeyPairResponseHandler.java | 78 ++ .../org/jclouds/ec2/xml/PermissionHandler.java | 54 + .../ec2/xml/RunInstancesResponseHandler.java | 47 + .../jclouds/ec2/xml/SecurityGroupHandler.java | 140 +++ .../org/jclouds/ec2/xml/SnapshotHandler.java | 103 ++ .../org/jclouds/ec2/xml/StringValueHandler.java | 46 + .../java/org/jclouds/ec2/xml/SubnetHandler.java | 92 ++ .../java/org/jclouds/ec2/xml/TagHandler.java | 75 ++ .../java/org/jclouds/ec2/xml/TagSetHandler.java | 75 ++ .../ec2/xml/UnencodeStringValueHandler.java | 36 + .../services/org.jclouds.apis.ApiMetadata | 1 + ...dApplicationArchitecturesEC2ApiLiveTest.java | 425 ++++++++ .../org/jclouds/ec2/EBSBootEC2ApiLiveTest.java | 605 ++++++++++++ .../org/jclouds/ec2/EC2ApiMetadataTest.java | 28 + .../org/jclouds/ec2/EC2ContextBuilderText.java | 33 + ...ockDeviceMappingToIndexedFormParamsTest.java | 68 ++ .../BindBundleIdsToIndexedFormParamsTest.java | 55 ++ .../BindFiltersToIndexedFormParamsTest.java | 61 ++ .../BindGroupNamesToIndexedFormParamsTest.java | 55 ++ .../BindInstanceIdsToIndexedFormParamsTest.java | 55 ++ .../BindKeyNamesToIndexedFormParamsTest.java | 55 ++ ...BindProductCodesToIndexedFormParamsTest.java | 56 ++ .../BindPublicIpsToIndexedFormParamsTest.java | 55 ++ .../BindResourceIdsToIndexedFormParamsTest.java | 55 ++ .../BindS3UploadPolicyAndSignatureTest.java | 59 ++ .../BindTagKeysToIndexedFormParamsTest.java | 52 + .../BindTagsToIndexedFormParamsTest.java | 60 ++ .../BindUserGroupsToIndexedFormParamsTest.java | 61 ++ ...PairToSourceSecurityGroupFormParamsTest.java | 58 ++ .../BindUserIdsToIndexedFormParamsTest.java | 56 ++ .../BindVolumeIdsToIndexedFormParamsTest.java | 55 ++ ...NullBindAvailabilityZoneToFormParamTest.java | 57 ++ .../compute/EC2ComputeServiceExpectTest.java | 319 ++++++ .../ec2/compute/EC2ComputeServiceLiveTest.java | 365 +++++++ .../ec2/compute/EC2TemplateBuilderLiveTest.java | 94 ++ .../ec2/compute/EC2TemplateBuilderTest.java | 242 +++++ .../compute/TestCanRecreateGroupLiveTest.java | 53 + .../EC2ComputeServiceContextModuleTest.java | 62 ++ .../extensions/EC2ImageExtensionExpectTest.java | 80 ++ .../extensions/EC2ImageExtensionLiveTest.java | 61 ++ .../EC2SecurityGroupExtensionExpectTest.java | 579 +++++++++++ .../EC2SecurityGroupExtensionLiveTest.java | 33 + .../AddElasticIpsToNodemetadataTest.java | 87 ++ .../functions/CreateUniqueKeyPairTest.java | 113 +++ .../compute/functions/EC2ImageParserTest.java | 121 +++ .../EC2SecurityGroupToSecurityGroupTest.java | 80 ++ .../compute/functions/PresentInstancesTest.java | 66 ++ .../RunningInstanceToNodeMetadataTest.java | 295 ++++++ ...wsLoginCredentialsFromEncryptedDataTest.java | 74 ++ .../BaseEC2ComputeServiceContextExpectTest.java | 42 + .../BaseEC2ComputeServiceExpectTest.java | 296 ++++++ .../internal/EC2TemplateBuilderImplTest.java | 230 +++++ .../CreateSecurityGroupIfNeededTest.java | 105 ++ .../LoadPublicIpForInstanceOrNullTest.java | 103 ++ .../compute/loaders/RegionAndIdToImageTest.java | 140 +++ .../compute/options/EC2TemplateOptionsTest.java | 325 ++++++ ...tyGroupsAsNeededAndReturnRunOptionsTest.java | 575 +++++++++++ .../EC2CreateNodesInGroupThenAddToSetTest.java | 340 +++++++ .../strategy/EC2DestroyNodeStrategyTest.java | 186 ++++ .../ec2/config/EC2HttpApiModuleExpectTest.java | 142 +++ .../jclouds/ec2/features/AMIApiExpectTest.java | 73 ++ .../jclouds/ec2/features/AMIApiLiveTest.java | 266 +++++ .../org/jclouds/ec2/features/AMIApiTest.java | 519 ++++++++++ .../AvailabilityZoneAndRegionApiLiveTest.java | 89 ++ .../AvailabilityZoneAndRegionApiTest.java | 114 +++ .../jclouds/ec2/features/BaseEC2ApiTest.java | 142 +++ .../EC2ElasticBlockStoreApiExpectTest.java | 204 ++++ .../features/ElasticBlockStoreApiLiveTest.java | 311 ++++++ .../ec2/features/ElasticBlockStoreApiTest.java | 399 ++++++++ .../features/ElasticIPAddressApiExpectTest.java | 101 ++ .../features/ElasticIPAddressApiLiveTest.java | 75 ++ .../ec2/features/ElasticIPAddressApiTest.java | 138 +++ .../ec2/features/InstanceApiExpectTest.java | 100 ++ .../ec2/features/InstanceApiLiveTest.java | 95 ++ .../jclouds/ec2/features/InstanceApiTest.java | 591 +++++++++++ .../ec2/features/KeyPairApiExpectTest.java | 73 ++ .../ec2/features/KeyPairApiLiveTest.java | 141 +++ .../jclouds/ec2/features/KeyPairApiTest.java | 86 ++ .../features/SecurityGroupApiExpectTest.java | 73 ++ .../ec2/features/SecurityGroupApiLiveTest.java | 332 +++++++ .../ec2/features/SecurityGroupApiTest.java | 234 +++++ .../ec2/features/SubnetApiExpectTest.java | 116 +++ .../jclouds/ec2/features/SubnetApiLiveTest.java | 81 ++ .../jclouds/ec2/features/TagApiExpectTest.java | 282 ++++++ .../ec2/features/WindowsApiExpectTest.java | 112 +++ .../ec2/features/WindowsApiLiveTest.java | 34 + .../jclouds/ec2/features/WindowsApiTest.java | 160 +++ .../features/internal/BaseTagApiLiveTest.java | 157 +++ ...UnencodedBytesToBase64EncodedStringTest.java | 42 + .../EncodedRSAPublicKeyToBase64Test.java | 42 + .../ec2/internal/BaseEC2ApiExpectTest.java | 67 ++ .../ec2/internal/BaseEC2ApiLiveTest.java | 26 + .../jclouds/ec2/internal/BaseEC2ExpectTest.java | 85 ++ .../BundleInstanceS3StorageOptionsTest.java | 72 ++ .../ec2/options/CreateImageOptionsTest.java | 78 ++ .../ec2/options/CreateSnapshotOptionsTest.java | 64 ++ .../ec2/options/CreateVolumeOptionsTest.java | 156 +++ .../ec2/options/DescribeImagesOptionsTest.java | 132 +++ .../options/DescribeSnapshotsOptionsTest.java | 127 +++ .../ec2/options/DetachVolumeOptionsTest.java | 89 ++ .../RegisterImageBackedByEbsOptionsTest.java | 396 ++++++++ .../ec2/options/RegisterImageOptionsTest.java | 144 +++ .../ec2/options/RunInstancesOptionsTest.java | 264 +++++ .../ec2/parse/DescribeSubnetsResponseTest.java | 67 ++ .../ec2/parse/DescribeTagsResponseTest.java | 71 ++ .../ec2/parse/GetPasswordDataResponseTest.java | 52 + .../ec2/predicates/VolumeDetachedTest.java | 109 ++ .../DescribeAvailabilityZonesInRegionTest.java | 122 +++ .../org/jclouds/ec2/util/IpPermissionsTest.java | 104 ++ .../java/org/jclouds/ec2/util/TagsTest.java | 52 + .../xml/AllocateAddressResponseHandlerTest.java | 42 + .../jclouds/ec2/xml/AttachmentHandlerTest.java | 51 + .../org/jclouds/ec2/xml/BaseEC2HandlerTest.java | 82 ++ .../ec2/xml/BlockDeviceMappingHandlerTest.java | 55 ++ .../jclouds/ec2/xml/BundleTaskHandlerTest.java | 66 ++ .../xml/CreateVolumeResponseHandlerTest.java | 58 ++ .../DescribeAddressesResponseHandlerTest.java | 55 ++ ...ibeAvailabilityZonesResponseHandlerTest.java | 83 ++ .../DescribeBundleTasksResponseHandlerTest.java | 54 + .../xml/DescribeImagesResponseHandlerTest.java | 155 +++ .../ec2/xml/DescribeInstanceAttributeTest.java | 78 ++ .../DescribeInstancesResponseHandlerTest.java | 171 ++++ .../DescribeKeyPairsResponseHandlerTest.java | 51 + .../xml/DescribeRegionsResponseHandlerTest.java | 134 +++ ...scribeSecurityGroupsResponseHandlerTest.java | 87 ++ .../DescribeSnapshotsResponseHandlerTest.java | 57 ++ .../xml/DescribeVolumesResponseHandlerTest.java | 66 ++ .../GetConsoleOutputResponseHandlerTest.java | 53 + .../ec2/xml/InstanceStateChangeHandlerTest.java | 91 ++ .../ec2/xml/KeyPairResponseHandlerTest.java | 78 ++ .../jclouds/ec2/xml/PermissionHandlerTest.java | 46 + .../xml/RunInstancesResponseHandlerTest.java | 108 ++ .../jclouds/ec2/xml/SnapshotHandlerTest.java | 51 + .../src/test/resources/allocate_address.xml | 3 + .../src/test/resources/amzn_images.xml | 113 +++ .../1.8.0-stratos/src/test/resources/attach.xml | 7 + ...authorize_securitygroup_ingress_response.xml | 4 + .../availabilityZones-ap-northeast-1.xml | 17 + .../availabilityZones-ap-southeast-1.xml | 17 + .../resources/availabilityZones-eu-west-1.xml | 23 + .../resources/availabilityZones-sa-east-1.xml | 17 + .../resources/availabilityZones-us-east-1.xml | 35 + .../resources/availabilityZones-us-west-1.xml | 23 + .../resources/availabilityZones-us-west-2.xml | 23 + .../src/test/resources/availabilityZones.xml | 35 + .../src/test/resources/bundle_instance.xml | 18 + .../src/test/resources/cancel_bundle_task.xml | 16 + .../src/test/resources/create_keypair.xml | 28 + .../test/resources/created_securitygroup.xml | 6 + .../src/test/resources/created_snapshot.xml | 10 + .../src/test/resources/created_volume.xml | 12 + .../src/test/resources/delete_securitygroup.xml | 4 + .../src/test/resources/describe_addresses.xml | 11 + .../resources/describe_addresses_single.xml | 8 + .../test/resources/describe_bundle_tasks.xml | 18 + ...cribe_image_attribute_blockDeviceMapping.xml | 24 + ...escribe_image_attribute_launchPermission.xml | 11 + .../src/test/resources/describe_images.xml | 23 + .../src/test/resources/describe_images_ebs.xml | 44 + .../describe_images_imageextension0.xml | 24 + .../describe_images_imageextension1.xml | 24 + .../describe_images_imageextension2.xml | 24 + .../src/test/resources/describe_images_nova.xml | 21 + .../src/test/resources/describe_images_tags.xml | 33 + .../test/resources/describe_images_windows.xml | 22 + .../src/test/resources/describe_instances.xml | 85 ++ .../test/resources/describe_instances_ebs.xml | 63 ++ .../resources/describe_instances_multiple.xml | 130 +++ .../resources/describe_instances_running-1.xml | 74 ++ .../describe_instances_running-named.xml | 186 ++++ .../resources/describe_instances_running.xml | 45 + ...escribe_instances_running_securitygroups.xml | 74 ++ .../resources/describe_instances_three_ids.xml | 74 ++ .../src/test/resources/describe_keypairs.xml | 8 + .../test/resources/describe_securitygroups.xml | 39 + .../resources/describe_securitygroups_empty.xml | 41 + .../describe_securitygroups_extension_cidr.xml | 24 + .../describe_securitygroups_extension_group.xml | 26 + .../describe_securitygroups_extension_new.xml | 27 + ...describe_securitygroups_extension_single.xml | 12 + .../src/test/resources/describe_snapshots.xml | 20 + .../src/test/resources/describe_subnets.xml | 33 + .../src/test/resources/describe_tags.xml | 29 + .../src/test/resources/describe_volumes.xml | 38 + .../test/resources/describe_volumes_single.xml | 18 + .../test/resources/disableApiTermination.xml | 8 + .../resources/get_console_output_response.xml | 13 + .../src/test/resources/get_passworddata.xml | 6 + .../instanceInitiatedShutdownBehavior.xml | 7 + .../src/test/resources/instanceType.xml | 9 + .../1.8.0-stratos/src/test/resources/log4j.xml | 166 ++++ .../src/test/resources/new_instance.xml | 56 ++ .../src/test/resources/new_securitygroup.xml | 14 + .../src/test/resources/ramdisk.xml | 8 + .../resources/regionEndpoints-additional.xml | 22 + .../src/test/resources/regionEndpoints-all.xml | 34 + .../src/test/resources/regionEndpoints.xml | 18 + .../src/test/resources/run_instances.xml | 74 ++ .../resources/run_instances_cloudbridge.xml | 68 ++ .../src/test/resources/run_instances_three.xml | 74 ++ .../src/test/resources/start_instances.xml | 15 + .../src/test/resources/stop_instances.xml | 15 + .../src/test/resources/terminate_instances.xml | 15 + .../src/test/resources/userData.xml | 8 + .../openstack-nova/1.7.1-stratos/README.txt | 3 - .../apis/openstack-nova/1.7.1-stratos/pom.xml | 145 --- .../jclouds/openstack/nova/v2_0/NovaApi.java | 208 ---- .../openstack/nova/v2_0/NovaApiMetadata.java | 125 --- .../openstack/nova/v2_0/NovaAsyncApi.java | 214 ---- .../v2_0/binders/BindKeyPairToJsonPayload.java | 47 - .../v2_0/binders/BindMetadataToJsonPayload.java | 47 - .../BindSecurityGroupRuleToJsonPayload.java | 71 -- .../nova/v2_0/compute/NovaComputeService.java | 183 ---- .../v2_0/compute/NovaComputeServiceAdapter.java | 288 ------ .../config/NovaComputeServiceContextModule.java | 286 ------ .../compute/extensions/NovaImageExtension.java | 140 --- .../extensions/NovaSecurityGroupExtension.java | 373 ------- .../AllocateAndAddFloatingIpToNode.java | 112 --- .../functions/CreateSecurityGroupIfNeeded.java | 93 -- .../functions/FlavorInZoneToHardware.java | 60 -- .../compute/functions/ImageInZoneToImage.java | 70 -- .../functions/ImageToOperatingSystem.java | 128 --- .../NovaSecurityGroupInZoneToSecurityGroup.java | 75 -- .../NovaSecurityGroupToSecurityGroup.java | 69 -- .../functions/OrphanedGroupsByZoneId.java | 77 -- .../RemoveFloatingIpFromNodeAndDeallocate.java | 74 -- .../SecurityGroupRuleToIpPermission.java | 99 -- .../functions/ServerInZoneToNodeMetadata.java | 199 ---- .../compute/loaders/CreateUniqueKeyPair.java | 79 -- .../loaders/FindSecurityGroupOrCreate.java | 86 -- .../loaders/LoadFloatingIpsForInstance.java | 63 -- .../compute/options/NovaTemplateOptions.java | 649 ------------ .../predicates/AllNodesInGroupTerminated.java | 56 -- ...desWithGroupEncodedIntoNameThenAddToSet.java | 165 ---- .../nova/v2_0/config/NovaParserModule.java | 159 --- .../nova/v2_0/config/NovaProperties.java | 43 - .../nova/v2_0/config/NovaRestClientModule.java | 191 ---- .../openstack/nova/v2_0/domain/Address.java | 138 --- .../openstack/nova/v2_0/domain/BackupType.java | 41 - .../openstack/nova/v2_0/domain/Flavor.java | 211 ---- .../openstack/nova/v2_0/domain/FloatingIP.java | 173 ---- .../openstack/nova/v2_0/domain/Host.java | 127 --- .../nova/v2_0/domain/HostAggregate.java | 250 ----- .../nova/v2_0/domain/HostResourceUsage.java | 180 ---- .../openstack/nova/v2_0/domain/Image.java | 303 ------ .../openstack/nova/v2_0/domain/Ingress.java | 160 --- .../openstack/nova/v2_0/domain/KeyPair.java | 189 ---- .../openstack/nova/v2_0/domain/Network.java | 173 ---- .../openstack/nova/v2_0/domain/Quota.java | 356 ------- .../openstack/nova/v2_0/domain/QuotaClass.java | 62 -- .../openstack/nova/v2_0/domain/RebootType.java | 35 - .../nova/v2_0/domain/SecurityGroup.java | 188 ---- .../nova/v2_0/domain/SecurityGroupRule.java | 174 ---- .../openstack/nova/v2_0/domain/Server.java | 476 --------- .../nova/v2_0/domain/ServerCreated.java | 127 --- .../v2_0/domain/ServerExtendedAttributes.java | 156 --- .../nova/v2_0/domain/ServerExtendedStatus.java | 155 --- .../v2_0/domain/ServerWithSecurityGroups.java | 128 --- .../nova/v2_0/domain/SimpleServerUsage.java | 312 ------ .../nova/v2_0/domain/SimpleTenantUsage.java | 245 ----- .../nova/v2_0/domain/TenantIdAndName.java | 127 --- .../nova/v2_0/domain/VirtualInterface.java | 128 --- .../openstack/nova/v2_0/domain/Volume.java | 346 ------- .../nova/v2_0/domain/VolumeAttachment.java | 172 ---- .../nova/v2_0/domain/VolumeSnapshot.java | 239 ----- .../openstack/nova/v2_0/domain/VolumeType.java | 192 ---- .../domain/zonescoped/AvailabilityZone.java | 73 -- .../v2_0/domain/zonescoped/FlavorInZone.java | 46 - .../v2_0/domain/zonescoped/ImageInZone.java | 46 - .../domain/zonescoped/SecurityGroupInZone.java | 46 - .../v2_0/domain/zonescoped/ServerInZone.java | 46 - .../nova/v2_0/domain/zonescoped/ZoneAndId.java | 86 -- .../v2_0/domain/zonescoped/ZoneAndName.java | 111 --- .../ZoneSecurityGroupNameAndPorts.java | 62 -- .../nova/v2_0/domain/zonescoped/ZoneState.java | 61 -- .../v2_0/extensions/AvailabilityZoneAPI.java | 40 - .../extensions/AvailabilityZoneAsyncApi.java | 58 -- .../v2_0/extensions/ExtensionNamespaces.java | 110 --- .../v2_0/extensions/FlavorExtraSpecsApi.java | 77 -- .../extensions/FlavorExtraSpecsAsyncApi.java | 118 --- .../nova/v2_0/extensions/FloatingIPApi.java | 98 -- .../v2_0/extensions/FloatingIPAsyncApi.java | 145 --- .../v2_0/extensions/HostAdministrationApi.java | 103 -- .../extensions/HostAdministrationAsyncApi.java | 157 --- .../nova/v2_0/extensions/HostAggregateApi.java | 87 -- .../v2_0/extensions/HostAggregateAsyncApi.java | 161 --- .../nova/v2_0/extensions/KeyPairApi.java | 65 -- .../nova/v2_0/extensions/KeyPairAsyncApi.java | 101 -- .../nova/v2_0/extensions/QuotaApi.java | 57 -- .../nova/v2_0/extensions/QuotaAsyncApi.java | 89 -- .../nova/v2_0/extensions/QuotaClassApi.java | 51 - .../v2_0/extensions/QuotaClassAsyncApi.java | 78 -- .../nova/v2_0/extensions/SecurityGroupApi.java | 89 -- .../v2_0/extensions/SecurityGroupAsyncApi.java | 152 --- .../nova/v2_0/extensions/ServerAdminApi.java | 120 --- .../v2_0/extensions/ServerAdminAsyncApi.java | 175 ---- .../extensions/ServerWithSecurityGroupsApi.java | 49 - .../ServerWithSecurityGroupsAsyncApi.java | 62 -- .../v2_0/extensions/SimpleTenantUsageApi.java | 50 - .../extensions/SimpleTenantUsageAsyncApi.java | 77 -- .../v2_0/extensions/VirtualInterfaceApi.java | 43 - .../extensions/VirtualInterfaceAsyncApi.java | 59 -- .../nova/v2_0/extensions/VolumeApi.java | 147 --- .../nova/v2_0/extensions/VolumeAsyncApi.java | 254 ----- .../v2_0/extensions/VolumeAttachmentApi.java | 87 -- .../extensions/VolumeAttachmentAsyncApi.java | 107 -- .../nova/v2_0/extensions/VolumeTypeApi.java | 101 -- .../v2_0/extensions/VolumeTypeAsyncApi.java | 161 --- .../openstack/nova/v2_0/features/FlavorApi.java | 78 -- .../nova/v2_0/features/FlavorAsyncApi.java | 144 --- .../openstack/nova/v2_0/features/ImageApi.java | 142 --- .../nova/v2_0/features/ImageAsyncApi.java | 206 ---- .../openstack/nova/v2_0/features/ServerApi.java | 276 ------ .../nova/v2_0/features/ServerAsyncApi.java | 356 ------- .../functions/FieldValueResponseParsers.java | 105 -- .../nova/v2_0/functions/OverLimitParser.java | 92 -- .../ParseImageIdFromLocationHeader.java | 39 - .../internal/OnlyMetadataValueOrNull.java | 63 -- .../functions/internal/ParseDiagnostics.java | 47 - .../functions/internal/ParseFlavorDetails.java | 94 -- .../v2_0/functions/internal/ParseFlavors.java | 96 -- .../functions/internal/ParseImageDetails.java | 95 -- .../v2_0/functions/internal/ParseImages.java | 96 -- .../v2_0/functions/internal/ParseKeyPairs.java | 64 -- .../functions/internal/ParseServerDetails.java | 94 -- .../v2_0/functions/internal/ParseServers.java | 96 -- .../nova/v2_0/handlers/NovaErrorHandler.java | 129 --- .../options/CreateBackupOfServerOptions.java | 105 -- .../nova/v2_0/options/CreateServerOptions.java | 557 ----------- .../nova/v2_0/options/CreateVolumeOptions.java | 220 ----- .../options/CreateVolumeSnapshotOptions.java | 138 --- .../v2_0/options/CreateVolumeTypeOptions.java | 101 -- .../nova/v2_0/options/ListOptions.java | 107 -- .../nova/v2_0/options/RebuildServerOptions.java | 142 --- .../FindSecurityGroupWithNameAndReturnTrue.java | 84 -- .../nova/v2_0/predicates/ImagePredicates.java | 55 -- .../nova/v2_0/predicates/KeyPairPredicates.java | 77 -- .../predicates/SecurityGroupPredicates.java | 213 ---- .../services/org.jclouds.apis.ApiMetadata | 1 - ...tKeyAndTenantIdAuthenticationExpectTest.java | 75 -- ...antNamePropertyAuthenticationExpectTest.java | 75 -- ...KeyAndSecretKeyAuthenticationExpectTest.java | 69 -- .../nova/v2_0/EndpointIdIsRandomExpectTest.java | 72 -- .../nova/v2_0/NovaApiMetadataTest.java | 32 - .../v2_0/PasswordAuthenticationExpectTest.java | 60 -- ...dAuthenticationWithTenantNameExpectTest.java | 69 -- .../NovaComputeServiceAdapterExpectTest.java | 321 ------ .../compute/NovaComputeServiceExpectTest.java | 382 ------- .../compute/NovaComputeServiceLiveTest.java | 96 -- .../NovaImageExtensionExpectTest.java | 92 -- .../extensions/NovaImageExtensionLiveTest.java | 43 - .../NovaSecurityGroupExtensionExpectTest.java | 433 -------- .../NovaSecurityGroupExtensionLiveTest.java | 35 - ...llocateAndAddFloatingIpToNodeExpectTest.java | 133 --- .../functions/FlavorInZoneToHardwareTest.java | 90 -- .../functions/ImageInZoneToImageTest.java | 95 -- .../functions/ImageToOperatingSystemTest.java | 192 ---- ...aSecurityGroupInZoneToSecurityGroupTest.java | 94 -- .../NovaSecurityGroupToSecurityGroupTest.java | 155 --- .../functions/OrphanedGroupsByZoneIdTest.java | 96 -- .../SecurityGroupRuleToIpPermissionTest.java | 81 -- .../ServerInZoneToNodeMetadataTest.java | 311 ------ .../loaders/CreateUniqueKeyPairTest.java | 111 --- .../loaders/FindSecurityGroupOrCreateTest.java | 144 --- .../loaders/LoadFloatingIpsForInstanceTest.java | 108 -- .../options/NovaTemplateOptionsTest.java | 263 ----- .../extensions/AdminActionsApiExpectTest.java | 350 ------- .../extensions/AdminActionsApiLiveTest.java | 195 ---- .../AvailabilityZoneApiExpectTest.java | 64 -- .../AvailabilityZonesApiLiveTest.java | 45 - .../FlavorExtraSpecsApiExpectTest.java | 142 --- .../extensions/FlavorExtraSpecsApiLiveTest.java | 123 --- .../extensions/FloatingIPApiExpectTest.java | 191 ---- .../v2_0/extensions/FloatingIPApiLiveTest.java | 171 ---- .../HostAdministrationApiExpectTest.java | 241 ----- .../HostAdministrationApiLiveTest.java | 116 --- .../extensions/HostAggregateApiExpectTest.java | 179 ---- .../extensions/HostAggregateApiLiveTest.java | 148 --- .../v2_0/extensions/KeyPairApiExpectTest.java | 142 --- .../v2_0/extensions/KeyPairApiLiveTest.java | 76 -- .../v2_0/extensions/QuotaApiExpectTest.java | 125 --- .../nova/v2_0/extensions/QuotaApiLiveTest.java | 100 -- .../extensions/QuotaClassApiExpectTest.java | 105 -- .../v2_0/extensions/QuotaClassApiLiveTest.java | 73 -- .../extensions/SecurityGroupApiExpectTest.java | 235 ----- .../extensions/SecurityGroupApiLiveTest.java | 100 -- .../ServerWithSecurityGroupsApiExpectTest.java | 63 -- .../ServerWithSecurityGroupsApiLiveTest.java | 80 -- .../SimpleTenantUsageApiExpectTest.java | 99 -- .../SimpleTenantUsageApiLiveTest.java | 51 - .../VirtualInterfaceApiExpectTest.java | 64 -- .../extensions/VirtualInterfaceApiLiveTest.java | 68 -- .../v2_0/extensions/VolumeApiExpectTest.java | 460 --------- .../nova/v2_0/extensions/VolumeApiLiveTest.java | 274 ------ .../VolumeAttachmentApiExpectTest.java | 168 ---- .../extensions/VolumeAttachmentApiLiveTest.java | 156 --- .../extensions/VolumeTypeApiExpectTest.java | 259 ----- .../v2_0/extensions/VolumeTypeApiLiveTest.java | 126 --- .../v2_0/features/ExtensionApiExpectTest.java | 115 --- .../v2_0/features/ExtensionApiLiveTest.java | 84 -- .../nova/v2_0/features/FlavorApiExpectTest.java | 164 --- .../nova/v2_0/features/FlavorApiLiveTest.java | 105 -- .../nova/v2_0/features/ImageApiExpectTest.java | 377 ------- .../nova/v2_0/features/ImageApiLiveTest.java | 101 -- .../nova/v2_0/features/ServerApiExpectTest.java | 746 -------------- .../nova/v2_0/features/ServerApiLiveTest.java | 206 ---- .../CreateSecurityGroupIfNeededTest.java | 168 ---- ...ityGroupWithNameAndReturnTrueExpectTest.java | 102 -- .../v2_0/functions/InternalURLLiveTest.java | 64 -- .../v2_0/handlers/NovaErrorHandlerTest.java | 225 ----- .../v2_0/internal/BaseNovaApiExpectTest.java | 28 - .../nova/v2_0/internal/BaseNovaApiLiveTest.java | 120 --- ...BaseNovaComputeServiceContextExpectTest.java | 87 -- .../BaseNovaComputeServiceExpectTest.java | 35 - .../nova/v2_0/internal/BaseNovaExpectTest.java | 84 -- ...eComputeServiceTypicalSecurityGroupTest.java | 76 -- .../nova/v2_0/parse/ParseCreateFlavorTest.java | 58 -- .../nova/v2_0/parse/ParseCreatedServerTest.java | 80 -- .../parse/ParseExtensionListNormalTest.java | 76 -- .../nova/v2_0/parse/ParseExtensionListTest.java | 88 -- .../nova/v2_0/parse/ParseExtensionTest.java | 71 -- .../nova/v2_0/parse/ParseFlavorListTest.java | 85 -- .../nova/v2_0/parse/ParseFlavorTest.java | 70 -- .../v2_0/parse/ParseFloatingIPListTest.java | 59 -- .../nova/v2_0/parse/ParseFloatingIPTest.java | 53 - .../nova/v2_0/parse/ParseImageListTest.java | 85 -- .../nova/v2_0/parse/ParseImageTest.java | 98 -- .../nova/v2_0/parse/ParseKeyPairListTest.java | 68 -- .../nova/v2_0/parse/ParseKeyPairTest.java | 61 -- .../nova/v2_0/parse/ParseMetadataItemTest.java | 58 -- .../nova/v2_0/parse/ParseMetadataListTest.java | 63 -- .../v2_0/parse/ParseMetadataUpdateTest.java | 64 -- .../v2_0/parse/ParseSecurityGroupListTest.java | 72 -- .../nova/v2_0/parse/ParseSecurityGroupTest.java | 69 -- .../v2_0/parse/ParseServerDetailsEssexTest.java | 170 ---- .../nova/v2_0/parse/ParseServerDiagnostics.java | 57 -- .../nova/v2_0/parse/ParseServerListTest.java | 85 -- .../nova/v2_0/parse/ParseServerTest.java | 117 --- .../parse/ParseServerWithAllExtensionsTest.java | 104 -- .../ParseServerWithInternetAddressesTest.java | 99 -- ...ublicIpsInPrivateAddressBlockExpectTest.java | 99 -- .../v2_0/predicates/ImagePredicatesTest.java | 44 - .../predicates/SecurityGroupPredicatesTest.java | 129 --- .../src/test/resources/attachment_details.json | 1 - .../src/test/resources/attachment_list.json | 1 - .../src/test/resources/extension_details.json | 21 - .../src/test/resources/extension_list.json | 42 - .../src/test/resources/extension_list_full.json | 281 ------ .../test/resources/extension_list_normal.json | 31 - .../resources/extension_list_openstack.json | 115 --- .../src/test/resources/flavor_details.json | 19 - .../src/test/resources/flavor_list.json | 32 - .../src/test/resources/flavor_list_detail.json | 1 - .../resources/flavor_list_detail_openstack.json | 83 -- .../src/test/resources/flavor_new.json | 10 - .../src/test/resources/floatingip_details.json | 9 - .../src/test/resources/floatingip_list.json | 16 - .../1.7.1-stratos/src/test/resources/host.json | 1 - .../test/resources/host_aggregate_details.json | 1 - .../src/test/resources/host_aggregate_list.json | 1 - .../host_aggregate_with_host_details.json | 1 - .../src/test/resources/hosts_list.json | 1 - .../src/test/resources/image_active.json | 41 - .../src/test/resources/image_details.json | 41 - .../src/test/resources/image_list.json | 32 - .../src/test/resources/image_list_detail.json | 1 - .../image_list_detail_imageextension.json | 121 --- .../resources/image_list_detail_openstack.json | 81 -- .../src/test/resources/keypair_created.json | 9 - .../keypair_created_computeservice.json | 9 - .../src/test/resources/keypair_list.json | 18 - .../test/resources/listAvailabilityZones.json | 11 - .../src/test/resources/metadata_item.json | 5 - .../src/test/resources/metadata_list.json | 6 - .../src/test/resources/metadata_updated.json | 7 - .../src/test/resources/new_server.json | 41 - .../resources/new_server_disk_config_auto.json | 42 - .../new_server_disk_config_manual.json | 42 - .../src/test/resources/new_server_in_zone.json | 41 - .../resources/new_server_networks_response.json | 42 - .../test/resources/new_server_no_adminpass.json | 40 - .../resources/new_server_nova_networks.json | 41 - .../src/test/resources/quota_class.json | 15 - .../src/test/resources/quotas.json | 15 - .../test/resources/securitygroup_created.json | 9 - .../test/resources/securitygroup_details.json | 34 - ...itygroup_details_computeservice_typical.json | 51 - .../securitygroup_details_extension.json | 34 - ...securitygroup_details_extension_norules.json | 10 - .../resources/securitygroup_details_port22.json | 19 - .../src/test/resources/securitygroup_list.json | 51 - ...oup_list_details_computeservice_typical.json | 53 - .../resources/securitygroup_list_extension.json | 51 - .../resources/securitygrouprule_created.json | 12 - .../securitygrouprule_created_cidr.json | 13 - .../securitygrouprule_created_group.json | 14 - .../src/test/resources/server_details.json | 86 -- .../test/resources/server_details_devstack.json | 44 - .../resources/server_details_openstack.json | 46 - .../src/test/resources/server_diagnostics.json | 17 - .../src/test/resources/server_list.json | 32 - .../src/test/resources/server_list_details.json | 79 -- .../resources/server_list_details_essex.json | 152 --- .../resources/server_public_ip_in_private.json | 51 - .../resources/server_with_security_groups.json | 1 - .../server_with_security_groups_extension.json | 1 - .../src/test/resources/simple_tenant_usage.json | 1 - .../test/resources/simple_tenant_usages.json | 1 - .../src/test/resources/snapshot_details.json | 1 - .../src/test/resources/snapshot_list.json | 1 - .../test/resources/snapshot_list_detail.json | 1 - .../test/resources/virtual_interfaces_list.json | 1 - .../src/test/resources/volume_details.json | 1 - .../src/test/resources/volume_list.json | 1 - .../src/test/resources/volume_list_detail.json | 1 - .../src/test/resources/volume_type.json | 9 - .../test/resources/volume_type_extra_specs.json | 1 - .../src/test/resources/volume_type_list.json | 1 - .../openstack-nova/1.8.0-stratos/README.txt | 3 + .../apis/openstack-nova/1.8.0-stratos/pom.xml | 157 +++ .../jclouds/openstack/nova/v2_0/NovaApi.java | 204 ++++ .../openstack/nova/v2_0/NovaApiMetadata.java | 111 +++ .../v2_0/binders/BindConsoleToJsonPayload.java | 63 ++ .../v2_0/binders/BindKeyPairToJsonPayload.java | 43 + .../v2_0/binders/BindMetadataToJsonPayload.java | 43 + .../BindSecurityGroupRuleToJsonPayload.java | 66 ++ .../nova/v2_0/compute/NovaComputeService.java | 180 ++++ .../v2_0/compute/NovaComputeServiceAdapter.java | 287 ++++++ .../config/NovaComputeServiceContextModule.java | 293 ++++++ .../compute/extensions/NovaImageExtension.java | 137 +++ .../extensions/NovaSecurityGroupExtension.java | 371 +++++++ .../AllocateAndAddFloatingIpToNode.java | 151 +++ .../functions/CreateSecurityGroupIfNeeded.java | 89 ++ .../functions/FlavorInZoneToHardware.java | 58 ++ .../compute/functions/ImageInZoneToImage.java | 68 ++ .../functions/ImageToOperatingSystem.java | 126 +++ .../NovaSecurityGroupInZoneToSecurityGroup.java | 73 ++ .../NovaSecurityGroupToSecurityGroup.java | 67 ++ .../functions/OrphanedGroupsByZoneId.java | 73 ++ .../RemoveFloatingIpFromNodeAndDeallocate.java | 72 ++ .../SecurityGroupRuleToIpPermission.java | 97 ++ .../functions/ServerInZoneToNodeMetadata.java | 207 ++++ .../compute/loaders/CreateUniqueKeyPair.java | 76 ++ .../loaders/FindSecurityGroupOrCreate.java | 82 ++ .../loaders/LoadFloatingIpsForInstance.java | 61 ++ .../options/NodeAndNovaTemplateOptions.java | 54 + .../compute/options/NovaTemplateOptions.java | 696 +++++++++++++ .../predicates/AllNodesInGroupTerminated.java | 53 + ...desWithGroupEncodedIntoNameThenAddToSet.java | 172 ++++ .../nova/v2_0/config/NovaHttpApiModule.java | 116 +++ .../nova/v2_0/config/NovaParserModule.java | 176 ++++ .../nova/v2_0/config/NovaProperties.java | 41 + .../openstack/nova/v2_0/domain/Address.java | 137 +++ .../openstack/nova/v2_0/domain/BackupType.java | 38 + .../openstack/nova/v2_0/domain/Console.java | 161 +++ .../openstack/nova/v2_0/domain/Flavor.java | 210 ++++ .../openstack/nova/v2_0/domain/FloatingIP.java | 188 ++++ .../openstack/nova/v2_0/domain/Host.java | 127 +++ .../nova/v2_0/domain/HostAggregate.java | 250 +++++ .../nova/v2_0/domain/HostResourceUsage.java | 180 ++++ .../openstack/nova/v2_0/domain/Image.java | 301 ++++++ .../openstack/nova/v2_0/domain/Ingress.java | 159 +++ .../openstack/nova/v2_0/domain/KeyPair.java | 189 ++++ .../openstack/nova/v2_0/domain/Network.java | 172 ++++ .../openstack/nova/v2_0/domain/Quota.java | 356 +++++++ .../openstack/nova/v2_0/domain/RebootType.java | 31 + .../nova/v2_0/domain/SecurityGroup.java | 188 ++++ .../nova/v2_0/domain/SecurityGroupRule.java | 174 ++++ .../openstack/nova/v2_0/domain/Server.java | 482 +++++++++ .../nova/v2_0/domain/ServerCreated.java | 126 +++ .../v2_0/domain/ServerExtendedAttributes.java | 155 +++ .../nova/v2_0/domain/ServerExtendedStatus.java | 154 +++ .../v2_0/domain/ServerWithSecurityGroups.java | 127 +++ .../nova/v2_0/domain/SimpleServerUsage.java | 311 ++++++ .../nova/v2_0/domain/SimpleTenantUsage.java | 244 +++++ .../nova/v2_0/domain/TenantIdAndName.java | 126 +++ .../nova/v2_0/domain/VirtualInterface.java | 127 +++ .../openstack/nova/v2_0/domain/Volume.java | 346 +++++++ .../nova/v2_0/domain/VolumeAttachment.java | 172 ++++ .../nova/v2_0/domain/VolumeSnapshot.java | 239 +++++ .../openstack/nova/v2_0/domain/VolumeType.java | 192 ++++ .../domain/zonescoped/AvailabilityZone.java | 68 ++ .../v2_0/domain/zonescoped/FlavorInZone.java | 43 + .../v2_0/domain/zonescoped/ImageInZone.java | 43 + .../domain/zonescoped/SecurityGroupInZone.java | 43 + .../v2_0/domain/zonescoped/ServerInZone.java | 43 + .../nova/v2_0/domain/zonescoped/ZoneAndId.java | 83 ++ .../v2_0/domain/zonescoped/ZoneAndName.java | 109 ++ .../ZoneSecurityGroupNameAndPorts.java | 59 ++ .../nova/v2_0/domain/zonescoped/ZoneState.java | 56 ++ .../v2_0/extensions/AvailabilityZoneApi.java | 54 + .../nova/v2_0/extensions/ConsolesApi.java | 66 ++ .../v2_0/extensions/ExtensionNamespaces.java | 113 +++ .../v2_0/extensions/FlavorExtraSpecsApi.java | 130 +++ .../nova/v2_0/extensions/FloatingIPApi.java | 154 +++ .../v2_0/extensions/HostAdministrationApi.java | 168 ++++ .../nova/v2_0/extensions/HostAggregateApi.java | 157 +++ .../nova/v2_0/extensions/KeyPairApi.java | 126 +++ .../nova/v2_0/extensions/QuotaApi.java | 93 ++ .../nova/v2_0/extensions/SecurityGroupApi.java | 154 +++ .../nova/v2_0/extensions/ServerAdminApi.java | 199 ++++ .../extensions/ServerWithSecurityGroupsApi.java | 68 ++ .../v2_0/extensions/SimpleTenantUsageApi.java | 72 ++ .../v2_0/extensions/VirtualInterfaceApi.java | 59 ++ .../nova/v2_0/extensions/VolumeApi.java | 247 +++++ .../v2_0/extensions/VolumeAttachmentApi.java | 132 +++ .../nova/v2_0/extensions/VolumeTypeApi.java | 180 ++++ .../openstack/nova/v2_0/features/FlavorApi.java | 136 +++ .../openstack/nova/v2_0/features/ImageApi.java | 231 +++++ .../openstack/nova/v2_0/features/ServerApi.java | 433 ++++++++ .../functions/FieldValueResponseParsers.java | 105 ++ .../nova/v2_0/functions/OverLimitParser.java | 89 ++ .../ParseImageIdFromLocationHeader.java | 37 + .../internal/OnlyMetadataValueOrNull.java | 59 ++ .../functions/internal/ParseDiagnostics.java | 44 + .../functions/internal/ParseFlavorDetails.java | 92 ++ .../v2_0/functions/internal/ParseFlavors.java | 94 ++ .../functions/internal/ParseImageDetails.java | 93 ++ .../v2_0/functions/internal/ParseImages.java | 94 ++ .../v2_0/functions/internal/ParseKeyPairs.java | 60 ++ .../functions/internal/ParseServerDetails.java | 92 ++ .../v2_0/functions/internal/ParseServers.java | 94 ++ .../nova/v2_0/handlers/NovaErrorHandler.java | 126 +++ .../options/CreateBackupOfServerOptions.java | 102 ++ .../nova/v2_0/options/CreateServerOptions.java | 553 +++++++++++ .../nova/v2_0/options/CreateVolumeOptions.java | 217 ++++ .../options/CreateVolumeSnapshotOptions.java | 135 +++ .../v2_0/options/CreateVolumeTypeOptions.java | 98 ++ .../nova/v2_0/options/ListOptions.java | 106 ++ .../nova/v2_0/options/RebuildServerOptions.java | 138 +++ .../FindSecurityGroupWithNameAndReturnTrue.java | 82 ++ .../nova/v2_0/predicates/ImagePredicates.java | 53 + .../nova/v2_0/predicates/KeyPairPredicates.java | 75 ++ .../predicates/SecurityGroupPredicates.java | 211 ++++ .../nova/v2_0/predicates/ServerPredicates.java | 117 +++ .../services/org.jclouds.apis.ApiMetadata | 1 + ...tKeyAndTenantIdAuthenticationExpectTest.java | 74 ++ ...antNamePropertyAuthenticationExpectTest.java | 74 ++ ...KeyAndSecretKeyAuthenticationExpectTest.java | 68 ++ .../nova/v2_0/EndpointIdIsRandomExpectTest.java | 70 ++ .../nova/v2_0/NovaApiMetadataTest.java | 28 + .../v2_0/PasswordAuthenticationExpectTest.java | 59 ++ ...dAuthenticationWithTenantNameExpectTest.java | 68 ++ .../NovaComputeServiceAdapterExpectTest.java | 424 ++++++++ .../compute/NovaComputeServiceExpectTest.java | 381 +++++++ .../compute/NovaComputeServiceLiveTest.java | 92 ++ .../NovaImageExtensionExpectTest.java | 88 ++ .../extensions/NovaImageExtensionLiveTest.java | 40 + .../NovaSecurityGroupExtensionExpectTest.java | 429 ++++++++ .../NovaSecurityGroupExtensionLiveTest.java | 32 + ...llocateAndAddFloatingIpToNodeExpectTest.java | 179 ++++ .../functions/FlavorInZoneToHardwareTest.java | 88 ++ .../functions/ImageInZoneToImageTest.java | 93 ++ .../functions/ImageToOperatingSystemTest.java | 190 ++++ ...aSecurityGroupInZoneToSecurityGroupTest.java | 91 ++ .../NovaSecurityGroupToSecurityGroupTest.java | 152 +++ .../functions/OrphanedGroupsByZoneIdTest.java | 91 ++ .../SecurityGroupRuleToIpPermissionTest.java | 79 ++ .../ServerInZoneToNodeMetadataTest.java | 341 +++++++ .../loaders/CreateUniqueKeyPairTest.java | 108 ++ .../loaders/FindSecurityGroupOrCreateTest.java | 141 +++ .../loaders/LoadFloatingIpsForInstanceTest.java | 105 ++ .../options/NovaTemplateOptionsTest.java | 261 +++++ .../extensions/AdminActionsApiExpectTest.java | 349 +++++++ .../extensions/AdminActionsApiLiveTest.java | 193 ++++ .../AvailabilityZoneApiExpectTest.java | 59 ++ .../AvailabilityZonesApiLiveTest.java | 43 + .../v2_0/extensions/ConsolesApiLiveTest.java | 64 ++ .../v2_0/extensions/ConsolesApiMockTest.java | 144 +++ .../FlavorExtraSpecsApiExpectTest.java | 140 +++ .../extensions/FlavorExtraSpecsApiLiveTest.java | 121 +++ .../extensions/FloatingIPApiExpectTest.java | 189 ++++ .../v2_0/extensions/FloatingIPApiLiveTest.java | 169 ++++ .../HostAdministrationApiExpectTest.java | 239 +++++ .../HostAdministrationApiLiveTest.java | 114 +++ .../extensions/HostAggregateApiExpectTest.java | 177 ++++ .../extensions/HostAggregateApiLiveTest.java | 146 +++ .../v2_0/extensions/KeyPairApiExpectTest.java | 175 ++++ .../v2_0/extensions/KeyPairApiLiveTest.java | 84 ++ .../v2_0/extensions/QuotaApiExpectTest.java | 125 +++ .../nova/v2_0/extensions/QuotaApiLiveTest.java | 98 ++ .../extensions/SecurityGroupApiExpectTest.java | 233 +++++ .../extensions/SecurityGroupApiLiveTest.java | 98 ++ .../ServerWithSecurityGroupsApiExpectTest.java | 61 ++ .../ServerWithSecurityGroupsApiLiveTest.java | 78 ++ .../SimpleTenantUsageApiExpectTest.java | 97 ++ .../SimpleTenantUsageApiLiveTest.java | 49 + .../VirtualInterfaceApiExpectTest.java | 62 ++ .../extensions/VirtualInterfaceApiLiveTest.java | 66 ++ .../v2_0/extensions/VolumeApiExpectTest.java | 458 +++++++++ .../nova/v2_0/extensions/VolumeApiLiveTest.java | 282 ++++++ .../VolumeAttachmentApiExpectTest.java | 166 ++++ .../extensions/VolumeAttachmentApiLiveTest.java | 154 +++ .../extensions/VolumeTypeApiExpectTest.java | 257 +++++ .../v2_0/extensions/VolumeTypeApiLiveTest.java | 124 +++ .../v2_0/features/ExtensionApiExpectTest.java | 110 +++ .../v2_0/features/ExtensionApiLiveTest.java | 82 ++ .../nova/v2_0/features/FlavorApiExpectTest.java | 156 +++ .../nova/v2_0/features/FlavorApiLiveTest.java | 103 ++ .../nova/v2_0/features/ImageApiExpectTest.java | 366 +++++++ .../nova/v2_0/features/ImageApiLiveTest.java | 99 ++ .../nova/v2_0/features/ServerApiExpectTest.java | 735 ++++++++++++++ .../nova/v2_0/features/ServerApiLiveTest.java | 218 ++++ .../CreateSecurityGroupIfNeededTest.java | 164 +++ ...ityGroupWithNameAndReturnTrueExpectTest.java | 98 ++ .../v2_0/functions/InternalURLLiveTest.java | 63 ++ .../v2_0/handlers/NovaErrorHandlerTest.java | 221 +++++ .../v2_0/internal/BaseNovaApiExpectTest.java | 26 + .../nova/v2_0/internal/BaseNovaApiLiveTest.java | 134 +++ ...BaseNovaComputeServiceContextExpectTest.java | 87 ++ .../BaseNovaComputeServiceExpectTest.java | 33 + .../nova/v2_0/internal/BaseNovaExpectTest.java | 82 ++ ...eComputeServiceTypicalSecurityGroupTest.java | 72 ++ .../nova/v2_0/parse/ParseCreateFlavorTest.java | 55 ++ .../nova/v2_0/parse/ParseCreatedServerTest.java | 77 ++ .../parse/ParseExtensionListNormalTest.java | 72 ++ .../nova/v2_0/parse/ParseExtensionListTest.java | 84 ++ .../nova/v2_0/parse/ParseExtensionTest.java | 68 ++ .../nova/v2_0/parse/ParseFlavorListTest.java | 81 ++ .../nova/v2_0/parse/ParseFlavorTest.java | 67 ++ .../v2_0/parse/ParseFloatingIPListTest.java | 61 ++ .../nova/v2_0/parse/ParseFloatingIPTest.java | 53 + .../nova/v2_0/parse/ParseImageListTest.java | 81 ++ .../nova/v2_0/parse/ParseImageTest.java | 95 ++ .../nova/v2_0/parse/ParseKeyPairListTest.java | 64 ++ .../nova/v2_0/parse/ParseKeyPairTest.java | 60 ++ .../nova/v2_0/parse/ParseMetadataItemTest.java | 54 + .../nova/v2_0/parse/ParseMetadataListTest.java | 59 ++ .../v2_0/parse/ParseMetadataUpdateTest.java | 60 ++ .../nova/v2_0/parse/ParseNOVNCConsoleTest.java | 69 ++ .../nova/v2_0/parse/ParseRDPConsoleTest.java | 70 ++ .../nova/v2_0/parse/ParseSPICEConsoleTest.java | 70 ++ .../v2_0/parse/ParseSecurityGroupListTest.java | 68 ++ .../nova/v2_0/parse/ParseSecurityGroupTest.java | 65 ++ .../v2_0/parse/ParseServerDetailsEssexTest.java | 167 ++++ .../parse/ParseServerDetailsStatesTest.java | 252 +++++ .../nova/v2_0/parse/ParseServerDiagnostics.java | 53 + .../nova/v2_0/parse/ParseServerListTest.java | 81 ++ .../nova/v2_0/parse/ParseServerTest.java | 114 +++ .../parse/ParseServerWithAllExtensionsTest.java | 101 ++ .../ParseServerWithInternetAddressesTest.java | 96 ++ .../v2_0/parse/ParseServerWithoutImageTest.java | 99 ++ .../nova/v2_0/parse/ParseXVPVNCConsoleTest.java | 68 ++ ...ublicIpsInPrivateAddressBlockExpectTest.java | 96 ++ .../v2_0/predicates/ImagePredicatesTest.java | 40 + .../predicates/SecurityGroupPredicatesTest.java | 125 +++ .../predicates/ServerPredicatesMockTest.java | 105 ++ .../src/test/resources/access.json | 228 +++++ .../src/test/resources/attachment_details.json | 8 + .../src/test/resources/attachment_list.json | 10 + .../src/test/resources/extension_details.json | 21 + .../src/test/resources/extension_list.json | 42 + .../src/test/resources/extension_list_full.json | 284 ++++++ .../test/resources/extension_list_normal.json | 36 + .../resources/extension_list_openstack.json | 140 +++ .../src/test/resources/flavor_details.json | 19 + .../src/test/resources/flavor_list.json | 32 + .../src/test/resources/flavor_list_detail.json | 124 +++ .../resources/flavor_list_detail_openstack.json | 104 ++ .../src/test/resources/flavor_new.json | 10 + .../src/test/resources/floatingip_details.json | 9 + .../src/test/resources/floatingip_list.json | 30 + .../1.8.0-stratos/src/test/resources/host.json | 40 + .../test/resources/host_aggregate_details.json | 17 + .../src/test/resources/host_aggregate_list.json | 19 + .../host_aggregate_with_host_details.json | 19 + .../src/test/resources/hosts_list.json | 8 + .../src/test/resources/image_active.json | 41 + .../src/test/resources/image_details.json | 41 + .../src/test/resources/image_list.json | 32 + .../src/test/resources/image_list_detail.json | 503 ++++++++++ .../image_list_detail_imageextension.json | 146 +++ .../resources/image_list_detail_openstack.json | 98 ++ .../keypair_created_computeservice.json | 9 + .../src/test/resources/keypair_details.json | 9 + .../src/test/resources/keypair_list.json | 18 + .../test/resources/listAvailabilityZones.json | 11 + .../src/test/resources/metadata_item.json | 5 + .../src/test/resources/metadata_list.json | 6 + .../src/test/resources/metadata_updated.json | 7 + .../src/test/resources/new_server.json | 48 + .../test/resources/new_server_config_drive.json | 42 + .../resources/new_server_disk_config_auto.json | 49 + .../new_server_disk_config_manual.json | 49 + .../src/test/resources/new_server_in_zone.json | 48 + .../resources/new_server_networks_response.json | 42 + .../test/resources/new_server_no_adminpass.json | 40 + .../resources/new_server_nova_networks.json | 41 + .../src/test/resources/novnc_console.json | 7 + .../src/test/resources/quotas.json | 17 + .../src/test/resources/rdp_console.json | 7 + .../test/resources/securitygroup_created.json | 9 + .../test/resources/securitygroup_details.json | 33 + ...itygroup_details_computeservice_typical.json | 56 ++ .../securitygroup_details_extension.json | 33 + ...securitygroup_details_extension_norules.json | 9 + .../resources/securitygroup_details_port22.json | 21 + .../src/test/resources/securitygroup_list.json | 45 + ...oup_list_details_computeservice_typical.json | 58 ++ .../resources/securitygroup_list_extension.json | 45 + .../resources/securitygrouprule_created.json | 13 + .../securitygrouprule_created_cidr.json | 13 + .../securitygrouprule_created_group.json | 14 + .../src/test/resources/server_details.json | 86 ++ .../test/resources/server_details_devstack.json | 60 ++ .../resources/server_details_openstack.json | 55 ++ .../resources/server_details_without_image.json | 74 ++ .../src/test/resources/server_diagnostics.json | 17 + .../src/test/resources/server_list.json | 32 + .../src/test/resources/server_list_details.json | 78 ++ .../resources/server_list_details_essex.json | 188 ++++ .../resources/server_list_details_states.json | 342 +++++++ .../resources/server_public_ip_in_private.json | 61 ++ .../resources/server_with_security_groups.json | 62 ++ .../server_with_security_groups_extension.json | 59 ++ .../src/test/resources/simple_tenant_usage.json | 39 + .../test/resources/simple_tenant_usages.json | 13 + .../src/test/resources/snapshot_details.json | 11 + .../src/test/resources/snapshot_list.json | 13 + .../test/resources/snapshot_list_detail.json | 13 + .../src/test/resources/spice_console.json | 7 + .../test/resources/virtual_interfaces_list.json | 8 + .../src/test/resources/volume_details.json | 22 + .../src/test/resources/volume_list.json | 24 + .../src/test/resources/volume_list_detail.json | 24 + .../src/test/resources/volume_type.json | 14 + .../test/resources/volume_type_extra_specs.json | 5 + .../src/test/resources/volume_type_list.json | 16 + .../src/test/resources/xvpvnc_console.json | 7 + .../apis/vcloud/1.7.1-stratos/README.txt | 6 - .../jclouds/apis/vcloud/1.7.1-stratos/pom.xml | 131 --- .../vcloud/TaskInErrorStateException.java | 39 - .../vcloud/TaskStillRunningException.java | 39 - .../main/java/org/jclouds/vcloud/VCloudApi.java | 91 -- .../org/jclouds/vcloud/VCloudApiMetadata.java | 103 -- .../org/jclouds/vcloud/VCloudMediaType.java | 221 ----- .../jclouds/vcloud/VCloudResponseException.java | 69 -- .../java/org/jclouds/vcloud/VCloudToken.java | 37 - .../org/jclouds/vcloud/VCloudVersionsApi.java | 38 - .../binders/BindCPUCountToXmlPayload.java | 79 -- .../BindCaptureVAppParamsToXmlPayload.java | 124 --- .../binders/BindCatalogItemToXmlPayload.java | 126 --- .../binders/BindCloneParamsToXmlPayload.java | 133 --- .../BindCloneVAppParamsToXmlPayload.java | 65 -- ...BindCloneVAppTemplateParamsToXmlPayload.java | 60 -- .../BindDeployVAppParamsToXmlPayload.java | 42 - ...ndGuestCustomizationSectionToXmlPayload.java | 112 --- ...stantiateVAppTemplateParamsToXmlPayload.java | 221 ----- .../vcloud/binders/BindMemoryToXmlPayload.java | 80 -- ...indNetworkConnectionSectionToXmlPayload.java | 106 -- .../vcloud/binders/BindParamsToXmlPayload.java | 81 -- .../BindUndeployVAppParamsToXmlPayload.java | 42 - .../OrgNameAndCatalogNameToEndpoint.java | 79 -- .../binders/OrgNameAndVDCNameToEndpoint.java | 78 -- .../OrgNameCatalogNameItemNameToEndpoint.java | 77 -- ...meCatalogNameVAppTemplateNameToEndpoint.java | 90 -- .../OrgNameVDCNameNetworkNameToEndpoint.java | 54 - ...NameVDCNameResourceEntityNameToEndpoint.java | 54 - .../OrgNameVDCNameResourceNameToEndpoint.java | 81 -- .../VCloudComputeServiceContextModule.java | 39 - .../VCloudComputeServiceDependenciesModule.java | 154 --- .../functions/FindLocationForResource.java | 69 -- .../compute/functions/HardwareForVApp.java | 71 -- .../functions/HardwareForVAppTemplate.java | 84 -- .../compute/functions/ImageForVAppTemplate.java | 82 -- .../compute/functions/VAppToNodeMetadata.java | 112 --- ...dHardwareBuilderFromResourceAllocations.java | 43 - ...EnvelopeOrThrowIllegalArgumentException.java | 77 -- .../internal/VCloudTemplateBuilderImpl.java | 48 - .../compute/options/VCloudTemplateOptions.java | 350 ------- ...edIntoNameThenCustomizeDeployAndPowerOn.java | 302 ------ ...etworkConfigurationForNetworkAndOptions.java | 80 -- .../strategy/VCloudComputeServiceAdapter.java | 263 ----- .../vcloud/compute/util/VCloudComputeUtils.java | 116 --- .../vcloud/config/DefaultCatalogForOrg.java | 63 -- .../vcloud/config/DefaultNetworkForVDC.java | 65 -- .../vcloud/config/DefaultOrgForUser.java | 58 -- .../vcloud/config/DefaultTasksListForOrg.java | 53 - .../config/DefaultVCloudReferencesModule.java | 165 ---- .../jclouds/vcloud/config/DefaultVDCForOrg.java | 63 -- .../vcloud/config/VCloudHttpApiModule.java | 538 ---------- .../jclouds/vcloud/domain/AllocationModel.java | 70 -- .../org/jclouds/vcloud/domain/Capacity.java | 108 -- .../java/org/jclouds/vcloud/domain/Catalog.java | 69 -- .../org/jclouds/vcloud/domain/CatalogItem.java | 37 - .../domain/GuestCustomizationSection.java | 440 --------- .../domain/InstantiateVAppTemplateParams.java | 96 -- .../vcloud/domain/NetworkConnection.java | 233 ----- .../vcloud/domain/NetworkConnectionSection.java | 218 ---- .../java/org/jclouds/vcloud/domain/Org.java | 86 -- .../jclouds/vcloud/domain/ReferenceType.java | 55 -- .../java/org/jclouds/vcloud/domain/Status.java | 246 ----- .../java/org/jclouds/vcloud/domain/Task.java | 72 -- .../org/jclouds/vcloud/domain/TaskStatus.java | 71 -- .../org/jclouds/vcloud/domain/TasksList.java | 37 - .../java/org/jclouds/vcloud/domain/VApp.java | 87 -- .../org/jclouds/vcloud/domain/VAppTemplate.java | 97 -- .../org/jclouds/vcloud/domain/VCloudError.java | 123 --- .../jclouds/vcloud/domain/VCloudSession.java | 29 - .../java/org/jclouds/vcloud/domain/VDC.java | 146 --- .../org/jclouds/vcloud/domain/VDCStatus.java | 57 -- .../main/java/org/jclouds/vcloud/domain/Vm.java | 108 -- .../vcloud/domain/internal/CatalogImpl.java | 193 ---- .../vcloud/domain/internal/CatalogItemImpl.java | 111 --- .../vcloud/domain/internal/ErrorImpl.java | 119 --- .../jclouds/vcloud/domain/internal/OrgImpl.java | 171 ---- .../domain/internal/ReferenceTypeImpl.java | 103 -- .../vcloud/domain/internal/TaskImpl.java | 165 ---- .../vcloud/domain/internal/TasksListImpl.java | 81 -- .../vcloud/domain/internal/VAppImpl.java | 166 ---- .../domain/internal/VAppTemplateImpl.java | 205 ---- .../jclouds/vcloud/domain/internal/VDCImpl.java | 292 ------ .../jclouds/vcloud/domain/internal/VmImpl.java | 217 ---- .../vcloud/domain/network/DhcpService.java | 106 -- .../jclouds/vcloud/domain/network/Features.java | 95 -- .../vcloud/domain/network/FenceMode.java | 70 -- .../vcloud/domain/network/FirewallService.java | 86 -- .../domain/network/IpAddressAllocationMode.java | 52 - .../jclouds/vcloud/domain/network/IpRange.java | 76 -- .../jclouds/vcloud/domain/network/IpScope.java | 170 ---- .../vcloud/domain/network/NatService.java | 115 --- .../vcloud/domain/network/NetworkConfig.java | 167 ---- .../vcloud/domain/network/OrgNetwork.java | 121 --- .../domain/network/firewall/FirewallPolicy.java | 54 - .../network/firewall/FirewallProtocols.java | 73 -- .../domain/network/firewall/FirewallRule.java | 125 --- .../domain/network/internal/OrgNetworkImpl.java | 202 ---- .../vcloud/domain/network/nat/NatPolicy.java | 54 - .../vcloud/domain/network/nat/NatProtocol.java | 48 - .../vcloud/domain/network/nat/NatRule.java | 35 - .../vcloud/domain/network/nat/NatType.java | 61 -- .../domain/network/nat/rules/MappingMode.java | 54 - .../network/nat/rules/OneToOneVmRule.java | 110 --- .../network/nat/rules/PortForwardingRule.java | 111 --- .../vcloud/domain/network/nat/rules/VmRule.java | 128 --- .../EditableResourceAllocationSettingData.java | 302 ------ .../vcloud/domain/ovf/VCloudHardDisk.java | 330 ------- .../vcloud/domain/ovf/VCloudNetworkAdapter.java | 332 ------- .../vcloud/domain/ovf/VCloudNetworkSection.java | 80 -- .../ovf/VCloudOperatingSystemSection.java | 118 --- .../ovf/VCloudVirtualHardwareSection.java | 179 ---- .../org/jclouds/vcloud/endpoints/Catalog.java | 37 - .../org/jclouds/vcloud/endpoints/Network.java | 37 - .../java/org/jclouds/vcloud/endpoints/Org.java | 37 - .../org/jclouds/vcloud/endpoints/OrgList.java | 37 - .../org/jclouds/vcloud/endpoints/TasksList.java | 37 - .../jclouds/vcloud/endpoints/VCloudLogin.java | 38 - .../java/org/jclouds/vcloud/endpoints/VDC.java | 37 - .../org/jclouds/vcloud/features/CatalogApi.java | 144 --- .../org/jclouds/vcloud/features/NetworkApi.java | 61 -- .../org/jclouds/vcloud/features/OrgApi.java | 86 -- .../org/jclouds/vcloud/features/TaskApi.java | 82 -- .../org/jclouds/vcloud/features/VAppApi.java | 261 ----- .../vcloud/features/VAppTemplateApi.java | 180 ---- .../org/jclouds/vcloud/features/VDCApi.java | 73 -- .../java/org/jclouds/vcloud/features/VmApi.java | 295 ------ ...ddVCloudAuthorizationAndCookieToRequest.java | 63 -- .../vcloud/functions/CatalogItemsInCatalog.java | 64 -- .../vcloud/functions/CatalogItemsInOrg.java | 57 -- .../jclouds/vcloud/functions/CatalogsInOrg.java | 73 -- .../functions/DefaultNetworkNameInTemplate.java | 47 - .../jclouds/vcloud/functions/NetworksInOrg.java | 57 -- .../vcloud/functions/OrgNameToEndpoint.java | 57 -- .../functions/OrgNameToTasksListEndpoint.java | 62 -- .../vcloud/functions/OrgsForLocations.java | 73 -- .../jclouds/vcloud/functions/OrgsForNames.java | 56 -- .../ParseLoginResponseFromHeaders.java | 105 -- .../functions/VAppTemplatesForCatalogItems.java | 66 -- .../vcloud/functions/VAppTemplatesInOrg.java | 65 -- .../org/jclouds/vcloud/functions/VDCsInOrg.java | 57 -- .../ParseVCloudErrorFromHttpResponse.java | 121 --- .../http/filters/VCloudBasicAuthentication.java | 58 -- .../http/filters/VCloudSupportedVersions.java | 35 - .../jclouds/vcloud/internal/VCloudLoginApi.java | 44 - .../org/jclouds/vcloud/loaders/OVFLoader.java | 47 - .../vcloud/loaders/VAppTemplateLoader.java | 47 - .../org/jclouds/vcloud/location/DefaultVDC.java | 74 -- .../location/OrgAndVDCToLocationSupplier.java | 93 -- .../vcloud/options/CaptureVAppOptions.java | 51 - .../vcloud/options/CatalogItemOptions.java | 77 -- .../jclouds/vcloud/options/CloneOptions.java | 53 - .../vcloud/options/CloneVAppOptions.java | 88 -- .../options/CloneVAppTemplateOptions.java | 42 - .../options/InstantiateVAppTemplateOptions.java | 178 ---- .../jclouds/vcloud/predicates/TaskSuccess.java | 65 -- .../vcloud/reference/VCloudConstants.java | 51 - .../jclouds/vcloud/reference/package-info.java | 21 - ...thNameMatchingConfigurationKeyOrDefault.java | 99 -- .../vcloud/suppliers/VAppTemplatesSupplier.java | 86 -- .../java/org/jclouds/vcloud/util/Utils.java | 71 -- .../org/jclouds/vcloud/util/VCloudUtils.java | 67 -- .../org/jclouds/vcloud/xml/CatalogHandler.java | 104 -- .../jclouds/vcloud/xml/CatalogItemHandler.java | 81 -- .../org/jclouds/vcloud/xml/ErrorHandler.java | 45 - .../xml/GuestCustomizationSectionHandler.java | 137 --- .../vcloud/xml/NetworkConnectionHandler.java | 87 -- .../xml/NetworkConnectionSectionHandler.java | 103 -- .../java/org/jclouds/vcloud/xml/OrgHandler.java | 112 --- .../org/jclouds/vcloud/xml/OrgListHandler.java | 54 - .../jclouds/vcloud/xml/OrgNetworkHandler.java | 325 ------ .../vcloud/xml/SupportedVersionsHandler.java | 60 -- .../org/jclouds/vcloud/xml/TaskHandler.java | 128 --- .../jclouds/vcloud/xml/TasksListHandler.java | 74 -- .../org/jclouds/vcloud/xml/VAppHandler.java | 151 --- .../jclouds/vcloud/xml/VAppTemplateHandler.java | 152 --- .../xml/VCloudVirtualHardwareHandler.java | 72 -- .../java/org/jclouds/vcloud/xml/VDCHandler.java | 167 ---- .../java/org/jclouds/vcloud/xml/VmHandler.java | 178 ---- .../xml/ovf/VCloudNetworkSectionHandler.java | 69 -- .../xml/ovf/VCloudOperatingSystemHandler.java | 81 -- ...oudResourceAllocationSettingDataHandler.java | 89 -- .../services/org.jclouds.apis.ApiMetadata | 1 - .../jclouds/vcloud/VCloudApiMetadataTest.java | 32 - .../java/org/jclouds/vcloud/VCloudApiTest.java | 64 -- .../vcloud/VCloudSessionRefreshLiveTest.java | 41 - .../jclouds/vcloud/VCloudVersionsApiTest.java | 69 -- .../BindCatalogItemToXmlPayloadTest.java | 53 - .../BindCloneVAppParamsToXmlPayloadTest.java | 81 -- ...CloneVAppTemplateParamsToXmlPayloadTest.java | 89 -- .../BindDeployVAppParamsToXmlPayloadTest.java | 61 -- ...tiateVAppTemplateParamsToXmlPayloadTest.java | 179 ---- ...etworkConnectionSectionToXmlPayloadTest.java | 68 -- .../BindUndeployVAppParamsToXmlPayloadTest.java | 61 -- .../BaseVCloudComputeServiceExpectTest.java | 160 --- .../compute/VCloudComputeServiceLiveTest.java | 54 - .../functions/FindLocationForResourceTest.java | 64 -- .../functions/ListImagesInVCloudExpectTest.java | 89 -- .../functions/VAppToNodeMetadataTest.java | 228 ----- .../options/VCloudTemplateOptionsTest.java | 197 ---- ...ThenCustomizeDeployAndPowerOnExpectTest.java | 171 ---- .../VCloudComputeServiceAdapterTest.java | 89 -- .../vcloud/features/CatalogApiLiveTest.java | 53 - .../jclouds/vcloud/features/CatalogApiTest.java | 131 --- .../vcloud/features/NetworkApiLiveTest.java | 29 - .../jclouds/vcloud/features/NetworkApiTest.java | 75 -- .../jclouds/vcloud/features/OrgApiLiveTest.java | 42 - .../org/jclouds/vcloud/features/OrgApiTest.java | 91 -- .../vcloud/features/TaskApiLiveTest.java | 29 - .../jclouds/vcloud/features/TaskApiTest.java | 108 -- .../vcloud/features/VAppApiLiveTest.java | 53 - .../jclouds/vcloud/features/VAppApiTest.java | 315 ------ .../features/VAppTemplateApiLiveTest.java | 168 ---- .../vcloud/features/VAppTemplateApiTest.java | 238 ----- .../jclouds/vcloud/features/VDCApiLiveTest.java | 29 - .../org/jclouds/vcloud/features/VDCApiTest.java | 102 -- .../jclouds/vcloud/features/VmApiLiveTest.java | 163 --- .../org/jclouds/vcloud/features/VmApiTest.java | 320 ------ ...loudAuthorizationAndCookieToRequestTest.java | 55 -- .../ParseLoginResponseFromHeadersTest.java | 147 --- .../ParseVCloudErrorFromHttpResponseTest.java | 96 -- .../vcloud/internal/BasePayloadTest.java | 51 - .../vcloud/internal/BaseVCloudApiLiveTest.java | 59 -- .../vcloud/internal/BaseVCloudApiTest.java | 272 ----- .../vcloud/internal/VCloudLoginApiTest.java | 97 -- .../InstantiateVAppTemplateOptionsTest.java | 74 -- ...meMatchingConfigurationKeyOrDefaultTest.java | 115 --- .../org/jclouds/vcloud/utils/TestUtils.java | 32 - .../jclouds/vcloud/xml/CatalogHandlerTest.java | 135 --- .../vcloud/xml/CatalogItemHandlerTest.java | 86 -- .../GuestCustomizationSectionHandlerTest.java | 75 -- .../xml/NetworkConnectionHandlerTest.java | 57 -- .../NetworkConnectionSectionHandlerTest.java | 63 -- .../org/jclouds/vcloud/xml/OrgHandlerTest.java | 124 --- .../jclouds/vcloud/xml/OrgListHandlerTest.java | 57 -- .../vcloud/xml/OrgNetworkHandlerTest.java | 104 -- .../xml/SupportedVersionsHandlerTest.java | 53 - .../org/jclouds/vcloud/xml/TaskHandlerTest.java | 135 --- .../vcloud/xml/TasksListHandlerTest.java | 82 -- .../org/jclouds/vcloud/xml/VAppHandlerTest.java | 77 -- .../vcloud/xml/VAppTemplateHandlerTest.java | 164 --- .../org/jclouds/vcloud/xml/VDCHandlerTest.java | 136 --- .../org/jclouds/vcloud/xml/VmHandlerTest.java | 79 -- ...VCloudOperatingSystemSectionHandlerTest.java | 61 -- ...VCloudVirtualHardwareSectionHandlerTest.java | 153 --- .../src/test/resources/captureVApp-default.xml | 1 - .../src/test/resources/captureVApp.xml | 1 - .../src/test/resources/catalog-blank.xml | 7 - .../src/test/resources/catalog-hosting.xml | 25 - .../src/test/resources/catalog.xml | 27 - .../src/test/resources/catalog1.0-vcd15.xml | 9 - ...alogItem-carrenza-with-default-namespace.xml | 8 - ...talogItem-carrenza-with-vcloud-namespace.xml | 8 - .../src/test/resources/catalogItem-hosting.xml | 14 - .../test/resources/catalogItem-terremark.xml | 16 - .../src/test/resources/catalogItem1.0-vcd15.xml | 8 - .../src/test/resources/copyVApp-default.xml | 1 - .../src/test/resources/copyVApp.xml | 1 - .../test/resources/copyVAppTemplate-default.xml | 1 - .../src/test/resources/copyVAppTemplate.xml | 1 - .../src/test/resources/cpuItem.xml | 1 - .../src/test/resources/guestCustomization.xml | 23 - .../resources/guestCustomizationSection.xml | 3 - .../src/test/resources/instantiatedvapp.xml | 13 - .../instantiationparams-description.xml | 1 - .../resources/instantiationparams-network.xml | 1 - .../src/test/resources/instantiationparams.xml | 1 - .../1.7.1-stratos/src/test/resources/log4j.xml | 151 --- .../src/test/resources/memoryItem.xml | 1 - .../src/test/resources/moveVApp.xml | 1 - .../src/test/resources/moveVAppTemplate.xml | 1 - .../src/test/resources/networkconnection.xml | 7 - .../test/resources/networkconnectionsection.xml | 18 - .../src/test/resources/org-1.0.xml | 24 - .../src/test/resources/org-hosting.xml | 12 - .../src/test/resources/org-savvis.xml | 13 - .../1.7.1-stratos/src/test/resources/org.xml | 5 - .../src/test/resources/org1.0-vcd15.xml | 11 - .../src/test/resources/orgList1.0-vcd15.xml | 4 - .../src/test/resources/orglist-savvis.xml | 3 - .../src/test/resources/orglist.xml | 3 - .../src/test/resources/orgnetwork-bridged.xml | 20 - .../src/test/resources/orgnetwork-isolated.xml | 31 - .../1.7.1-stratos/src/test/resources/os.xml | 11 - .../src/test/resources/ovf-multi-vm.xml | 285 ------ .../src/test/resources/ovf-ubuntu64.xml | 148 --- .../src/test/resources/task-1.0.xml | 9 - .../src/test/resources/task-error.xml | 9 - .../src/test/resources/task-hosting.xml | 12 - .../src/test/resources/task-self.xml | 11 - .../src/test/resources/task-vcd15.xml | 5 - .../1.7.1-stratos/src/test/resources/task.xml | 8 - .../src/test/resources/taskslist-hosting.xml | 14 - .../src/test/resources/taskslist.xml | 27 - .../resources/template1.0-vcd15-multi-vm.xml | 68 -- .../src/test/resources/template1.0-vcd15.xml | 72 -- .../src/test/resources/vAppTemplate-copying.xml | 41 - .../src/test/resources/vAppTemplate.xml | 143 --- .../vAppTemplate1.0-vcd15_withNewlines.xml | 109 -- .../src/test/resources/vapp-hosting.xml | 235 ----- .../src/test/resources/vapp-none.xml | 237 ----- .../src/test/resources/vapp-pool.xml | 227 ----- .../src/test/resources/vapp-rhel-off-static.xml | 325 ------ .../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 ---- .../src/test/resources/vapp-unresolved.xml | 21 - .../src/test/resources/vapp-win-off-static.xml | 219 ---- .../src/test/resources/vdc-1.0.xml | 49 - .../src/test/resources/vdc-hosting.xml | 60 -- .../src/test/resources/vdc-nonet.xml | 22 - .../1.7.1-stratos/src/test/resources/vdc.xml | 36 - .../src/test/resources/vdc1.0-vcd15.xml | 47 - .../src/test/resources/versions-vcd15.xml | 906 ----------------- .../src/test/resources/versions.xml | 7 - .../test/resources/virtualhardwaresection.xml | 118 --- .../src/test/resources/vm-rhel-off-static.xml | 197 ---- .../apis/vcloud/1.8.0-stratos/README.txt | 6 + .../jclouds/apis/vcloud/1.8.0-stratos/pom.xml | 131 +++ .../vcloud/TaskInErrorStateException.java | 34 + .../vcloud/TaskStillRunningException.java | 34 + .../main/java/org/jclouds/vcloud/VCloudApi.java | 90 ++ .../org/jclouds/vcloud/VCloudApiMetadata.java | 101 ++ .../org/jclouds/vcloud/VCloudMediaType.java | 221 +++++ .../jclouds/vcloud/VCloudResponseException.java | 66 ++ .../java/org/jclouds/vcloud/VCloudToken.java | 34 + .../org/jclouds/vcloud/VCloudVersionsApi.java | 38 + .../binders/BindCPUCountToXmlPayload.java | 74 ++ .../BindCaptureVAppParamsToXmlPayload.java | 119 +++ .../binders/BindCatalogItemToXmlPayload.java | 121 +++ .../binders/BindCloneParamsToXmlPayload.java | 128 +++ .../BindCloneVAppParamsToXmlPayload.java | 60 ++ ...BindCloneVAppTemplateParamsToXmlPayload.java | 55 ++ .../BindDeployVAppParamsToXmlPayload.java | 37 + ...ndGuestCustomizationSectionToXmlPayload.java | 107 ++ ...stantiateVAppTemplateParamsToXmlPayload.java | 216 ++++ .../vcloud/binders/BindMemoryToXmlPayload.java | 75 ++ ...indNetworkConnectionSectionToXmlPayload.java | 101 ++ .../vcloud/binders/BindParamsToXmlPayload.java | 76 ++ .../BindUndeployVAppParamsToXmlPayload.java | 37 + .../OrgNameAndCatalogNameToEndpoint.java | 75 ++ .../binders/OrgNameAndVDCNameToEndpoint.java | 74 ++ .../OrgNameCatalogNameItemNameToEndpoint.java | 73 ++ ...meCatalogNameVAppTemplateNameToEndpoint.java | 86 ++ .../OrgNameVDCNameNetworkNameToEndpoint.java | 50 + ...NameVDCNameResourceEntityNameToEndpoint.java | 50 + .../OrgNameVDCNameResourceNameToEndpoint.java | 77 ++ .../VCloudComputeServiceContextModule.java | 37 + .../VCloudComputeServiceDependenciesModule.java | 150 +++ .../functions/FindLocationForResource.java | 66 ++ .../compute/functions/HardwareForVApp.java | 68 ++ .../functions/HardwareForVAppTemplate.java | 81 ++ .../compute/functions/ImageForVAppTemplate.java | 79 ++ .../compute/functions/VAppToNodeMetadata.java | 111 +++ ...dHardwareBuilderFromResourceAllocations.java | 40 + ...EnvelopeOrThrowIllegalArgumentException.java | 74 ++ .../internal/VCloudTemplateBuilderImpl.java | 45 + .../compute/options/VCloudTemplateOptions.java | 348 +++++++ ...edIntoNameThenCustomizeDeployAndPowerOn.java | 299 ++++++ ...etworkConfigurationForNetworkAndOptions.java | 76 ++ .../strategy/VCloudComputeServiceAdapter.java | 262 +++++ .../vcloud/compute/util/VCloudComputeUtils.java | 112 +++ .../vcloud/config/DefaultCatalogForOrg.java | 59 ++ .../vcloud/config/DefaultNetworkForVDC.java | 61 ++ .../vcloud/config/DefaultOrgForUser.java | 54 + .../vcloud/config/DefaultTasksListForOrg.java | 49 + .../config/DefaultVCloudReferencesModule.java | 161 +++ .../jclouds/vcloud/config/DefaultVDCForOrg.java | 59 ++ .../vcloud/config/VCloudHttpApiModule.java | 536 ++++++++++ .../jclouds/vcloud/domain/AllocationModel.java | 70 ++ .../org/jclouds/vcloud/domain/Capacity.java | 106 ++ .../java/org/jclouds/vcloud/domain/Catalog.java | 66 ++ .../org/jclouds/vcloud/domain/CatalogItem.java | 34 + .../domain/GuestCustomizationSection.java | 440 +++++++++ .../domain/InstantiateVAppTemplateParams.java | 96 ++ .../vcloud/domain/NetworkConnection.java | 231 +++++ .../vcloud/domain/NetworkConnectionSection.java | 218 ++++ .../java/org/jclouds/vcloud/domain/Org.java | 84 ++ .../jclouds/vcloud/domain/ReferenceType.java | 52 + .../java/org/jclouds/vcloud/domain/Status.java | 244 +++++ .../java/org/jclouds/vcloud/domain/Task.java | 72 ++ .../org/jclouds/vcloud/domain/TaskStatus.java | 68 ++ .../org/jclouds/vcloud/domain/TasksList.java | 34 + .../java/org/jclouds/vcloud/domain/VApp.java | 85 ++ .../org/jclouds/vcloud/domain/VAppTemplate.java | 95 ++ .../org/jclouds/vcloud/domain/VCloudError.java | 118 +++ .../jclouds/vcloud/domain/VCloudSession.java | 25 + .../java/org/jclouds/vcloud/domain/VDC.java | 144 +++ .../org/jclouds/vcloud/domain/VDCStatus.java | 57 ++ .../main/java/org/jclouds/vcloud/domain/Vm.java | 106 ++ .../vcloud/domain/internal/CatalogImpl.java | 189 ++++ .../vcloud/domain/internal/CatalogItemImpl.java | 106 ++ .../vcloud/domain/internal/ErrorImpl.java | 114 +++ .../jclouds/vcloud/domain/internal/OrgImpl.java | 168 ++++ .../domain/internal/ReferenceTypeImpl.java | 99 ++ .../vcloud/domain/internal/TaskImpl.java | 160 +++ .../vcloud/domain/internal/TasksListImpl.java | 78 ++ .../vcloud/domain/internal/VAppImpl.java | 163 +++ .../domain/internal/VAppTemplateImpl.java | 202 ++++ .../jclouds/vcloud/domain/internal/VDCImpl.java | 289 ++++++ .../jclouds/vcloud/domain/internal/VmImpl.java | 214 ++++ .../vcloud/domain/network/DhcpService.java | 106 ++ .../jclouds/vcloud/domain/network/Features.java | 95 ++ .../vcloud/domain/network/FenceMode.java | 68 ++ .../vcloud/domain/network/FirewallService.java | 86 ++ .../domain/network/IpAddressAllocationMode.java | 50 + .../jclouds/vcloud/domain/network/IpRange.java | 75 ++ .../jclouds/vcloud/domain/network/IpScope.java | 169 ++++ .../vcloud/domain/network/NatService.java | 115 +++ .../vcloud/domain/network/NetworkConfig.java | 163 +++ .../vcloud/domain/network/OrgNetwork.java | 119 +++ .../domain/network/firewall/FirewallPolicy.java | 53 + .../network/firewall/FirewallProtocols.java | 71 ++ .../domain/network/firewall/FirewallRule.java | 124 +++ .../domain/network/internal/OrgNetworkImpl.java | 198 ++++ .../vcloud/domain/network/nat/NatPolicy.java | 53 + .../vcloud/domain/network/nat/NatProtocol.java | 46 + .../vcloud/domain/network/nat/NatRule.java | 33 + .../vcloud/domain/network/nat/NatType.java | 59 ++ .../domain/network/nat/rules/MappingMode.java | 53 + .../network/nat/rules/OneToOneVmRule.java | 109 ++ .../network/nat/rules/PortForwardingRule.java | 110 +++ .../vcloud/domain/network/nat/rules/VmRule.java | 127 +++ .../EditableResourceAllocationSettingData.java | 298 ++++++ .../vcloud/domain/ovf/VCloudHardDisk.java | 326 ++++++ .../vcloud/domain/ovf/VCloudNetworkAdapter.java | 328 ++++++ .../vcloud/domain/ovf/VCloudNetworkSection.java | 80 ++ .../ovf/VCloudOperatingSystemSection.java | 118 +++ .../ovf/VCloudVirtualHardwareSection.java | 179 ++++ .../org/jclouds/vcloud/endpoints/Catalog.java | 34 + .../org/jclouds/vcloud/endpoints/Network.java | 34 + .../java/org/jclouds/vcloud/endpoints/Org.java | 34 + .../org/jclouds/vcloud/endpoints/OrgList.java | 34 + .../org/jclouds/vcloud/endpoints/TasksList.java | 34 + .../jclouds/vcloud/endpoints/VCloudLogin.java | 36 + .../java/org/jclouds/vcloud/endpoints/VDC.java | 34 + .../org/jclouds/vcloud/features/CatalogApi.java | 143 +++ .../org/jclouds/vcloud/features/NetworkApi.java | 60 ++ .../org/jclouds/vcloud/features/OrgApi.java | 84 ++ .../org/jclouds/vcloud/features/TaskApi.java | 80 ++ .../org/jclouds/vcloud/features/VAppApi.java | 260 +++++ .../vcloud/features/VAppTemplateApi.java | 179 ++++ .../org/jclouds/vcloud/features/VDCApi.java | 71 ++ .../java/org/jclouds/vcloud/features/VmApi.java | 293 ++++++ ...ddVCloudAuthorizationAndCookieToRequest.java | 60 ++ .../vcloud/functions/CatalogItemsInCatalog.java | 61 ++ .../vcloud/functions/CatalogItemsInOrg.java | 54 + .../jclouds/vcloud/functions/CatalogsInOrg.java | 69 ++ .../functions/DefaultNetworkNameInTemplate.java | 47 + .../jclouds/vcloud/functions/NetworksInOrg.java | 54 + .../vcloud/functions/OrgNameToEndpoint.java | 53 + .../functions/OrgNameToTasksListEndpoint.java | 58 ++ .../vcloud/functions/OrgsForLocations.java | 70 ++ .../jclouds/vcloud/functions/OrgsForNames.java | 53 + .../ParseLoginResponseFromHeaders.java | 103 ++ .../functions/VAppTemplatesForCatalogItems.java | 63 ++ .../vcloud/functions/VAppTemplatesInOrg.java | 62 ++ .../org/jclouds/vcloud/functions/VDCsInOrg.java | 54 + .../ParseVCloudErrorFromHttpResponse.java | 118 +++ .../http/filters/VCloudBasicAuthentication.java | 58 ++ .../http/filters/VCloudSupportedVersions.java | 35 + .../jclouds/vcloud/internal/VCloudLoginApi.java | 45 + .../org/jclouds/vcloud/loaders/OVFLoader.java | 47 + .../vcloud/loaders/VAppTemplateLoader.java | 47 + .../org/jclouds/vcloud/location/DefaultVDC.java | 74 ++ .../location/OrgAndVDCToLocationSupplier.java | 90 ++ .../vcloud/options/CaptureVAppOptions.java | 46 + .../vcloud/options/CatalogItemOptions.java | 72 ++ .../jclouds/vcloud/options/CloneOptions.java | 48 + .../vcloud/options/CloneVAppOptions.java | 83 ++ .../options/CloneVAppTemplateOptions.java | 37 + .../options/InstantiateVAppTemplateOptions.java | 173 ++++ .../jclouds/vcloud/predicates/TaskSuccess.java | 63 ++ .../vcloud/reference/VCloudConstants.java | 52 + .../jclouds/vcloud/reference/package-info.java | 20 + ...thNameMatchingConfigurationKeyOrDefault.java | 95 ++ .../vcloud/suppliers/VAppTemplatesSupplier.java | 83 ++ .../java/org/jclouds/vcloud/util/Utils.java | 67 ++ .../org/jclouds/vcloud/util/VCloudUtils.java | 65 ++ .../org/jclouds/vcloud/xml/CatalogHandler.java | 101 ++ .../jclouds/vcloud/xml/CatalogItemHandler.java | 78 ++ .../org/jclouds/vcloud/xml/ErrorHandler.java | 42 + .../xml/GuestCustomizationSectionHandler.java | 134 +++ .../vcloud/xml/NetworkConnectionHandler.java | 84 ++ .../xml/NetworkConnectionSectionHandler.java | 100 ++ .../java/org/jclouds/vcloud/xml/OrgHandler.java | 109 ++ .../org/jclouds/vcloud/xml/OrgListHandler.java | 51 + .../jclouds/vcloud/xml/OrgNetworkHandler.java | 322 ++++++ .../vcloud/xml/SupportedVersionsHandler.java | 57 ++ .../org/jclouds/vcloud/xml/TaskHandler.java | 125 +++ .../jclouds/vcloud/xml/TasksListHandler.java | 71 ++ .../org/jclouds/vcloud/xml/VAppHandler.java | 148 +++ .../jclouds/vcloud/xml/VAppTemplateHandler.java | 149 +++ .../xml/VCloudVirtualHardwareHandler.java | 69 ++ .../java/org/jclouds/vcloud/xml/VDCHandler.java | 164 +++ .../java/org/jclouds/vcloud/xml/VmHandler.java | 175 ++++ .../xml/ovf/VCloudNetworkSectionHandler.java | 66 ++ .../xml/ovf/VCloudOperatingSystemHandler.java | 78 ++ ...oudResourceAllocationSettingDataHandler.java | 86 ++ .../services/org.jclouds.apis.ApiMetadata | 1 + .../jclouds/vcloud/VCloudApiMetadataTest.java | 28 + .../java/org/jclouds/vcloud/VCloudApiTest.java | 62 ++ .../vcloud/VCloudSessionRefreshLiveTest.java | 39 + .../jclouds/vcloud/VCloudVersionsApiTest.java | 67 ++ .../BindCatalogItemToXmlPayloadTest.java | 51 + .../BindCloneVAppParamsToXmlPayloadTest.java | 79 ++ ...CloneVAppTemplateParamsToXmlPayloadTest.java | 87 ++ .../BindDeployVAppParamsToXmlPayloadTest.java | 59 ++ ...tiateVAppTemplateParamsToXmlPayloadTest.java | 177 ++++ ...etworkConnectionSectionToXmlPayloadTest.java | 66 ++ .../BindUndeployVAppParamsToXmlPayloadTest.java | 59 ++ .../BaseVCloudComputeServiceExpectTest.java | 158 +++ .../compute/VCloudComputeServiceLiveTest.java | 49 + .../functions/FindLocationForResourceTest.java | 62 ++ .../functions/ListImagesInVCloudExpectTest.java | 85 ++ .../functions/VAppToNodeMetadataTest.java | 226 +++++ .../options/VCloudTemplateOptionsTest.java | 195 ++++ ...ThenCustomizeDeployAndPowerOnExpectTest.java | 167 ++++ .../VCloudComputeServiceAdapterTest.java | 89 ++ .../vcloud/features/CatalogApiLiveTest.java | 50 + .../jclouds/vcloud/features/CatalogApiTest.java | 129 +++ .../vcloud/features/NetworkApiLiveTest.java | 26 + .../jclouds/vcloud/features/NetworkApiTest.java | 73 ++ .../jclouds/vcloud/features/OrgApiLiveTest.java | 39 + .../org/jclouds/vcloud/features/OrgApiTest.java | 89 ++ .../vcloud/features/TaskApiLiveTest.java | 26 + .../jclouds/vcloud/features/TaskApiTest.java | 106 ++ .../vcloud/features/VAppApiLiveTest.java | 49 + .../jclouds/vcloud/features/VAppApiTest.java | 313 ++++++ .../features/VAppTemplateApiLiveTest.java | 164 +++ .../vcloud/features/VAppTemplateApiTest.java | 236 +++++ .../jclouds/vcloud/features/VDCApiLiveTest.java | 26 + .../org/jclouds/vcloud/features/VDCApiTest.java | 100 ++ .../jclouds/vcloud/features/VmApiLiveTest.java | 161 +++ .../org/jclouds/vcloud/features/VmApiTest.java | 318 ++++++ ...loudAuthorizationAndCookieToRequestTest.java | 51 + .../ParseLoginResponseFromHeadersTest.java | 145 +++ .../ParseVCloudErrorFromHttpResponseTest.java | 92 ++ .../vcloud/internal/BasePayloadTest.java | 51 + .../vcloud/internal/BaseVCloudApiLiveTest.java | 55 ++ .../vcloud/internal/BaseVCloudApiTest.java | 270 +++++ .../vcloud/internal/VCloudLoginApiTest.java | 95 ++ .../InstantiateVAppTemplateOptionsTest.java | 72 ++ ...meMatchingConfigurationKeyOrDefaultTest.java | 113 +++ .../org/jclouds/vcloud/utils/TestUtils.java | 30 + .../jclouds/vcloud/xml/CatalogHandlerTest.java | 133 +++ .../vcloud/xml/CatalogItemHandlerTest.java | 84 ++ .../GuestCustomizationSectionHandlerTest.java | 73 ++ .../xml/NetworkConnectionHandlerTest.java | 55 ++ .../NetworkConnectionSectionHandlerTest.java | 61 ++ .../org/jclouds/vcloud/xml/OrgHandlerTest.java | 122 +++ .../jclouds/vcloud/xml/OrgListHandlerTest.java | 55 ++ .../vcloud/xml/OrgNetworkHandlerTest.java | 102 ++ .../xml/SupportedVersionsHandlerTest.java | 51 + .../org/jclouds/vcloud/xml/TaskHandlerTest.java | 133 +++ .../vcloud/xml/TasksListHandlerTest.java | 80 ++ .../org/jclouds/vcloud/xml/VAppHandlerTest.java | 75 ++ .../vcloud/xml/VAppTemplateHandlerTest.java | 162 +++ .../org/jclouds/vcloud/xml/VDCHandlerTest.java | 134 +++ .../org/jclouds/vcloud/xml/VmHandlerTest.java | 77 ++ ...VCloudOperatingSystemSectionHandlerTest.java | 59 ++ ...VCloudVirtualHardwareSectionHandlerTest.java | 151 +++ .../src/test/resources/captureVApp-default.xml | 1 + .../src/test/resources/captureVApp.xml | 1 + .../src/test/resources/catalog-blank.xml | 7 + .../src/test/resources/catalog-hosting.xml | 25 + .../src/test/resources/catalog.xml | 27 + .../src/test/resources/catalog1.0-vcd15.xml | 9 + ...alogItem-carrenza-with-default-namespace.xml | 8 + ...talogItem-carrenza-with-vcloud-namespace.xml | 8 + .../src/test/resources/catalogItem-hosting.xml | 14 + .../test/resources/catalogItem-terremark.xml | 16 + .../src/test/resources/catalogItem1.0-vcd15.xml | 8 + .../src/test/resources/copyVApp-default.xml | 1 + .../src/test/resources/copyVApp.xml | 1 + .../test/resources/copyVAppTemplate-default.xml | 1 + .../src/test/resources/copyVAppTemplate.xml | 1 + .../src/test/resources/cpuItem.xml | 1 + .../src/test/resources/guestCustomization.xml | 23 + .../resources/guestCustomizationSection.xml | 3 + .../src/test/resources/instantiatedvapp.xml | 13 + .../instantiationparams-description.xml | 1 + .../resources/instantiationparams-network.xml | 1 + .../src/test/resources/instantiationparams.xml | 1 + .../1.8.0-stratos/src/test/resources/log4j.xml | 151 +++ .../src/test/resources/memoryItem.xml | 1 + .../src/test/resources/moveVApp.xml | 1 + .../src/test/resources/moveVAppTemplate.xml | 1 + .../src/test/resources/networkconnection.xml | 7 + .../test/resources/networkconnectionsection.xml | 18 + .../src/test/resources/org-1.0.xml | 24 + .../src/test/resources/org-hosting.xml | 12 + .../src/test/resources/org-savvis.xml | 13 + .../1.8.0-stratos/src/test/resources/org.xml | 5 + .../src/test/resources/org1.0-vcd15.xml | 11 + .../src/test/resources/orgList1.0-vcd15.xml | 4 + .../src/test/resources/orglist-savvis.xml | 3 + .../src/test/resources/orglist.xml | 3 + .../src/test/resources/orgnetwork-bridged.xml | 20 + .../src/test/resources/orgnetwork-isolated.xml | 31 + .../1.8.0-stratos/src/test/resources/os.xml | 11 + .../src/test/resources/ovf-multi-vm.xml | 285 ++++++ .../src/test/resources/ovf-ubuntu64.xml | 148 +++ .../src/test/resources/task-1.0.xml | 9 + .../src/test/resources/task-error.xml | 9 + .../src/test/resources/task-hosting.xml | 12 + .../src/test/resources/task-self.xml | 11 + .../src/test/resources/task-vcd15.xml | 5 + .../1.8.0-stratos/src/test/resources/task.xml | 8 + .../src/test/resources/taskslist-hosting.xml | 14 + .../src/test/resources/taskslist.xml | 27 + .../resources/template1.0-vcd15-multi-vm.xml | 68 ++ .../src/test/resources/template1.0-vcd15.xml | 72 ++ .../src/test/resources/vAppTemplate-copying.xml | 41 + .../src/test/resources/vAppTemplate.xml | 143 +++ .../vAppTemplate1.0-vcd15_withNewlines.xml | 109 ++ .../src/test/resources/vapp-hosting.xml | 235 +++++ .../src/test/resources/vapp-none.xml | 237 +++++ .../src/test/resources/vapp-pool.xml | 227 +++++ .../src/test/resources/vapp-rhel-off-static.xml | 325 ++++++ .../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 ++++ .../src/test/resources/vapp-unresolved.xml | 21 + .../src/test/resources/vapp-win-off-static.xml | 219 ++++ .../src/test/resources/vdc-1.0.xml | 49 + .../src/test/resources/vdc-hosting.xml | 60 ++ .../src/test/resources/vdc-nonet.xml | 22 + .../1.8.0-stratos/src/test/resources/vdc.xml | 36 + .../src/test/resources/vdc1.0-vcd15.xml | 47 + .../src/test/resources/versions-vcd15.xml | 906 +++++++++++++++++ .../src/test/resources/versions.xml | 7 + .../test/resources/virtualhardwaresection.xml | 118 +++ .../src/test/resources/vm-rhel-off-static.xml | 197 ++++ .../provider/aws-ec2/1.7.1-stratos/README.txt | 8 - .../provider/aws-ec2/1.7.1-stratos/pom.xml | 156 --- .../src/main/clojure/org/jclouds/aws/ec2.clj | 62 -- .../java/org/jclouds/aws/ec2/AWSEC2Api.java | 119 --- .../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java | 83 -- .../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 103 -- .../BindLaunchSpecificationToFormParams.java | 101 -- ...otInstanceRequestIdsToIndexedFormParams.java | 37 - .../BindTagFiltersToIndexedFormParams.java | 37 - .../binders/BindTagsToIndexedFormParams.java | 37 - .../aws/ec2/compute/AWSEC2ComputeService.java | 160 --- .../compute/AWSEC2ComputeServiceContext.java | 31 - .../ec2/compute/AWSEC2TemplateBuilderImpl.java | 51 - .../aws/ec2/compute/AWSEC2TemplateOptions.java | 824 ---------------- .../AWSEC2BindComputeSuppliersByClass.java | 34 - .../AWSEC2ComputeServiceContextModule.java | 182 ---- .../AWSEC2ComputeServiceDependenciesModule.java | 179 ---- .../aws/ec2/compute/config/ClusterCompute.java | 37 - .../aws/ec2/compute/config/ImageQuery.java | 37 - .../AWSEC2SecurityGroupExtension.java | 220 ----- .../AWSEC2SecurityGroupToSecurityGroup.java | 50 - .../AWSRunningInstanceToNodeMetadata.java | 81 -- .../PresentSpotRequestsAndInstances.java | 95 -- .../AWSEC2ComputeServiceContextImpl.java | 48 - .../AWSEC2CreateSecurityGroupIfNeeded.java | 140 --- .../AWSEC2CreateNodesInGroupThenAddToSet.java | 115 --- .../strategy/AWSEC2DestroyNodeStrategy.java | 75 -- .../strategy/AWSEC2GetNodeMetadataStrategy.java | 65 -- .../strategy/AWSEC2ListNodesStrategy.java | 107 -- .../strategy/AWSEC2ReviseParsedImage.java | 119 --- ...curityGroupsAsNeededAndReturnRunOptions.java | 200 ---- .../suppliers/AWSEC2HardwareSupplier.java | 109 -- .../compute/suppliers/AWSEC2ImageSupplier.java | 162 --- .../ec2/compute/suppliers/CallForImages.java | 94 -- .../aws/ec2/config/AWSEC2HttpApiModule.java | 82 -- .../aws/ec2/domain/AWSRunningInstance.java | 346 ------- .../aws/ec2/domain/LaunchSpecification.java | 570 ----------- .../jclouds/aws/ec2/domain/MonitoringState.java | 50 - .../jclouds/aws/ec2/domain/PlacementGroup.java | 157 --- .../domain/RegionNameAndPublicKeyMaterial.java | 40 - .../java/org/jclouds/aws/ec2/domain/Spot.java | 199 ---- .../aws/ec2/domain/SpotInstanceRequest.java | 474 --------- .../org/jclouds/aws/ec2/features/AWSAMIApi.java | 126 --- .../aws/ec2/features/AWSInstanceApi.java | 94 -- .../jclouds/aws/ec2/features/AWSKeyPairApi.java | 88 -- .../aws/ec2/features/AWSSecurityGroupApi.java | 147 --- .../jclouds/aws/ec2/features/MonitoringApi.java | 97 -- .../aws/ec2/features/PlacementGroupApi.java | 162 --- .../aws/ec2/features/SpotInstanceApi.java | 247 ----- .../functions/CreatePlacementGroupIfNeeded.java | 81 -- .../ImportOrReturnExistingKeypair.java | 90 -- ...SpotInstanceRequestToAWSRunningInstance.java | 63 -- .../ec2/options/AWSDescribeImagesOptions.java | 152 --- .../aws/ec2/options/AWSRunInstancesOptions.java | 310 ------ .../ec2/options/CreateSecurityGroupOptions.java | 63 -- .../DescribeSpotPriceHistoryOptions.java | 115 --- .../options/RequestSpotInstancesOptions.java | 139 --- .../ec2/predicates/PlacementGroupAvailable.java | 69 -- .../ec2/predicates/PlacementGroupDeleted.java | 66 -- .../predicates/SpotInstanceRequestActive.java | 75 -- .../aws/ec2/reference/AWSEC2Constants.java | 39 - .../AWSDescribeInstancesResponseHandler.java | 110 --- ...C2DescribeSecurityGroupsResponseHandler.java | 125 --- .../aws/ec2/xml/AWSEC2IpPermissionHandler.java | 94 -- .../aws/ec2/xml/AWSEC2SecurityGroupHandler.java | 142 --- .../ec2/xml/AWSRunInstancesResponseHandler.java | 51 - .../aws/ec2/xml/BaseAWSReservationHandler.java | 251 ----- .../xml/CreateSecurityGroupResponseHandler.java | 44 - .../DescribePlacementGroupsResponseHandler.java | 75 -- ...eservedInstancesOfferingResponseHandler.java | 74 -- ...DescribeSpotPriceHistoryResponseHandler.java | 76 -- .../aws/ec2/xml/LaunchSpecificationHandler.java | 151 --- .../aws/ec2/xml/MonitoringStateHandler.java | 58 -- .../aws/ec2/xml/PlacementGroupHandler.java | 70 -- .../aws/ec2/xml/ProductCodesHandler.java | 51 - .../xml/ReservedInstancesOfferingHandler.java | 90 -- .../org/jclouds/aws/ec2/xml/SpotHandler.java | 77 -- .../aws/ec2/xml/SpotInstanceHandler.java | 152 --- .../aws/ec2/xml/SpotInstancesHandler.java | 81 -- .../org.jclouds.providers.ProviderMetadata | 1 - .../test/clojure/org/jclouds/aws/ec2_test.clj | 32 - .../aws/ec2/AWSEC2ContextBuilderTest.java | 79 -- .../org/jclouds/aws/ec2/AWSEC2ProviderTest.java | 33 - ...BindLaunchSpecificationToFormParamsTest.java | 98 -- .../BindTagsToIndexedFormParamsTest.java | 63 -- .../compute/AWSEC2ComputeServiceExpectTest.java | 280 ------ .../compute/AWSEC2ComputeServiceLiveTest.java | 196 ---- .../compute/AWSEC2TemplateBuilderLiveTest.java | 367 ------- .../AWSEC2ComputeServiceContextModuleTest.java | 65 -- .../AWSEC2ImageExtensionLiveTest.java | 62 -- .../AWSEC2SecurityGroupExtensionExpectTest.java | 364 ------- .../AWSEC2SecurityGroupExtensionLiveTest.java | 36 - .../AWSEC2SecurityGroupToSecurityGroupTest.java | 83 -- .../AWSRunningInstanceToNodeMetadataTest.java | 220 ----- .../PresentSpotRequestsAndInstancesTest.java | 100 -- .../BaseAWSEC2ComputeServiceExpectTest.java | 153 --- .../AWSEC2CreateSecurityGroupIfNeededTest.java | 103 -- .../options/AWSEC2TemplateOptionsTest.java | 418 -------- .../compute/strategy/AWSEC2ImageParserTest.java | 242 ----- .../strategy/AWSEC2ReviseParsedImageTest.java | 111 --- ...tyGroupsAsNeededAndReturnRunOptionsTest.java | 958 ------------------ .../aws/ec2/features/AWSAMIApiLiveTest.java | 58 -- .../jclouds/aws/ec2/features/AWSAMIApiTest.java | 497 ---------- .../ec2/features/AWSInstanceApiLiveTest.java | 60 -- .../aws/ec2/features/AWSInstanceApiTest.java | 539 ---------- .../aws/ec2/features/AWSKeyPairApiLiveTest.java | 208 ---- .../aws/ec2/features/AWSKeyPairApiTest.java | 134 --- .../features/AWSSecurityGroupApiLiveTest.java | 123 --- .../ec2/features/AWSSecurityGroupApiTest.java | 207 ---- .../aws/ec2/features/AWSSubnetApiLiveTest.java | 31 - .../aws/ec2/features/BaseAWSEC2ApiTest.java | 135 --- .../aws/ec2/features/MonitoringApiLiveTest.java | 65 -- .../aws/ec2/features/MonitoringApiTest.java | 73 -- .../features/PlacementGroupApiExpectTest.java | 78 -- .../ec2/features/PlacementGroupApiLiveTest.java | 221 ----- .../aws/ec2/features/PlacementGroupApiTest.java | 136 --- .../ec2/features/SpotInstanceApiExpectTest.java | 78 -- .../ec2/features/SpotInstanceApiLiveTest.java | 215 ---- .../aws/ec2/features/SpotInstanceApiTest.java | 100 -- .../ec2/features/TagSecurityGroupLiveTest.java | 56 -- .../ImportOrReturnExistingKeypairTest.java | 115 --- ...InstanceRequestToAWSRunningInstanceTest.java | 91 -- .../options/AWSDescribeImagesOptionsTest.java | 177 ---- .../ec2/options/AWSRunInstancesOptionsTest.java | 370 ------- .../DescribeSpotPriceHistoryOptionsTest.java | 119 --- .../RequestSpotInstancesOptionsTest.java | 143 --- .../parse/DescribeInstancesResponseTest.java | 112 --- .../DescribeSecurityGroupsResponseTest.java | 77 -- ...AWSDescribeInstancesResponseHandlerTest.java | 167 ---- .../xml/AWSRunInstancesResponseHandlerTest.java | 114 --- ...cribePlacementGroupsResponseHandlerTest.java | 53 - ...vedInstancesOfferingResponseHandlerTest.java | 55 -- ...ribeSpotPriceHistoryResponseHandlerTest.java | 72 -- .../aws/ec2/xml/MonitoringStateHandlerTest.java | 50 - .../aws/ec2/xml/ProductCodesHandlerTest.java | 49 - .../aws/ec2/xml/SpotInstanceHandlerTest.java | 138 --- .../aws/ec2/xml/SpotInstancesHandlerTest.java | 117 --- .../src/test/resources/alestic_canonical.xml | 119 --- .../src/test/resources/amzn_images.xml | 86 -- .../describe_image_attribute_productCodes.xml | 9 - .../src/test/resources/describe_images_cc.xml | 31 - .../src/test/resources/describe_instances_1.xml | 55 -- .../src/test/resources/describe_instances_2.xml | 986 ------------------- .../src/test/resources/describe_instances_3.xml | 5 - .../resources/describe_instances_latest.xml | 132 --- .../resources/describe_instances_pending.xml | 82 -- .../resources/describe_placement_groups.xml | 10 - .../describe_reserved_instances_offerings.xml | 15 - .../resources/describe_security_groups_vpc.xml | 35 - .../test/resources/describe_spot_instance.xml | 45 - .../describe_spot_instance_requests.xml | 425 -------- .../resources/describe_spot_instance_tags.xml | 115 --- .../resources/describe_spot_instances_1.xml | 207 ---- .../resources/describe_spot_price_history.xml | 27 - .../src/test/resources/monitoring.xml | 16 - .../resources/request_spot_instances-ebs.xml | 52 - .../test/resources/request_spot_instances.xml | 93 -- .../src/test/resources/rightscale_images.xml | 94 -- .../src/test/resources/run_instances_1.xml | 54 - .../1.7.1-stratos/src/test/resources/vostok.xml | 19 - .../provider/aws-ec2/1.8.0-stratos/README.txt | 8 + .../provider/aws-ec2/1.8.0-stratos/pom.xml | 156 +++ .../src/main/clojure/org/jclouds/aws/ec2.clj | 62 ++ .../java/org/jclouds/aws/ec2/AWSEC2Api.java | 117 +++ .../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java | 83 ++ .../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 101 ++ .../BindLaunchSpecificationToFormParams.java | 97 ++ ...otInstanceRequestIdsToIndexedFormParams.java | 35 + .../BindTagFiltersToIndexedFormParams.java | 34 + .../binders/BindTagsToIndexedFormParams.java | 34 + .../aws/ec2/compute/AWSEC2ComputeService.java | 157 +++ .../compute/AWSEC2ComputeServiceContext.java | 28 + .../ec2/compute/AWSEC2TemplateBuilderImpl.java | 50 + .../aws/ec2/compute/AWSEC2TemplateOptions.java | 819 +++++++++++++++ .../AWSEC2BindComputeSuppliersByClass.java | 31 + .../AWSEC2ComputeServiceContextModule.java | 178 ++++ .../AWSEC2ComputeServiceDependenciesModule.java | 175 ++++ .../aws/ec2/compute/config/ClusterCompute.java | 34 + .../aws/ec2/compute/config/ImageQuery.java | 34 + .../AWSEC2SecurityGroupExtension.java | 216 ++++ .../AWSEC2SecurityGroupToSecurityGroup.java | 48 + .../AWSRunningInstanceToNodeMetadata.java | 78 ++ .../PresentSpotRequestsAndInstances.java | 93 ++ .../AWSEC2ComputeServiceContextImpl.java | 45 + .../AWSEC2CreateSecurityGroupIfNeeded.java | 135 +++ .../AWSEC2CreateNodesInGroupThenAddToSet.java | 113 +++ .../strategy/AWSEC2DestroyNodeStrategy.java | 71 ++ .../strategy/AWSEC2GetNodeMetadataStrategy.java | 61 ++ .../strategy/AWSEC2ListNodesStrategy.java | 103 ++ .../strategy/AWSEC2ReviseParsedImage.java | 116 +++ ...curityGroupsAsNeededAndReturnRunOptions.java | 197 ++++ .../suppliers/AWSEC2HardwareSupplier.java | 107 ++ .../compute/suppliers/AWSEC2ImageSupplier.java | 158 +++ .../ec2/compute/suppliers/CallForImages.java | 90 ++ .../aws/ec2/config/AWSEC2HttpApiModule.java | 80 ++ .../aws/ec2/domain/AWSRunningInstance.java | 344 +++++++ .../aws/ec2/domain/LaunchSpecification.java | 580 +++++++++++ .../jclouds/aws/ec2/domain/MonitoringState.java | 49 + .../jclouds/aws/ec2/domain/PlacementGroup.java | 156 +++ .../domain/RegionNameAndPublicKeyMaterial.java | 36 + .../java/org/jclouds/aws/ec2/domain/Spot.java | 198 ++++ .../aws/ec2/domain/SpotInstanceRequest.java | 470 +++++++++ .../org/jclouds/aws/ec2/features/AWSAMIApi.java | 124 +++ .../aws/ec2/features/AWSInstanceApi.java | 92 ++ .../jclouds/aws/ec2/features/AWSKeyPairApi.java | 85 ++ .../aws/ec2/features/AWSSecurityGroupApi.java | 145 +++ .../jclouds/aws/ec2/features/MonitoringApi.java | 95 ++ .../aws/ec2/features/PlacementGroupApi.java | 160 +++ .../aws/ec2/features/SpotInstanceApi.java | 245 +++++ .../functions/CreatePlacementGroupIfNeeded.java | 77 ++ .../ImportOrReturnExistingKeypair.java | 86 ++ ...SpotInstanceRequestToAWSRunningInstance.java | 60 ++ .../ec2/options/AWSDescribeImagesOptions.java | 151 +++ .../aws/ec2/options/AWSRunInstancesOptions.java | 307 ++++++ .../ec2/options/CreateSecurityGroupOptions.java | 62 ++ .../DescribeSpotPriceHistoryOptions.java | 114 +++ .../options/RequestSpotInstancesOptions.java | 138 +++ .../ec2/predicates/PlacementGroupAvailable.java | 64 ++ .../ec2/predicates/PlacementGroupDeleted.java | 61 ++ .../predicates/SpotInstanceRequestActive.java | 70 ++ .../aws/ec2/reference/AWSEC2Constants.java | 40 + .../AWSDescribeInstancesResponseHandler.java | 109 ++ ...C2DescribeSecurityGroupsResponseHandler.java | 124 +++ .../aws/ec2/xml/AWSEC2IpPermissionHandler.java | 90 ++ .../aws/ec2/xml/AWSEC2SecurityGroupHandler.java | 139 +++ .../ec2/xml/AWSRunInstancesResponseHandler.java | 50 + .../aws/ec2/xml/BaseAWSReservationHandler.java | 247 +++++ .../xml/CreateSecurityGroupResponseHandler.java | 40 + .../DescribePlacementGroupsResponseHandler.java | 72 ++ ...eservedInstancesOfferingResponseHandler.java | 71 ++ ...DescribeSpotPriceHistoryResponseHandler.java | 73 ++ .../aws/ec2/xml/LaunchSpecificationHandler.java | 147 +++ .../aws/ec2/xml/MonitoringStateHandler.java | 54 + .../aws/ec2/xml/PlacementGroupHandler.java | 66 ++ .../aws/ec2/xml/ProductCodesHandler.java | 50 + .../xml/ReservedInstancesOfferingHandler.java | 89 ++ .../org/jclouds/aws/ec2/xml/SpotHandler.java | 73 ++ .../aws/ec2/xml/SpotInstanceHandler.java | 148 +++ .../aws/ec2/xml/SpotInstancesHandler.java | 78 ++ .../org.jclouds.providers.ProviderMetadata | 1 + .../test/clojure/org/jclouds/aws/ec2_test.clj | 32 + .../aws/ec2/AWSEC2ContextBuilderTest.java | 76 ++ .../org/jclouds/aws/ec2/AWSEC2ProviderTest.java | 31 + ...BindLaunchSpecificationToFormParamsTest.java | 95 ++ .../BindTagsToIndexedFormParamsTest.java | 61 ++ .../compute/AWSEC2ComputeServiceExpectTest.java | 278 ++++++ .../compute/AWSEC2ComputeServiceLiveTest.java | 192 ++++ .../compute/AWSEC2TemplateBuilderLiveTest.java | 363 +++++++ .../AWSEC2ComputeServiceContextModuleTest.java | 62 ++ .../AWSEC2ImageExtensionLiveTest.java | 59 ++ .../AWSEC2SecurityGroupExtensionExpectTest.java | 414 ++++++++ .../AWSEC2SecurityGroupExtensionLiveTest.java | 33 + .../AWSEC2SecurityGroupToSecurityGroupTest.java | 80 ++ .../AWSRunningInstanceToNodeMetadataTest.java | 217 ++++ .../PresentSpotRequestsAndInstancesTest.java | 97 ++ .../BaseAWSEC2ComputeServiceExpectTest.java | 151 +++ .../AWSEC2CreateSecurityGroupIfNeededTest.java | 99 ++ .../options/AWSEC2TemplateOptionsTest.java | 416 ++++++++ .../compute/strategy/AWSEC2ImageParserTest.java | 239 +++++ .../strategy/AWSEC2ReviseParsedImageTest.java | 111 +++ ...tyGroupsAsNeededAndReturnRunOptionsTest.java | 954 ++++++++++++++++++ .../aws/ec2/features/AWSAMIApiLiveTest.java | 129 +++ .../jclouds/aws/ec2/features/AWSAMIApiTest.java | 496 ++++++++++ .../AWSElasticBlockStoreApiLiveTest.java | 68 ++ .../ec2/features/AWSInstanceApiLiveTest.java | 58 ++ .../aws/ec2/features/AWSInstanceApiTest.java | 537 ++++++++++ .../aws/ec2/features/AWSKeyPairApiLiveTest.java | 206 ++++ .../aws/ec2/features/AWSKeyPairApiTest.java | 132 +++ .../features/AWSSecurityGroupApiLiveTest.java | 119 +++ .../ec2/features/AWSSecurityGroupApiTest.java | 205 ++++ .../aws/ec2/features/AWSSubnetApiLiveTest.java | 27 + .../aws/ec2/features/BaseAWSEC2ApiTest.java | 132 +++ .../aws/ec2/features/MonitoringApiLiveTest.java | 63 ++ .../aws/ec2/features/MonitoringApiTest.java | 71 ++ .../features/PlacementGroupApiExpectTest.java | 75 ++ .../ec2/features/PlacementGroupApiLiveTest.java | 219 ++++ .../aws/ec2/features/PlacementGroupApiTest.java | 134 +++ .../ec2/features/SpotInstanceApiExpectTest.java | 75 ++ .../ec2/features/SpotInstanceApiLiveTest.java | 213 ++++ .../aws/ec2/features/SpotInstanceApiTest.java | 98 ++ .../ec2/features/TagSecurityGroupLiveTest.java | 52 + .../ImportOrReturnExistingKeypairTest.java | 112 +++ ...InstanceRequestToAWSRunningInstanceTest.java | 89 ++ .../options/AWSDescribeImagesOptionsTest.java | 175 ++++ .../ec2/options/AWSRunInstancesOptionsTest.java | 374 +++++++ .../DescribeSpotPriceHistoryOptionsTest.java | 117 +++ .../RequestSpotInstancesOptionsTest.java | 141 +++ .../parse/DescribeInstancesResponseTest.java | 110 +++ .../DescribeSecurityGroupsResponseTest.java | 73 ++ ...AWSDescribeInstancesResponseHandlerTest.java | 165 ++++ .../xml/AWSRunInstancesResponseHandlerTest.java | 112 +++ ...cribePlacementGroupsResponseHandlerTest.java | 51 + ...vedInstancesOfferingResponseHandlerTest.java | 53 + ...ribeSpotPriceHistoryResponseHandlerTest.java | 70 ++ .../aws/ec2/xml/MonitoringStateHandlerTest.java | 48 + .../aws/ec2/xml/ProductCodesHandlerTest.java | 47 + .../aws/ec2/xml/SpotInstanceHandlerTest.java | 136 +++ .../aws/ec2/xml/SpotInstancesHandlerTest.java | 115 +++ .../src/test/resources/alestic_canonical.xml | 119 +++ .../src/test/resources/amzn_images.xml | 86 ++ .../describe_image_attribute_productCodes.xml | 9 + .../src/test/resources/describe_images_cc.xml | 31 + .../src/test/resources/describe_instances_1.xml | 55 ++ .../src/test/resources/describe_instances_2.xml | 986 +++++++++++++++++++ .../src/test/resources/describe_instances_3.xml | 5 + .../resources/describe_instances_latest.xml | 132 +++ .../resources/describe_instances_pending.xml | 82 ++ .../resources/describe_placement_groups.xml | 10 + .../describe_reserved_instances_offerings.xml | 15 + .../resources/describe_security_groups_vpc.xml | 35 + .../test/resources/describe_spot_instance.xml | 45 + .../describe_spot_instance_requests.xml | 425 ++++++++ .../resources/describe_spot_instance_tags.xml | 115 +++ .../resources/describe_spot_instances_1.xml | 207 ++++ .../resources/describe_spot_price_history.xml | 27 + .../src/test/resources/monitoring.xml | 16 + .../resources/request_spot_instances-ebs.xml | 52 + .../test/resources/request_spot_instances.xml | 93 ++ .../src/test/resources/rightscale_images.xml | 94 ++ .../src/test/resources/run_instances_1.xml | 54 + .../1.8.0-stratos/src/test/resources/vostok.xml | 19 + dependencies/pom.xml | 10 +- .../pom.xml | 317 +++--- pom.xml | 17 +- .../distribution/src/main/license/LICENSE | 30 +- tools/pom.xml | 39 + tools/stratos-docker-images/README.md | 12 +- tools/stratos-docker-images/activemq/Dockerfile | 14 +- .../activemq/docker-build.sh | 2 +- .../stratos-docker-images/bind/docker-build.sh | 2 +- tools/stratos-docker-images/build-all.sh | 4 + tools/stratos-docker-images/mysql/Dockerfile | 7 +- .../stratos-docker-images/mysql/docker-build.sh | 3 +- tools/stratos-docker-images/pom.xml | 103 ++ .../puppetmaster/Dockerfile | 35 +- .../puppetmaster/addpuppetdomain.txt | 5 - .../puppetmaster/docker-build.sh | 48 +- .../puppetmaster/run-example.sh | 9 - .../puppettestnode/docker-build.sh | 2 +- tools/stratos-docker-images/push-all.sh | 15 +- .../remove_stratos_images.sh | 33 + tools/stratos-docker-images/run-example.sh | 27 +- tools/stratos-docker-images/run-nsenter.sh | 13 + .../stop_and_remove_stratos_containers.sh | 31 - .../stop_stratos_containers.sh | 31 + tools/stratos-docker-images/stratos/Dockerfile | 26 +- .../stratos/docker-build.sh | 33 +- tools/stratos-docker-images/stratos/run | 2 +- 2476 files changed, 135198 insertions(+), 133570 deletions(-) ----------------------------------------------------------------------
