Commit Graph

1269 Commits

Author SHA1 Message Date
Richard Downer ca7ede5932 CloudStack template status parsing update
Remove the "Successfully Installed" message as it's not clear what its
definition is or even if it's possible to get that message - see
http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev/201209.mbox/%3CCED8A372-E235-4C32-A15E-F021CC449BFD%40citrix.com%3E
2012-09-02 10:22:33 +03:00
Richard Downer 8aca1828fc Update parsing of Status in CloudStack Template
The CloudStack Template status field is generally presented as human
readable text. This commit extends the enum fromValue() to understand
the known status strings in CloudStack 3.0.4.
2012-09-01 17:56:49 +03:00
Adrian Cole c0e8470952 default region endpoint for rackspace legacy apis 2012-08-29 23:47:05 -07:00
Andrew Donald Kennedy 88a84ae3fb Added test descriptions and dependencies to basic Nova live tests 2012-08-24 21:19:35 +03:00
Andrew Donald Kennedy 0a7a9f378e Updated KeyPair toString method to make expect test pass 2012-08-23 17:08:06 +03:00
Andrew Donald Kennedy fec936ca36 Update Nova extension tests to use covariant returns 2012-08-23 08:17:30 +03:00
Andrew Donald Kennedy 7d70b5ddc3 Updated NovaComputeService and FloatingIp cache to deal with extensibility 2012-08-23 07:29:40 +03:00
Andrew Donald Kennedy 931aa7838a Make all Nova extensions extensible 2012-08-23 06:46:25 +03:00
Adrian Cole fef7bab24e [maven-release-plugin] prepare for next development iteration 2012-08-22 18:55:45 -07:00
Adrian Cole 80afcf834f [maven-release-plugin] prepare release jclouds-1.5.0-beta.11 2012-08-22 18:55:40 -07:00
Adrian Cole 0850217e5f merged 2012-08-22 18:26:52 -07:00
Adrian Cole 05e495fe08 CCE in elasticstack 2012-08-17 22:57:39 -07:00
Adrian Cole bb37f61965 Merge pull request #788 from grkvlt/openstack-extensibility-fixup
Openstack extensibility fixup
2012-08-16 14:56:40 -07:00
Andrew Donald Kennedy 1eee03ee1f Add missed Optional covariant return types for Keystone 2012-08-16 22:32:46 +01:00
Andrew Gaul e7040f8cc8 Use appropriate Predicates helpers
Also capitalize constant.
2012-08-16 13:35:28 -07:00
Andrew Gaul 130921fc29 Reduce HP Cloud authentication token timeout
I see a 12 hour expiry when requesting a new authentication token.
Reducing this timeout should not hurt in any case.
2012-08-15 17:46:52 -07:00
Adrian Cole e2b1ae38b9 [maven-release-plugin] prepare for next development iteration 2012-08-13 21:05:07 -07:00
Adrian Cole fa63b7a4db [maven-release-plugin] prepare release jclouds-1.5.0-beta.10 2012-08-13 21:05:00 -07:00
Adrian Cole 81d5f31359 Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x
* 'master' of github.com:jclouds/jclouds: (30 commits)
  Merge Keystone optional admin API provider with optional extension provider
  Added binding for optional extensions
  Make the OpenStack extension lists accessible for all APIs. Copied the Nova extension related code to the shared keystone package and added providers for extensions and aliases to all modules
  added statement to rebase dist packages
  added VAppNetworksLiveTest
  Further OpenStack extensibility changes. Fixing constructors in RestContext classes
  Fixed a possible NPE when ServiceFunctionLoader finds no OSGi service for a function.
  fixed broken test
  threading issue in test
  openstack-quantum extensibility
  openstack-swift extensibility
  openstack-glance extensibility
  openstack-nova extensibility
  openstack-keystone extensibility
  add FirstNetwork, in line with FirstRegion, etc., for use in FGCP provider
  missing class
  refactoring of smartos-ssh
  Extend the VmSpecification to allow for all the extra memory settings.
  Issue 1067:update to guava 13
  removed invalid @Nullable usage and also usage of javax package usage
  ...
2012-08-13 20:29:15 -07:00
Andrew Donald Kennedy 2debb53e83 Merge Keystone optional admin API provider with optional extension provider 2012-08-14 03:27:34 +01:00
Andrew Donald Kennedy 8ae33f2315 Added binding for optional extensions 2012-08-14 02:23:54 +01:00
Andrew Donald Kennedy 0da2616737 Make the OpenStack extension lists accessible for all APIs. Copied the Nova extension related code to the shared keystone package and added providers for extensions and aliases to all modules 2012-08-13 22:22:04 +01:00
Adrian Cole 0666a6fbde fixed broken test 2012-08-12 10:00:17 -07:00
Adrian Cole 0f0bc429c1 threading issue in test 2012-08-12 09:31:18 -07:00
Adrian Cole b055fb1233 Merge pull request #780 from grkvlt/openstack
Openstack Extensibility
2012-08-12 09:29:51 -07:00
Andrew Donald Kennedy 9acfa880d4 openstack-nova extensibility 2012-08-12 12:29:36 +01:00
Andrew Donald Kennedy 6c9524dabc openstack-keystone extensibility 2012-08-12 12:04:54 +01:00
Adrian Cole c7f35d3bb1 removed invalid @Nullable usage and also usage of javax package usage 2012-08-11 20:59:16 -07:00
Adam Lowe 4fad770eaf openstack-nova: allowing extension of the standard extensions by providers 2012-08-12 02:48:24 +01:00
Everett Toews b16a0667a4 Fixed Issue 1063. See http://code.google.com/p/jclouds/issues/detail?id=1063
Old code was using flavorId in the request body when what is required is flavorRef. See http://docs.openstack.org/api/openstack-compute/2/content/Resize_Server-d1e3707.html
2012-08-10 14:14:42 -05:00
Andrew Donald Kennedy 8c544ddef0 Making more OpenStack Nova APIs extensible using generic return values 2012-08-09 17:02:23 +01:00
Adam Lowe 082ec6f008 openstack-nova: binding missing fields to CreateVolume requests 2012-08-08 10:11:56 +01:00
Andrew Donald Kennedy ec184ce4d2 Updating Nova to allow easier definition of OpenStack API providers with extensions, initially only for ServerApi 2012-08-06 17:34:50 +01:00
Adrian Cole a439c03efc [maven-release-plugin] prepare for next development iteration 2012-08-02 21:49:23 -07:00
Adrian Cole 1ece74b733 [maven-release-plugin] prepare release jclouds-1.5.0-beta.9 2012-08-02 21:49:21 -07:00
Adrian Cole a898999355 merged master 2012-08-02 21:17:47 -07:00
Adrian Cole 3ab960ce39 made ec2 tests a bit more portable 2012-08-02 17:08:10 -07:00
vijaykiran 7a81769e1c Issue-1051 overrideLoginUser not working 2012-08-03 01:14:09 +02:00
Adrian Cole 391c61c852 Issue 1051: added unit test to show what's wrong 2012-08-01 21:56:42 -07:00
Adrian Cole bb5927515e Issue 934: templateOptions.tags,userMetadata for vcloud 2012-08-01 16:56:19 -07:00
Adrian Cole 1abcffb612 Issue 1052:Path incorrect when S3 in path-mode and servicePath is default 2012-08-01 11:35:10 -07:00
Adrian Cole 795dd48abb Merge pull request #762 from andrewgaul/commons-io
Use consistent and latest version of commons-io
2012-07-31 08:15:56 -07:00
Adam Lowe 85eac27509 openstack-keystone: marking Role.id as @Nullable. Resolves live problem whereby keystone fails to return Role id's for admin users - added unit test with (slightly modified) real data. 2012-07-31 15:10:58 +01:00
Andrew Gaul 577cde0a02 Denormalize path when removing subtree
This commit improves filesystem blobstore compatibility on Windows.
This partially reverts cfe3169.  Tested on Ubuntu 12.04 and Windows 7.
References #737.  Closes #912.
2012-07-30 14:42:44 -07:00
Adrian Cole 00f5f0367d Merge pull request #763 from andrewgaul/filesystem-replace
Prefer string replacement over regular expression
2012-07-30 14:16:14 -07:00
Andrew Gaul e253f539d6 Prefer string replacement over regular expression
Previously this method threw an PatternSyntaxException due to a
missing level of escaping.  Also remove bogus test.
2012-07-30 13:36:43 -07:00
Adrian Cole b5558a25e9 test expectations 2012-07-30 12:31:16 -07:00
Adrian Cole 53fe278f03 added windows password parsing to ec2 2012-07-30 12:31:11 -07:00
Andrew Gaul ed8319dbae Use consistent and latest version of commons-io
Changelogs:
http://commons.apache.org/io/upgradeto2_0.html
http://commons.apache.org/io/upgradeto2_2.html
http://commons.apache.org/io/upgradeto2_4.html
2012-07-30 10:58:32 -07:00
Adam Lowe 74f8b2d0c0 cloudservers: Issue 971 changing to immutable domain objects with builders, annotated with ConstructorProperties and Named 2012-07-30 13:50:00 +01:00
Adam Lowe 2f01337b64 nova: issue 971 adding/adjusting builders and applying ConstructorProperties to domain objects 2012-07-30 13:50:00 +01:00
Adam Lowe 2022bf3fbb swift: issue 971 adding builders and applying ConstructorProperties to domain objects 2012-07-30 10:36:03 +01:00
Adrian Cole 735da0a285 Issue 1037: consolidate keystone endpoints to end with /v2.0/ + change hpcloud to default to user/pass auth 2012-07-29 16:30:20 -07:00
Andrew Gaul 8ed0e28e68 Spelling corrections 2012-07-26 22:39:35 -07:00
Adrian Cole 92f9cc4c0c Merge pull request #756 from andrewgaul/reorder-strategy
Shuffle strategy methods into consistent order
2012-07-26 17:04:39 -07:00
Andrew Gaul f5548f3a94 Shuffle strategy methods into consistent order
Group by container, blob, and miscellaneous methods.  Within these
groups, sort by by exists, getter, setter, and remove.  Code movement
only; no functional changes.
2012-07-26 13:52:23 -07:00
Adrian Cole c7976c8abc Merge pull request #754 from andrewgaul/hp-cloud-account-regex
Loosen regex for parsing HP Cloud account
2012-07-26 13:32:55 -07:00
Andrew Gaul ebc65ec8f3 Loosen regex for parsing HP Cloud account
My account has only digits without an underscore.  The failed regex
match caused calls to blobExists to throw an exception when the blob
did not exist.
2012-07-26 12:44:21 -07:00
Adrian Cole 3e2e24493e Issue 981: better toString on template 2012-07-26 11:28:38 -07:00
Adrian Cole 1b0d6e027a prettier toString on ec2 2012-07-26 10:07:14 -07:00
Adrian Cole 2cca4a9c66 added ec2 live tests for clones 2012-07-26 09:25:11 -07:00
vijaykiran d2d70fd2bf Update API end point for elastichosts 2012-07-25 20:44:15 +02:00
Richard Downer 6c86b89d83 DescribeSnapshotsResponseHandler bug parsing tags
DescribeSnapshotsResponseHandler behaved incorrectly when a snapshot had
metadata tags added - it would stop parsing and start the next Snapshot
object every time it saw an </item> tag. Since metadata tags contain
</item>, each tag would cause a new Snapshot object in the response
containing all nulls. Fixed by counting the tag nesting depth and only
responding to </item> at the correct nesting level.
2012-07-25 16:20:12 +01:00
Adrian Cole 5d6e005e8b Issue 1030:defaults not picking up on compute.templateOptions() 2012-07-25 00:33:39 -07:00
Adrian Cole 416a795796 Merge pull request #750 from andrewgaul/predicates2
Introduce Predicates2.startsWith and endsWith
2012-07-24 23:17:41 -07:00
Andrew Gaul 3648863a3c Introduce Predicates2.startsWith and endsWith 2012-07-24 22:21:34 -07:00
vijaykiran de3db2103d issue-1026 Support for aws-ec2 hi1.4x instance 2012-07-25 00:26:21 +02:00
Adrian Cole 25fc0d69a3 [maven-release-plugin] prepare for next development iteration 2012-07-24 11:11:18 -07:00
Adrian Cole 9c38d9af14 [maven-release-plugin] prepare release jclouds-1.5.0-beta.8 2012-07-24 11:11:09 -07:00
Adrian Cole 954b5f914b Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x
* 'master' of github.com:jclouds/jclouds: (33 commits)
  optimize imports
  reset loginpassword/privatekey when explicitly set
  revised tests that AdminAccess change recently broke
  Issue 1028:vCloud Director 1.5: require x-vcloud-authorization header on vcloud api
  Add SYSTEM scope from DMTF CIMI. FGCP provider needs it.
  Issue-1020 Add full name option for AdminUser and UserAdd
  Add missing @Override in TransientStorageStrategy
  format and imports
  Ensure that EventBus is a singleton
  Introduce LocalAsyncBlobStore
  Miscellaneous local blobstore cleanups
  Prefer valueOf over explicit object creation
  Move helper method to TransientStorageStrategy
  Move copy(MutableBlobMetadata) to BlobStoreUtils
  Cloudstack VirtualMachines can have negative cpuUsed values for some reason
  removed dead code
  corrected destroyNodes bug
  Fixed compilation failures caused by 70fa74df1a
  Remove encodeString() and encodeString(String)
  Shuffle blobstore parameters to match superclass
  ...
2012-07-24 10:05:43 -07:00
Adrian Cole 5bd9e3ad9f Issue 1028:vCloud Director 1.5: require x-vcloud-authorization header on vcloud api 2012-07-23 19:28:58 -07:00
Andrew Gaul 562f8277d3 Introduce LocalAsyncBlobStore
This commit unifies the filesystem and transient blobstores.
2012-07-23 09:20:41 -07:00
Andrew Gaul 756e46333f Miscellaneous local blobstore cleanups
There are no more functional differences between the filesystem and
transient blobstores.  This is the last commit before introducing a
unified LocalAsyncBlobStore class.
2012-07-23 08:06:36 -07:00
Adrian Cole b890765e9e Merge pull request #738 from andrewgaul/local-blobstore-move-helper-method
Move helper method to TransientStorageStrategy
2012-07-23 07:37:30 -07:00
Adrian Cole d5f9bb3172 Merge pull request #739 from andrewgaul/prefer-valueof
Prefer valueOf over explicit object creation
2012-07-22 22:00:09 -07:00
Andrew Gaul 985cccff9a Prefer valueOf over explicit object creation
This allows use of cached values.  Patched with:

find -name \*.java | xargs sed -i 's/new Boolean(false)/Boolean.FALSE/g'
find -name \*.java | xargs sed -i 's/new Boolean(true)/Boolean.TRUE/g'
find -name \*.java | xargs sed -i 's/new Boolean(/Boolean.valueOf(/g'
find -name \*.java | xargs sed -i 's/new Integer(/Integer.valueOf(/g'
find -name \*.java | xargs sed -i 's/new Long(/Long.valueOf(/g'
2012-07-22 21:01:46 -07:00
Andrew Gaul 22da88d2ae Move helper method to TransientStorageStrategy
Also move etag generation since we cannot reuse Payloads in the
general case.
2012-07-22 20:02:59 -07:00
Andrew Gaul 0bc5c69a4f Move copy(MutableBlobMetadata) to BlobStoreUtils 2012-07-22 17:37:18 -07:00
Andrew Bayer d585ace712 Cloudstack VirtualMachines can have negative cpuUsed values for some reason 2012-07-22 12:23:22 -07:00
Andrew Gaul 870ed0cdb3 Shuffle blobstore parameters to match superclass
Also remove unused injected parameter.
2012-07-19 07:17:02 -07:00
Adrian Cole 70fa74df1a Merge pull request #731 from andrewgaul/input-supplier
Prefer InputSupplier helpers
2012-07-19 04:34:25 -07:00
Andrew Gaul a40983a39d Prefer InputSupplier helpers
These ensure that inputs are closed properly.

Updated with: find -name \*.java | xargs sed -i
's/toStringAndClose(\(.*\)\.getInput())/toString(\1)/'
2012-07-18 17:42:48 -07:00
Andrew Gaul a2d5a48f3f Inject TransientStorageStrategy
Remove some unneeded checkNotNull as Guice does not inject null
parameters.
2012-07-18 16:02:07 -07:00
Andrew Gaul 8a9265f015 Tie up odds and ends from LocalStorageStrategy
Use LocalStorageStrategy instead of TransientStorageStrategy and
handle IOExceptions.  Aso use dummy location in filesystem blobstore.
2012-07-18 09:45:23 -07:00
Adrian Cole bf06b51788 Merge pull request #726 from andrewgaul/local-storage-strategy
Introduce LocalStorageStrategy
2012-07-18 03:31:18 -07:00
Andrew Gaul c30c2c4809 Introduce LocalStorageStrategy
This commit will allow eventual unification of the filesystem and
transient blobstores.  No functional changes -- rename
FilesystemStorageStrategy to LocalStorageStrategy and implement it in
FilesystemStorageStrategyImpl and TransientStorageStrategy.
2012-07-17 23:11:10 -07:00
Adrian Cole 11e9728dd5 [maven-release-plugin] prepare for next development iteration 2012-07-17 23:32:35 -04:00
Adrian Cole c3697ebbae [maven-release-plugin] prepare release jclouds-1.5.0-beta.7 2012-07-17 23:32:32 -04:00
Adrian Cole 00d2ac2df7 Merge branch 'master' of https://github.com/jclouds/jclouds into 1.5.x
* 'master' of https://github.com/jclouds/jclouds:
  Issue 1024:Not possible to create hvm Linux nodes on Amazon
  Remove duplicated hexadecimal conversion code
  Ensure we close streams via InputSupplier methods
  Reduce filesystem and transient differences
  expect tests: removing requirement that requests are unique (so orderedRequestsSendResponses can tee up different responses for the same request when testing functions)
  Initial implementation of controlling SmartOS over SSH connection.
  Harmonize filesystem and transient putBlob
  remove stray @Test on base class as it's causing warnings due to its public non-test methods
  Issue 1011: remove PagedIterator
  Added optional timeout to EC2 listNodes strategy and made awaitCompletion update latch in finally block
  added concat to PagedIterable
2012-07-17 23:17:46 -04:00
Adrian Cole 1ee26e4754 Issue 1024:Not possible to create hvm Linux nodes on Amazon 2012-07-17 23:15:06 -04:00
Adrian Cole 007eba6d7c Merge pull request #723 from andrewgaul/filesystem-transient-input-supplier
Ensure we close streams via InputSupplier methods
2012-07-17 15:23:47 -07:00
Andrew Gaul bd5bf0dad2 Ensure we close streams via InputSupplier methods 2012-07-17 11:46:10 -07:00
Andrew Gaul d89153ed1f Reduce filesystem and transient differences 2012-07-17 09:50:47 -07:00
Adrian Cole 01f121a654 Merge pull request #720 from andrewgaul/filesystem-transient-putblob
Harmonize filesystem and transient putBlob
2012-07-17 05:37:58 -07:00
Andrew Gaul 02203afb07 Harmonize filesystem and transient putBlob 2012-07-16 22:02:00 -07:00
Adrian Cole a979c31d8c Merge pull request #718 from grkvlt/transform-parallel-timeout
Timeouts on FutureIterables.transformParallel
2012-07-16 16:40:45 -07:00
Adrian Cole 3154371433 Issue 1011: remove PagedIterator 2012-07-16 12:11:59 -04:00
Andrew Donald Kennedy 4463b52051 Added optional timeout to EC2 listNodes strategy and made awaitCompletion update latch in finally block 2012-07-16 16:58:37 +01:00
Adrian Cole addeb0d031 added concat to PagedIterable 2012-07-16 11:07:17 -04:00
Adrian Cole e4545fe5fa Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x
* 'master' of github.com:jclouds/jclouds: (30 commits)
  Issue 1011: introducing PagedIterable
  Transform to work with SaxParser
  added @Transform
  disabled test that broke cloudbees build
  Issue 1022:Move naming convention to Api from Client or Services:: cdmi
  merged cdmi changes and fixed classpath issues
  Issue 1022:Move naming convention to Api from Client or Services:: glesys jenkins openstack-* opsource-servers savvis-symphonyvpdc cloudwatch cloudidentity rackspace-cloudidentity aws-cloudwatch rackspace-cloudservers-us hpcloud-compute rackspace-cloudservers-us trystack-nova
  Issue 1022: naming conventions
  cloudstack: removing unnecessary (and in some cases misleading Named annotations). Also removing CloudstackParserModule - handling deserialization in constructors marked with ConstructorProperties annotation
  Issue 1022:Move naming convention to Api from Client or Services:: carrenza-vcloud-director
  Issue 1022:Move naming convention to Api from Client or Services:: joyent-cloudapi joyentcloud
  Issue 1022:Move naming convention to Api from Client or Services:: vcloud-director
  cleaned up http builders and expect tests
  Fix infinite loops, found by FindBugs
  Log hostnames only if they differ
  vcloud tidies
  nodepool progress and AdminAccessBuilderSpec
  Issue 1022: updated aws-elb aws-iam aws-rds iam elb rds to new naming conventions
  Issue 1022: added BaseRestApiExpectTest
  swift keystone 2.0: applying defaultProperties()
  ...
2012-07-15 23:46:35 -07:00