Commit Graph

653 Commits

Author SHA1 Message Date
Adrian Cole 20f3e52731 Merge branch 'master' of https://github.com/grkvlt/jclouds
* 'master' of https://github.com/grkvlt/jclouds:
  The describeAddressesInRegion call returns empty set on not found, not exception
  PublicIpInstanceIdPair has different id format to node
  Issue 757: Remove old public IPs when associating  elastic IP addresses
2011-12-21 03:46:00 -08:00
Alasdair Hodge 3f0f782f9d Include tags when converting between Map and Drive{Info,Data} 2011-12-21 11:28:32 +00:00
Alasdair Hodge ede85e28f5 Drive domain object (and subclasses) refer to tags, and not explicitly to affinity 2011-12-21 11:22:08 +00:00
Adrian Cole e2bb762cb1 updated cloudservers to current style of credential management 2011-12-21 03:15:09 -08:00
Andrew Donald Kennedy 979d9ba046 The describeAddressesInRegion call returns empty set on not found, not exception 2011-12-21 11:13:46 +00:00
Andrew Donald Kennedy ee0bade6ad PublicIpInstanceIdPair has different id format to node 2011-12-21 11:05:29 +00:00
Alasdair Hodge e4eedf9b99 Add tags to CloneDriveOptions 2011-12-21 11:02:39 +00:00
Andrew Donald Kennedy ddbf39e4a6 Issue 757: Remove old public IPs when associating elastic IP addresses 2011-12-21 10:51:35 +00:00
Alasdair Hodge 933e64ecc6 Add affinity attribute to Drive
. add constructor arg and update all uses (inc subclasses)
. update hashCode() and equals(), inc builder
2011-12-21 10:40:33 +00:00
Alasdair Hodge fd6a0779dd CloneDriveOptions now conveys affinity (in 'tags' option) 2011-12-21 10:20:10 +00:00
Alasdair Hodge b8753e6359 added AffinityType enum 2011-12-21 10:18:06 +00:00
Adrian Cole f9b38f646c Issue 730: removed deprecated methods from ComputeService RunScript/TemplateOptions SshClient.Factory and replaced occurences of Credentials with LoginCredentials whereever possible 2011-12-20 23:19:45 -08:00
Adrian Cole 766b0ab5ba Merge pull request #269 from grkvlt/master
Some small changes for vcloud (greenhousedata) tests
2011-12-20 10:55:32 -08:00
Andrew Donald Kennedy e4c8789917 The template entries in a catalog may have different names to the acutal VAppTemplates, so check the URIs 2011-12-20 18:29:13 +00:00
Andrew Donald Kennedy 1b10e19e0b The deleteVAppTemplate method returns Task XML data 2011-12-20 18:29:10 +00:00
Richard Downer c64f89f2c7 Protect against a potential infinite loop 2011-12-20 16:25:52 +00:00
andreisavu c3e09cc09f Add ListLoadBalancerRulesResponseTest; fix issues in parsing the response (with some code from Andrei Savu) 2011-12-20 16:25:52 +00:00
Adrian Cole 8148151b85 Issue 783:HTTP Accept header field contains invalid type (*) 2011-12-19 22:57:52 -08:00
Adrian Cole 075c0c8e5e allow cdn lookup to fail while in beta 2011-12-19 17:49:28 -08:00
Adrian Cole 375870bced swift does not support quotes in blob names 2011-12-19 17:37:14 -08:00
Jeremy Daggett 6d6d68fdde Merge branch 'master' into hpcloud-object-storage 2011-12-19 14:47:07 -08:00
andreisavu 2aec451f1c Also updated CloudWatchAsyncClientTest 2011-12-19 14:41:55 +02:00
andreisavu b15db13574 Updated CloudWatchClient code to latest version
See
http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference/i
ndex.html?API_GetMetricStatistics.html
2011-12-19 13:25:06 +02:00
Adrian Cole 29809d6e09 should cleanup after test 2011-12-19 02:39:07 -08:00
Adrian Cole 6bac1db9fb typos 2011-12-19 01:52:42 -08:00
Adrian Cole bf99fb10a0 Issue 757: refactor elastic ip auto-allocation approach and backfill related tests 2011-12-19 01:46:19 -08:00
Adrian Cole 75604da8f2 Merge pull request #259 from andreisavu/datapoint-public
Make Datapoint getters public
2011-12-19 01:42:01 -08:00
andreisavu c03265785e Make Datapoint getters public 2011-12-19 11:34:40 +02:00
Jeremy Daggett fb9739f615 Merging issues 2011-12-18 20:37:44 -08:00
Jeremy Daggett c8ca287303 Fixes to Container related operations 2011-12-18 19:43:50 -08:00
Adrian Cole 43d15301c3 removed deprecated newBlob 2011-12-18 18:35:18 -08:00
Adrian Cole 4eb6c08155 removed deprecated Unwrap fields 2011-12-18 17:59:13 -08:00
Jan Paral 1f095fda4a Issue 757: Auto allocate Elastic IPs and deal with empty tags in describe security groups response 2011-12-18 16:47:13 -07:00
Adrian Cole e942d58fa7 Merge pull request #254 from grkvlt/master
Issue 779: Fix password/privateKey override issues with providers
2011-12-18 13:37:09 -08:00
Andrew Donald Kennedy 31d3fe483f Issue 769: Make password and privateKey optional for LoginCredentials 2011-12-17 14:08:49 +00:00
Adrian Cole 9eb10c62b3 timezone doesn't help here 2011-12-16 20:52:47 -08:00
Richard Downer d596cd18f1 Add live tests for the Usage API 2011-12-16 16:42:38 +00:00
Richard Downer 35e034a29a Add the listUsageRecords API operation 2011-12-16 16:42:38 +00:00
Richard Downer 1fbc029bc8 Add UsageRecord to the domain model 2011-12-16 16:42:38 +00:00
Richard Downer 5c00a029c6 Add CloudStackDateAdapter to work around strange date format emitted by CloudStack 2011-12-16 16:42:38 +00:00
Richard Downer 41329c3528 Add generateUsageRecords API call and tests 2011-12-16 16:37:22 +00:00
Richard Downer e64807ee59 Add GenerateUsageRecordsOptions + test 2011-12-16 15:24:37 +00:00
Richard Downer f5c9ba6c0a Add empty feature for Usage (global admin) 2011-12-16 15:24:37 +00:00
Adrian Cole beb87a2131 Issue 781:update to guava 11.0-rc1 2011-12-14 23:56:50 -08:00
Adrian Cole 40d2abbac5 Issue 780:add new sa-east-1 region 2011-12-14 22:42:32 -08:00
Richard Downer c000db598d Add listStoragePools to the GlobalStoragePool[Async]Client, with tests 2011-12-14 17:07:46 +00:00
Richard Downer ec46da8b59 Add ListStoragePoolsOptions + test 2011-12-14 17:07:46 +00:00
Richard Downer 56baa1977f Add domain object for StoragePool 2011-12-14 17:07:46 +00:00
Richard Downer c8bc318fba Add empty feature classes for Storage Pool API 2011-12-14 17:07:46 +00:00
Aled Sage 44df7b0d69 Issue 763: deleted testTemplateBuildsFasterByImageIdThanBySearchingAllImages 2011-12-13 22:42:14 +00:00
Aled Sage d32bbc18c4 Issue 763: moved testTemplateBuildsFasterByImageIdThanBySearchingAllImages, from EC2ComputeServiceLiveTest to EC2TemplateBuilderLiveTest; disabled in eucalyptus-partner-cloud 2011-12-13 22:42:13 +00:00
Aled Sage f140688077 Issue 763: added EC2TemplateBuilderLiveTest to assert httpCommands don't fetch all images 2011-12-13 22:42:13 +00:00
Adrian Cole 993cd08bbc reversed pull 239 as it broke the build 2011-12-13 11:45:49 -08:00
andreisavu 30f7ec4ba4 Unit test for UpdateUserOptions 2011-12-13 18:54:55 +02:00
andreisavu 011d6ad7f2 Unit test for CreateUserOptions 2011-12-13 17:55:55 +02:00
andreisavu 4320cb3a8d Unit test for UpdateAccountOptions 2011-12-13 17:52:42 +02:00
andreisavu 21d1c41e2d Unit tests for CreateAccountOptions 2011-12-13 17:49:32 +02:00
andreisavu a19242480b Unit test for ListUserOptions 2011-12-13 17:37:01 +02:00
andreisavu 41e13ae78f Unit test for parsing registerUserKeys response 2011-12-13 12:20:44 +02:00
andreisavu 81a4b25cee Finished implementing registerUserKeys API 2011-12-13 08:50:58 +02:00
Adrian Cole c10d585052 fixed broken unit test 2011-12-12 17:46:39 -08:00
Adrian Cole 2aca11d94b Merge pull request #234 from andreisavu/user-enums-for-host
Use enums for the Host domain object
2011-12-12 14:51:56 -08:00
Adrian Cole 53b64e6c19 Merge pull request #232 from andreisavu/domain-user-account
Implement account & user management (global & domain API)
2011-12-12 14:46:05 -08:00
andreisavu efc1224dae Use different endpoint for registerUserKeys API call 2011-12-13 00:00:05 +02:00
andreisavu 37cba62459 Updated Host.State enum for Cloudstack 2.2.12 2011-12-12 23:01:44 +02:00
andreisavu b6a58941e9 Live test disable / enableAccount API 2011-12-12 22:55:42 +02:00
andreisavu 616485364b Live test disable / enableUser API 2011-12-12 22:15:05 +02:00
andreisavu 7b6ebefbd4 Added unit tests for GlobalUserAsyncClient 2011-12-12 17:07:19 +02:00
andreisavu 7e8e2ca460 Added tests for GlobalAccountAsyncClient 2011-12-12 16:49:45 +02:00
andreisavu 59c2b2c8bc Tentative on implementing the registerUserKeys API
It doesn't work yet because it requires a different authentication
strategy.
2011-12-12 15:10:32 +02:00
andreisavu 3f9f392941 Use enums for the Host domain object 2011-12-12 13:57:14 +02:00
andreisavu 9c32c06c25 Implemented updateUser global admin API and live test 2011-12-12 10:48:11 +02:00
andreisavu 8591bdb111 Implemented createUser global admin API and live test 2011-12-12 10:48:11 +02:00
andreisavu f25289bf0f Implemented deleteUser global admin API 2011-12-12 10:48:11 +02:00
andreisavu a5fd2f7a05 Implemented updateAccount global admin API 2011-12-12 10:48:11 +02:00
andreisavu d2eb9866c5 Implemented create / deleteAccount global admin APIs 2011-12-12 10:48:11 +02:00
andreisavu 842c7b8e01 Implemented domain admin listUsers API and a simple live test 2011-12-12 10:48:11 +02:00
andreisavu 18ca69503c Enable / disable user account domain API calls 2011-12-12 10:48:11 +02:00
andreisavu 40fbe9da57 Added empty classes for global user API 2011-12-12 10:48:10 +02:00
andreisavu 7582d1a117 Added empty classes for domain user API 2011-12-12 10:48:10 +02:00
andreisavu 3b69fc7d0a Added unit tests for new domain account client API calls 2011-12-12 10:48:10 +02:00
andreisavu 39cd3cba2a Added DomainAccountClient methods for disabling and enabling an account 2011-12-12 10:48:10 +02:00
andreisavu 7bece5985a Renamed Volume.VolumeType to Volume.Type 2011-12-11 21:41:09 +02:00
andreisavu 78e36e7904 Use the VolumeType enum in ListVolumesOptions 2011-12-11 21:36:16 +02:00
andreisavu adf1ebb7c5 Completed ListHostsOptions with unit tests 2011-12-11 11:36:57 +02:00
andreisavu 5f1d70121d Added unit test for GlobalHostAsyncClient 2011-12-11 10:42:33 +02:00
andreisavu 115ed78970 Added a few more assertions in the live test 2011-12-11 09:56:54 +02:00
andreisavu cea743b4f5 Response parsing for listHosts fully functional 2011-12-11 08:46:05 +02:00
andreisavu 0f57247e58 Basic functionality in place for listHosts feature 2011-12-11 08:46:05 +02:00
Aled Sage 094e537488 Issue 763: cache loader does not reload after AuthorizationException 2011-12-08 10:22:26 -08:00
Aled Sage dad5356991 Issue 763: Supplier<Set<Image>> for EC2 returns set backed by on-demand cache if ami-owners is empty 2011-12-08 10:22:26 -08:00
Aled Sage 741773f9ab Issue 763: set image cache expiry using PROPERTY_SESSION_INTERVAL 2011-12-08 10:22:26 -08:00
Aled Sage a45e16ebb3 Issue 763: code tidy, to use new ImagesToRegionAndIdMap.imagesToMap(Set<Image>) 2011-12-08 10:22:26 -08:00
Aled Sage 1fb371497b Issue 763: image cache loader: wrap in retry logic; don't memoize cache 2011-12-08 10:22:26 -08:00
Aled Sage 635c420a92 Issue 763: don't retrieve all images when template.imageId supplied 2011-12-08 10:22:26 -08:00
Adrian Cole d81d1680f7 remap public ip to private ip if incorrectly set by ec2 clone api 2011-12-07 13:32:44 -08:00
Adrian Cole 83529d2238 fix broken tests 2011-12-07 09:44:56 -08:00
vijaykiran ead59590f8 Merge branch 'master' of https://github.com/jclouds/jclouds into sync-domain-objects 2011-12-07 15:01:51 +01:00
vijaykiran 8b06ee410d Update toString methods 2011-12-07 15:01:41 +01:00
Jason King 74bd2cd4ce Merge pull request #225 from richardcloudsoft/cloudstack-capacity
Add some more capacity types, following information received from Citrix
2011-12-07 05:52:27 -08:00
Richard Downer 7038aa4641 Add some more capacity types, following information received from Citrix 2011-12-07 15:10:19 +02:00
Richard Downer f1123f7ecf Change use of JVM assert to TestNG assertTrue() when using jobComplete and other cases that appear to have side effects 2011-12-07 14:27:23 +02:00
vijaykiran 2566c04c19 Sync domain objects with json responses from the documentation - part 2 2011-12-07 13:17:35 +01:00
Richard Downer 335218867c Update Javadoc on CreateNetworkOptions: information about account ownership 2011-12-07 12:05:46 +02:00
Adrian Cole e5fbacbbf3 Merge pull request #219 from andreisavu/network-offering
Implement the cloudstack global admin update network offering API
2011-12-06 07:06:23 -08:00
andreisavu ce297635c2 Implement the cloudstack global admin update netowkr offering API & also added a bunch of missing tests 2011-12-06 16:41:29 +02:00
Richard Downer 38f5c2e3c7 Capacity domain object was missing a toString() implementation 2011-12-06 11:15:03 +02:00
Adrian Cole 16c6fadc0a Merge pull request #216 from andreisavu/disk-offering
Implement the Cloudstack global admin disk offerings API
2011-12-05 17:49:39 -08:00
Alex Heneveld b5b021aa48 added missing time zone which caused test to fail outwith +0200!
and remove unused and JDK-sensitive import sun.util.resources.CalendarData which breaks openjdk build
2011-12-06 00:05:26 +00:00
andreisavu 6667d865e7 Implement the Cloudstack global admin disk offerings API 2011-12-06 00:04:06 +02:00
Richard Downer a4ce36036a Implement the Cloudstack "system capacity" API 2011-12-05 22:00:54 +02:00
Richard Downer 120c907633 Fix typo calling wrong method 2011-12-05 21:56:47 +02:00
andreisavu 9b575acf65 Added back imports removed by rebase 2011-12-05 21:16:10 +02:00
andreisavu 0a14171a52 Implement the Cloudstack global admin service offerings API 2011-12-05 21:14:13 +02:00
Adrian Cole 0068fbbd63 algorithm can be null when lb is deleted 2011-12-05 10:28:08 -08:00
Adrian Cole 1680931776 reorganized test so that execution is predicatble when run in surefire 2011-12-05 10:28:08 -08:00
Adrian Cole f1334fb999 Merge pull request #211 from richardcloudsoft/cloudstack-monitoring
Implement the CloudStack 'alerts' API
2011-12-05 10:19:26 -08:00
Adrian Cole c7a240d887 Merge pull request #210 from richardcloudsoft/master
Fix bug in parsing VirtualMachine.cpuUsed
2011-12-05 10:18:47 -08:00
Richard Downer f39bdbe210 Add a Builder class for Alert 2011-12-05 19:57:54 +02:00
Richard Downer 48cdb58d8c Redo imports without "import package.*;" 2011-12-05 19:57:33 +02:00
Richard Downer 09b6df353a Further changes to VirtualMachine related to input and parsing of CpuUsed, and add a unit test 2011-12-05 19:24:49 +02:00
Richard Downer 3789aa3fc6 Implement the CloudStack 'alerts' API (available to the global administrator) 2011-12-05 14:44:10 +02:00
Richard Downer bdaebf8ce1 Add the global admin context to BaseCloudStackClientLiveTest 2011-12-05 14:44:10 +02:00
Richard Downer 6d657b1c90 Fix bug in parsing VirtualMachine.cpuUsed 2011-12-05 14:42:04 +02:00
Richard Downer 72d70162ab Name the created templates with the correct prefix, instead of inventing a random name 2011-12-05 10:05:19 +02:00
Richard Downer 1d60c0d819 TemplateClientLiveTest was not properly cleaning up the VMs and templates it created 2011-12-05 09:48:29 +02:00
vijaykiran 838ea11395 Sync domain objects with json responses from the documentation - part 1 2011-12-03 01:31:27 +01:00
andreisavu 46e3e4d20a Fixed a refactoring typo 2011-12-02 20:26:40 +02:00
Richard Downer 9939237c6b Merge branch 'master' into cloudstack-template-live-test
Conflicts:
	apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
2011-12-02 19:51:02 +02:00
Adrian Cole 2d3b652eb3 Merge pull request #196 from richardcloudsoft/cloudstack-deletetemplate
Cloudstack deleteTemplate call returns an asynchronous job response, not void
2011-12-02 09:21:25 -08:00
Adrian Cole 8626682535 Merge pull request #202 from andreisavu/list-async
Fix json parsing for listAsyncJobs
2011-12-02 09:19:23 -08:00
andreisavu 2a8003734f Removed unused import 2011-12-02 18:08:42 +02:00
andreisavu 9415797075 Made updates to the parser as Adrian suggested 2011-12-02 18:06:47 +02:00
andreisavu a6c43a5c4c Updated .json file to match server response for cloudstack 2.2.12 and tests 2011-12-02 17:56:08 +02:00
Richard Downer 18880d8284 Change JobResultResponseTest to use @SelectJson("jobresult") - because it's supposed to be testing JobResult, and AsyncJob is a distraction 2011-12-02 17:29:32 +02:00
Richard Downer 5e1e0806e9 Rename JobResult -> OperationResult 2011-12-02 17:24:12 +02:00
Alex Heneveld 002b15e982 grrr, enum usage wasn't picked up sooner, fixes for that 2011-12-02 15:24:02 +00:00
Alex Heneveld fd9bbd5d82 tidied one new equals method; too much tedium to do all of them, seems not worth it 2011-12-02 14:59:18 +00:00
Alex Heneveld 077b3eb52d enums to upper case, with camel conversion routines 2011-12-02 14:57:29 +00:00
Alex Heneveld 6c42eb04a0 simplified equals method as per asavu comment 2011-12-02 14:45:40 +00:00
Alex Heneveld 3a2b34665c some changes to facilitate subclassed client tests which access generic compute service functionality 2011-12-02 14:38:07 +00:00
Richard Downer beb76f925a Changes to TemplateClientLiveTest to make it faster (using a smaller VHD for import) and more reliable (it won't break if the provider's default templates are marked as not extractable) 2011-12-02 11:02:10 +02:00
Alex Heneveld 723dd61c33 added some more enums instead of strings, minor tidies (added missing Builder.build methods) 2011-12-02 03:05:58 +00:00
Alex Heneveld fc72c945f7 tidy of tests, to use retry/predicates and to timeout when appropriate, and to guard against various nefarious conditions 2011-12-02 02:33:43 +00:00
Alex Heneveld f329db5786 extensions needed to get snapshots/volumes working (from grkvlt) and tidies 2011-12-02 02:32:04 +00:00
Adrian Cole d0a2f54cb3 adjusted behavior relating to name/hostname 2011-12-01 16:33:19 -05:00
Richard Downer acf19637da Don't try to cheat the parser - real life has the payload inside an AsyncJob, so test that 2011-12-01 17:07:44 +02:00
andreisavu 09de9bf00e Use enums for status, result code & error code for async jobs 2011-11-30 17:44:58 +02:00
andreisavu 3b785994c7 Added enums with all the known error & status codes for async jobs 2011-11-30 17:43:14 +02:00
Richard Downer 1b0b154dfc Cloudstack deleteTemplate call returns an asynchronous job response, not void. 2011-11-30 16:24:15 +02:00