Commit Graph

7029 Commits

Author SHA1 Message Date
Ignasi Barrera e9502ab81e Applied fixes suggested in last review
Renamed VirtualMachineTemplateWithZone to
VirtualMachineTemplateInVirtualDatacenter and encoded the id using a
slash instead of the hyphen.
2012-10-21 22:46:14 +02:00
Ignasi Barrera 26f801058d Improved ComputeService and delegate virtual datacenter election to TemplateBuilder
Made a few changes to adapt the Abiquo compute service
implementation to the most common use cases:

* Do not attempt to create a VDC. Regualr users may not have
  permissions to create VDCs, so don't try to create them. A
  VDC compatible with teh template being deployed must exist.
* Configure nodes with one public ip by default, and if no
  public ip is available, assign one from the default private
  VLAN for the selected virtual datacenter.

Also fixed some concept mappings between Abiquo and jclouds:

Virtual datacenter (zone) election should be performed by the
TemplateBuilder and not by the ComputeServiceAdapter. This commit
refactors the current adapter to implement the right behavior.

The two main concepts in this refactor are about locations. Now,
physical datacenters will be scoped to Region locations, and virtual
datacenters to Zones.

Images in Abiquo are scoped to Regions (each physical datacenter has a
set of available images), and hardware profiles will be used to scope
images to a particular virtual datacenter. Since a virtual datacenter in
Abiquo is just a container that provides compute resources in a specific
virtualization technology, each image will have one hardware profile
scoped to each compatible virtual datacenter (zone).

This way, the virtual datacenter election will be made using the
TemplateBuilder, by selecting the desired hardware profile.
2012-10-20 21:25:51 +02:00
Adrian Cole 38d3b7d76c Merge pull request #895 from jclouds/isolate-polling
Issue 1103: isolate polling of nodes into its own class
2012-10-20 12:06:45 -07:00
Adrian Cole bc82296702 Issue 1103: isolate polling of nodes into its own class 2012-10-20 11:05:18 -07:00
Adrian Cole 3cd57073e0 Merge pull request #904 from jclouds/s3-pagediterable
added S3 PagedIterable adapter
2012-10-18 22:24:50 -07:00
Adrian Cole 081046d4d6 added S3 PagedIterable adapter 2012-10-18 17:27:32 -07:00
Adrian Cole 53fcdbb790 Merge pull request #902 from andrewgaul/input-suppliers-of-byte-array
Remove InputSuppliers.of(byte[])
2012-10-17 13:35:21 -07:00
Andrew Gaul 90f42d01ce Remove InputSuppliers.of(byte[])
Callers rarely want this functionality and should call
ByteStreams.newInputStreamSupplier when they do.
2012-10-17 11:35:45 -07:00
Adrian Cole 96ea0134fb Merge pull request #898 from andrewgaul/files-tostring-regression
Fix compile error regression from a5c56e7
2012-10-15 15:17:03 -07:00
Andrew Gaul c3728525bd Fix compile error regression from a5c56e7 2012-10-15 13:53:13 -07:00
Adrian Cole 141834a14d Merge pull request #897 from andrewgaul/hpcloud-x-auth-token
Remove X-Auth-Token from HP temporary signing
2012-10-15 13:18:08 -07:00
Andrew Gaul 2b5173f617 Remove X-Auth-Token from HP temporary signing
HP Cloud does not use X-Auth-Token for temporary signed URLs and
leaking this allows clients arbitrary privileges until token timeout.
2012-10-15 11:58:49 -07:00
Adrian Cole 238fbceaaa additional test for EU create snapshot 2012-10-15 08:46:26 -07:00
Adrian Cole 9e8b4756c2 Merge pull request #894 from andrewgaul/files-tostring
Prefer Files.toString over FileInputStream
2012-10-11 02:05:46 -07:00
Adrian Cole bc0db19af3 Merge pull request #893 from andrewgaul/clear-container-retry
Retry each operation up to maxErrors times
2012-10-11 02:04:09 -07:00
Adrian Cole f94504c9aa Merge pull request #875 from andrewgaul/hpcloud-temporary-signing
Support HP Cloud Object Storage signed TempURL
2012-10-11 02:00:19 -07:00
Andrew Gaul 2b8b72758f Prefer Files.toString over FileInputStream 2012-10-10 21:33:22 -07:00
Andrew Gaul 331c3be2e8 Retry each operation up to maxErrors times
Previously we only allowed maxErrors per directory, which tended to
fail with large directories.  Also rename counter to something more
intuitive.
2012-10-10 17:54:38 -07:00
Andrew Gaul a5c56e7aa7 Support HP Cloud temporary signed URL
HP modified the Swift signing mechanism to include the tenant id.
Note that this functionality requires using API access key
credentials.  Live tests need some sorting out since we only support
password credential tests today.
2012-10-10 16:20:31 -07:00
Adrian Cole 2badf2241d Merge pull request #871 from abiquo/tests-timeout
Refactored unit tests to avoid recurrent timeouts
2012-10-10 05:55:08 -07:00
Adrian Cole b49a3d555a Merge pull request #889 from jclouds/issue-1096
Issue 1096: Guice errors when trying to get a signer for a keystone v2 password-auth BlobStore
2012-10-10 04:06:33 -07:00
Adrian Cole 649c8f88e2 Merge pull request #891 from abayer/master
Tweaks to CloudStack TemplateFilter enum
2012-10-10 03:18:18 -07:00
Adrian Cole ffa9cd3bb0 corrected guice bindings for swift-based blob signatures and backfilled expect tests 2012-10-10 12:03:23 +02:00
Andrew Bayer 24e485c829 Fixing CloudStack TemplateFilter enum to work with 3.x API properly 2012-10-09 12:31:44 -07:00
Ignasi Barrera dd7a129388 Removed duplicate tests
Having a deep look at this class noticed that most of the tests were
duplicating tests in the AsyncMonitorTest class. All the functionallity
provided by the awaitCompletion and monitor methods is already tested
(and properly tested using mocks) in that class, so those methods have
been removed.

The BaseMonitoringService class just delegates to the AsyncMonitor one,
adding a bit of logic to validate input parameters, so the
BaseMonitoringServiceTest class now only tests the logic it is
responsible for.
2012-10-09 15:37:27 +02:00
Ignasi Barrera a71032df95 Refactored unit tests to avoid recurrent timeouts.
When using TestNG timeout option to control test execution, random
timeout failures appeared. The tests have been refactored to manually
control the timeout.
2012-10-09 15:19:14 +02:00
Adrian Cole 99d3422b4d added id to endpoint and used only endpoint.versionId to enforce endpointVersion 2012-10-08 15:59:04 -04:00
Adrian Cole a02c79c7f4 Merge pull request #887 from andreisavu/issue-973
Issue 973. Performance problems with Synaptic's Atmos service
2012-10-08 12:50:42 -07:00
Adrian Cole 14ad17108f Issue 671: NPE on aws-ec2 w/vpc security groups 2012-10-08 15:39:51 -04:00
Andrei Savu 0d8848b397 Replaced IllegalStateException with KeyAlreadyExistsException and fixed '\n' typo 2012-10-08 18:07:43 +03:00
Adrian Cole 363d996f19 Merge pull request #886 from andrewgaul/local_blob_request_signer
Rename to LocalBlobRequestSigner
2012-10-08 06:46:43 -07:00
Andrei Savu 03dc864115 Issue 973. Performance problems with Synaptic's Atmos service and writing new blobs 2012-10-08 16:26:40 +03:00
Adrian Cole 6090ca03cc Merge pull request #885 from andrewgaul/charsets
Improve use of Charsets
2012-10-08 05:34:55 -07:00
Andrew Gaul 9f6b9d4d8a Rename to LocalBlobRequestSigner
Missing commit from the Filesystem and Transient unification.
2012-10-07 22:54:03 -07:00
Andrew Gaul 9024c77405 Improve use of Charsets 2012-10-07 22:31:49 -07:00
Adrian Cole 5b213c2171 Merge pull request #883 from andrewgaul/unsupported-encoding-exception
Remove unneeded UnsupportedEncodingExceptions
2012-10-07 18:04:31 -07:00
Adrian Cole 298e764f85 fixed context builder when params in properties 2012-10-07 17:50:59 -07:00
Andrew Gaul 07ca6ab27b Remove unneeded UnsupportedEncodingExceptions
Enabled by use of Charsets.  Remaining calls due to URLEncoder.encode
and decode.
2012-10-07 17:16:02 -07:00
Adrian Cole fd6d0c5c49 Merge pull request #882 from andrewgaul/resources-tostring
Use Resources.toString where possible
2012-10-07 16:35:25 -07:00
Andrew Gaul 71080cf2e1 Use Resources.toString where possible
Replaces calls to
CharStreams.toString(Resources.newReaderSupplier(...)).
2012-10-07 15:37:40 -07:00
Adrian Cole 79f0361e4a Merge pull request #880 from andrewgaul/fail
Prefer fail over assertTrue(false) where possible
2012-10-07 13:19:18 -07:00
Adrian Cole a9df007d93 Merge pull request #881 from andrewgaul/filesystem-file
Improve use of File constructor
2012-10-07 13:17:59 -07:00
Andrew Gaul 02e1a54220 Improve use of File constructor 2012-10-06 19:28:27 -07:00
Andrew Gaul 8a0900d6ca Prefer fail over assertTrue(false) where possible 2012-10-06 19:25:54 -07:00
Adrian Cole e4c03396db Merge pull request #879 from iocanel/master
Cleanup virtualbox api from unwanted runtime dependencies and improvements on OSGi metadata
2012-10-06 12:44:04 -07:00
Ioannis Canellos 93b869c44d Cleaned up unwanted dependencies from virtualbox api. Widened the version range on jetty and servlet. 2012-10-06 19:02:58 +03:00
Ioannis Canellos 0dcd648599 Added javadoc description for name property. Cleaned up code in ContextBuilder 2012-10-06 10:31:23 +03:00
Ioannis Canellos 76beeee55b Merge pull request #873 from iocanel/master
Added name property to Context.
2012-10-06 00:26:07 -07:00
Adrian Cole 2f1c215869 Merge pull request #878 from rackspace/compute-configurable-polling
Configurable polling for the ComputeService
2012-10-05 10:50:44 -07:00
Adrian Cole 5da084d6c4 Merge pull request #868 from andrewgaul/filesystem-get-all-container-names
Simplify filesystem blobstore getAllContainerNames
2012-10-05 10:10:57 -07:00