Commit Graph

1183 Commits

Author SHA1 Message Date
Aled Sage 09425f4f69 Version upgrades
- gson from 2.2 to 2.2.2
- guava from 13.0 to 13.0.1
- rocoto from 6.1 to 6.2
- log4j from 1.2.16 to 1.2.17
- log back from 1.0.0 to 1.0.7
- httpclient from 4.1.3 to 4.2.2
- netty from 3.3.1 to 3.5.9
- slf4j from 1.6.4 to 1.7.2
- testing from various to 6.8
- jetty from 8.1.1 to 8.1.7
- snakeyaml from 1.10 to 1.11
2012-10-29 13:00:44 +00:00
Andrew Gaul e7dde3aff5 Address minor copyright notice typos 2012-10-28 23:27:56 -07:00
Andrew Gaul caccd9cf4c Prefer Files.copy to copy streams 2012-10-24 17:44:05 -07:00
Ignasi Barrera 7bd6b016ab Added unit tests for the timeunit field and fixed javadoc 2012-10-24 19:40:32 +02:00
Ignasi Barrera 25bd57379d Use the TimeUnit parameter in async monitor 2012-10-24 18:16:06 +02:00
Ignasi Barrera 875563d0f1 Formatted code following jclouds guidelines
This commit formats all the Abiquo provider following the jclouds
formatting guidelines. It uses the Eclipse default formatting
configuration and a 3 spaces indentation and a line wrap fo 120
characters.
2012-10-22 20:28:56 +02:00
Adrian Cole 77d772d4b4 Merge pull request #890 from abiquo/simplify-compute
Improved Abiquo ComputeService
2012-10-21 16:20:22 -07:00
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
Andrew Gaul 28d7a6f143 Prefer immutable over empty collections
The former does not create an object when calling iterator(), as
discussed here:

https://groups.google.com/d/msg/jclouds-dev/l7BviKDXreA/mP6Ow_RYxIgJ
2012-10-20 15:35:29 -07: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
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
Andrew Gaul 2b8b72758f Prefer Files.toString over FileInputStream 2012-10-10 21:33:22 -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
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
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
Andrew Gaul 71080cf2e1 Use Resources.toString where possible
Replaces calls to
CharStreams.toString(Resources.newReaderSupplier(...)).
2012-10-07 15:37:40 -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 76beeee55b Merge pull request #873 from iocanel/master
Added name property to Context.
2012-10-06 00:26:07 -07:00
Ioannis Canellos b784cdd4af Added name property to Context. 2012-10-04 13:40:02 +03:00
Andrew Gaul ceb203c10a Improve use of InputSupplier helpers 2012-10-02 18:18:51 -07:00
Ignasi Barrera 8939700db4 Added pricing api 2012-09-27 11:39:17 +02:00
Ignasi Barrera 319d8ffc63 Removed SNAPSHOT dependencies
Removed SNAPSHOT dependencies and licensed all abiquo dependencies under
the ASL 2.0 license.
2012-09-25 11:50:07 +02:00
Ignasi Barrera 2f6e25e4e1 Removed jenkins profile 2012-09-25 11:50:07 +02:00
Andrea Turli fa93b39c3d issue 384: improved ISession management; managed to start VBoxExperimentLiveTest with 30 guests; added ubuntu 10.04.4 support; paramentrized guest memory 2012-09-19 11:37:01 +02:00
Adrian Cole 28d766b9df bumped to 1.6.0-SNAPSHOT 2012-09-17 01:43:52 -07:00
Adrian Cole 696f24280a glesys now a provider 2012-09-16 21:31:12 -07:00
Adrian Cole 63f1d334f2 stable glesys 2012-09-16 21:29:26 -07:00
Adrian Cole 2543c0abd7 disabled broken tests in abiquo 2012-09-16 16:21:34 -07:00
Adrian Cole 171c0804e0 conventions update for glesys 2012-09-16 16:20:07 -07:00
Adrian Cole e4a41e49fa fixed missing nullable 2012-09-16 15:03:20 -07:00
Adrian Cole b9bef78fc8 add title to savvis test 2012-09-16 14:57:24 -07:00
Adrian Cole b5f60f1e70 pagination and consistency cleanup on openstack 2012-09-16 00:19:30 -07:00
Adrian Cole dcca748a79 unused imports 2012-09-15 23:48:35 -07:00
Adrian Cole b951276ec3 cleaned up aws apis 2012-09-15 23:47:44 -07:00
Adrian Cole 3a3439c9a0 cleaned up cdmi 2012-09-15 23:45:48 -07:00
Adrian Cole 3b3efef104 cleaned up fgcp 2012-09-15 23:45:14 -07:00
Adrian Cole 7a3318d1ca wrong test name 2012-09-15 14:05:24 -07:00
Adrian Cole 5542114b9b Merge pull request #811 from nacx/abiquo
Add support for Abiquo
2012-09-15 12:25:13 -07:00
Adrian Cole c7cb9951a8 moved sqs/aws-sqs live 2012-09-14 18:15:50 -07:00
Adrian Cole fec732f33b added aws-sqs provider 2012-09-14 18:15:49 -07:00
Adrian Cole bc9cffad40 completed batch ops for sqs and modularized tests 2012-09-14 18:15:49 -07:00
Adrian Cole 887d4d1de8 modularized sqs 2012-09-14 09:11:04 -07:00
Adrian Cole 00da07aec4 added all operations except batch 2012-09-13 17:09:26 -07:00
Adrian Cole 4da4146062 add ChangeMessageVisibility to sqs 2012-09-12 22:14:14 -07:00
Adrian Cole b0626e3324 added tests and attributes calls to sqs 2012-09-12 21:36:12 -07:00
Andrea Turli dc212cf460 issue 384: added support for ubuntu12.04; prepared for supporting remote host 2012-09-12 08:41:18 +02:00
Adrian Cole 26f4ccdbb6 more progress on sqs 2012-09-11 23:30:14 -07:00
Adrian Cole c5fe0a77a4 switch sqs to use HashCode for md5 2012-09-11 10:42:26 -07:00
Adrian Cole 2efd9a76ca pulled SQS out of sandbox and into labs 2012-09-10 18:02:07 -07:00
Ignasi Barrera e43f16ff5d Pom fixes and cleanup, properties convention and other fixes commented in the pull-request 2012-09-07 12:56:46 +02:00
Ignasi Barrera 063e7e7168 Added Abiquo support in labs 2012-09-05 18:30:33 +02:00
Andrea Turli 9ea3d3c6bf issue 830: added systemadmin package; more tests fixed 2012-09-04 21:39:34 +02:00
Kenneth Nagin fd76b79b03 CDMI: adding support for
1) query parameters
2) non-cdmi content data object operations
2012-09-03 13:02:39 +03:00
Dies Koper a2d74a25f3 merge 2012-09-01 13:06:07 -07:00
Adrian Cole 1a9f49bce7 azure management base implementation 2012-09-01 13:02:19 -07:00
Andrea Turli b0466cad84 issue 830: fixed VAppTemplateApiLiveTest.deleteVAppTemplate 2012-08-27 16:10:48 +02:00
Adrian Cole a70e3adb20 Issue 1075:switch to use jetty for java install/web service tests 2012-08-27 00:10:18 -07:00
Dies Koper b7666da170 nslookup on CentOS 6.2 doesn't set error code when failing, so grep expected output instead 2012-08-27 14:31:33 +10:00
Andrea Turli 88ac4201a6 review addressed 2012-08-25 00:47:26 +02:00
Andrea Turli e5e3a3a2f8 issue 830: keypair 2012-08-25 00:30:28 +02:00
Adrian Cole a5e5019bec Merge pull request #800 from dkoper/cc5dc55bb06829b53c0c29f3730cff47be1a20d9
added the file to all places with shell scripts
2012-08-24 01:18:18 -07:00
Adrian Cole 7db0519d0b decrufted metadataapi 2012-08-24 00:38:18 -07:00
Dies Koper cc5dc55bb0 configure .gitattributes to not convert shell scripts to CRLF on Windows 2012-08-24 17:29:40 +10:00
Andrea Turli 4e8149bfe8 issue 830: more LiveTests fixed on query, vapp, vapptemplate and vdc features 2012-08-23 16:56:08 +02:00
Andrea Turli a0411cfed0 issue 830: fixed CatalogApiLiveTest 2012-08-23 11:50:12 +02:00
Andrea Turli 22629824aa issue 830: fixed networkConfiguration() private method 2012-08-22 18:27:30 +02:00
Andrea Turli 963edd906b issue 830: fixed tests on VAppApiLiveTest 2012-08-21 19:04:30 +02:00
Andrea Turli 77ae46fef3 issue 830: added VAppTemplateURNToHref conversion to get(String reference) 2012-08-20 16:29:12 +02:00
Adrian Cole aff96befbe refactored Metadata to implement Immutable Map<String, String>; addGroupToOrg GroupApi, MediaApi to use urn 2012-08-19 21:48:04 -07:00
Adrian Cole e016367280 case issue 2012-08-19 20:02:02 -07:00
Adrian Cole 169006b3ed Issue 830: refactored MediaClient to not require href arg; refactored VmApi, VAppApi, VAppTemplateApi to use urn 2012-08-19 19:50:51 -07:00
Adrian Cole cd0aa72ae1 Issue 830: renamed Api methods to be in accordance with vCloud relationship links 2012-08-19 16:46:02 -07:00
Adrian Cole cb844928c0 Issue 830: refactored VdcApi,AdminVdcApi to use urn 2012-08-19 16:08:16 -07:00
Adrian Cole 206af90b77 Issue 830: refactored Org, Network, Task, User apis to support URN; removed 'id' from Reference type 2012-08-19 15:23:20 -07:00
Adrian Cole 9e69626413 Issue 830: Cleaned up CatalogApi and AdminCatalogApi; added logic to use URNs as opposed to Hrefs 2012-08-19 02:34:25 -07:00
Adrian Cole 7fe724db43 Issue 830: add resolveEntity 2012-08-18 22:15:51 -07:00
Andrew Donald Kennedy 8b1a48b2e0 Fix hashCode to include parent Reference id 2012-08-16 22:32:45 +01:00
Adrian Cole 027b3d0d33 removed log4j dep 2012-08-15 22:29:36 -07:00
Adrian Cole e0ecf3aea1 Merge pull request #782 from grkvlt/openstack
Further OpenStack extensibility changes
2012-08-13 20:14:28 -07: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
Andrea Turli e92b370d51 added VAppNetworksLiveTest 2012-08-13 23:12:59 +02:00
Andrew Donald Kennedy f9a550529d Further OpenStack extensibility changes. Fixing constructors in RestContext classes 2012-08-13 16:18:43 +01:00
Adrian Cole b055fb1233 Merge pull request #780 from grkvlt/openstack
Openstack Extensibility
2012-08-12 09:29:51 -07:00
Andrew Donald Kennedy 2bfa9e0b23 openstack-quantum extensibility 2012-08-12 12:46:25 +01:00
Andrew Donald Kennedy 70fc6f5c52 openstack-swift extensibility 2012-08-12 12:43:55 +01:00
Andrew Donald Kennedy b3121b7889 openstack-glance extensibility 2012-08-12 12:42:22 +01:00
Adrian Cole 1dfd7e2b23 refactoring of smartos-ssh 2012-08-11 22:40:53 -07:00
Nigel Magnay 0bde836ed5 Extend the VmSpecification to allow for all the extra memory settings.
Correct the ComputeServiceAdapter to use information from the template
hardware provider ID to match the correct VmSpecification.

Provide some additional nice default templates.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2012-08-11 21:05:45 -07:00
Adrian Cole c7f35d3bb1 removed invalid @Nullable usage and also usage of javax package usage 2012-08-11 20:59:16 -07:00
Andrea Turli 14ab852907 adrian`s comments addressed 2012-08-09 19:41:30 +02:00
Andrea Turli efbaa257e5 added compose and recompose vapp live test 2012-08-09 17:35:18 +02:00
Andrea Turli 9454aeb257 issue 830: fixing vAppTemplateApi*Test, vAppApiLiveTest and vmApiLiveTest 2012-08-06 19:41:30 +02:00
Adrian Cole 486be5acc4 Issue 1056:create cloudstack-ec2 api 2012-08-02 17:43:38 -07:00
Adrian Cole b416496698 disabled greenqloud compute tests until baseline stuff works 2012-08-02 17:08:11 -07:00
Adrian Cole b478b02bbe switched to binary-based package manager checks 2012-08-01 11:35:10 -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
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
Adrian Cole 7a23930df6 typo 2012-07-29 16:30:19 -07:00
Nigel Magnay 56d5cf5834 If *not* empty, have IP, not other way around.
Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2012-07-28 16:40:18 +01:00
Andrew Gaul 8ed0e28e68 Spelling corrections 2012-07-26 22:39:35 -07:00
Adrian Cole 2cca4a9c66 added ec2 live tests for clones 2012-07-26 09:25:11 -07:00
Adrian Cole 64dce4c154 added test to greenqloud 2012-07-26 08:41:28 -07:00
Adrian Cole 23f84a9114 fixed things visibly wrong 2012-07-25 22:57:04 -07:00
Adrian Cole 0bc602a3d2 Issue 309: support CRUD on instances, w/incidental security group fns 2012-07-25 22:56:52 -07:00
Adrian Cole 8179713655 fixed joyent error handler 2012-07-25 00:33:40 -07:00
Adrian Cole 01918a02ec cleaned up joyent and fixed ssh auth related issues 2012-07-25 00:33:40 -07:00
Andrew Gaul 3648863a3c Introduce Predicates2.startsWith and endsWith 2012-07-24 22:21:34 -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
Adrian Cole 86b07ed768 format and imports 2012-07-23 11:43:37 -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
Adrian Cole 4c31fb65f1 Merge pull request #735 from dralves/nodepool
issue 558 - corrected final bug nodepool is working
2012-07-20 16:11:14 -07:00
David Ribeiro Alves b4c6d01eba removed dead code 2012-07-20 22:24:45 +01:00
David Ribeiro Alves b45fad87d8 corrected destroyNodes bug 2012-07-20 22:23:16 +01:00
Adrian Cole c4dde78b0c Merge pull request #725 from dralves/nodepool
issue 558 - nodepool
2012-07-19 04:38:59 -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 Phillips 75ce908c13 Made joyent-api tests compatible with Windows 2012-07-18 09:51:03 -04:00
Andrew Phillips f3419e90c9 Made virtualbox tests compatible with Windows 2012-07-18 09:51:01 -04:00
David Ribeiro Alves 0949d52224 added admin access property to all unit tests as hudson requires it (no pk) 2012-07-18 11:36:57 +01:00
David Ribeiro Alves 240f76661c corrected assertion 2012-07-18 02:42:25 +01:00
David Ribeiro Alves 4f3de0777f readded missing test 2012-07-18 01:58:55 +01:00
David Ribeiro Alves cdde419b24 re-enabled most tests and corrected some minor bugs, only destoyPoolNodes is missing 2012-07-18 01:58:18 +01:00
Adrian Cole 6264dee999 Merge pull request #713 from magnayn/master
Initial implementation of SmartOS-SSH
2012-07-17 15:26:02 -07:00
Nigel Magnay 46414e339a Initial implementation of controlling SmartOS over SSH connection.
This has been implemented mainly to allow jenkins-jclouds integration.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2012-07-17 11:19:00 +01:00
Adrian Cole addeb0d031 added concat to PagedIterable 2012-07-16 11:07:17 -04:00
Adrian Cole 315d5fb3ef Issue 1011: introducing PagedIterable 2012-07-15 23:34:42 -07:00
Adrian Cole daef7b4ce9 disabled test that broke cloudbees build 2012-07-15 15:58:22 -07:00
Adrian Cole 647317b9b4 Issue 1022:Move naming convention to Api from Client or Services:: cdmi 2012-07-15 15:47:44 -07:00
Kenneth Nagin 929a9ce044 merged cdmi changes and fixed classpath issues 2012-07-15 15:45:48 -07:00
Adrian Cole 180265fe49 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 2012-07-15 15:00:42 -07:00
Adrian Cole bb5d9b4577 Issue 1022:Move naming convention to Api from Client or Services:: carrenza-vcloud-director 2012-07-15 09:57:29 -07:00
Adrian Cole 199d39e093 Issue 1022:Move naming convention to Api from Client or Services:: joyent-cloudapi joyentcloud 2012-07-15 01:54:21 -07:00
Adrian Cole 6d13652338 Issue 1022:Move naming convention to Api from Client or Services:: vcloud-director 2012-07-15 01:50:51 -07:00
Adrian Cole 05fd64af44 cleaned up http builders and expect tests 2012-07-15 01:50:38 -07:00
Andrew Gaul b95f36952d Fix infinite loops, found by FindBugs 2012-07-14 18:46:58 -07:00
David Ribeiro Alves d4453b2ac2 nodepool progress and AdminAccessBuilderSpec 2012-07-12 11:04:55 -07:00
Adrian Cole 25ab7814e4 Issue 1022: updated aws-elb aws-iam aws-rds iam elb rds to new naming conventions 2012-07-12 10:08:10 -07:00
Andrea Turli 2400d9d826 jenkins api: added lastBuil api 2012-07-11 16:17:01 +02:00
Adrian Cole df3f331286 fixed delete on elb on 404 2012-07-11 00:11:05 -07:00
Adrian Cole c9f49bd512 Issue 309: initial support for amazon rds 2012-07-11 00:11:05 -07:00
Adrian Cole 105a302b1f stupid bug 2012-07-10 15:49:41 -07:00
Adrian Cole df2b88402c Issue 1014:rename joyent-sdc to joyent-cloudapi 2012-07-10 12:01:03 -07:00
Adrian Cole 8e88c53a3a Issue 852: added availability zone functions 2012-07-09 18:06:54 -07:00
Adrian Cole 0383a80904 Issue 1011: PaginatedIterable with marker type as Object 2012-07-09 16:08:32 -07:00
Adrian Cole 0d82a61142 elb usage cleanup 2012-07-09 00:03:02 -07:00
Adrian Cole d9d5aa2a12 added vpc data and cleaned usage 2012-07-08 18:18:54 -07:00
Adrian Cole 578c9e93f9 Issue 852: cleaned remaining elb methods 2012-07-06 20:23:09 -07:00
Adrian Cole 5d30da2908 Issue 852: added InstanceClient and got live tests passing 2012-07-05 23:22:20 -07:00