Commit Graph

312 Commits

Author SHA1 Message Date
Adrian Cole e46ee9fbc4 Issue 807:update license headers 2012-01-09 10:54:57 -08:00
Adrian Cole 8c81c34d97 Merge pull request #298 from andreisavu/lb-net-select
Improved network selection for Load Balancer client live test
2012-01-09 09:30:30 -08:00
Adrian Cole be9dac8034 Merge pull request #289 from richardcloudsoft/cs-secgrp
Validating network/security groups in CloudStackComputeServiceAdapter
2012-01-09 09:28:39 -08:00
andreisavu 3ff038bf31 Complete the Firewall Client API 2012-01-09 18:33:45 +02:00
Richard Downer ce6b79eeca Move the inner classes of OptionsConverter into own classes. Add JavaDoc and unit test. 2012-01-09 15:07:36 +02:00
Richard Downer abe77fd25a Create a LoadingCache that maps from zone ID to Zone object, and use it in createNodeWithGroupEncodedIntoName(). (Review feedback) 2012-01-09 13:56:41 +02:00
andreisavu cc28a2a370 Improved network selection for Load Balancer client live test 2012-01-09 13:24:09 +02:00
Richard Downer f9c86860ab Use an 'options converter' to switch out the behaviour differences between basic and advanced networking when building a DeployVirtualMachineOptions instance for creating nodes. 2012-01-08 22:05:18 +02:00
andreisavu 2fc3679c76 Added missing options & one extra call for CloudStack Load Balancers 2012-01-07 18:01:46 +02:00
Adrian Cole f390f314ee Issue 803: changes needed when guice is in production mode 2012-01-07 06:08:32 -08:00
Adrian Cole 3574dededb clarified initial Expect test 2012-01-06 15:38:09 -08:00
Adrian Cole 7e8baf4f02 added default url 2012-01-06 15:38:09 -08:00
Adrian Cole 73e79468f3 added missing binding for RestContext 2012-01-06 15:38:09 -08:00
andreisavu 1b9dfc7102 Test for AccountClient.listAccounts using the mock webserver 2012-01-06 15:38:08 -08:00
Adrian Cole f06e6982eb Issue 800:introduce property for build version 2012-01-05 17:51:55 -08:00
Adrian Cole 42137677da Issue 801:fix inconsistency in test property test.provider.apiversion set in pom.xml -> api-version 2012-01-05 13:09:45 -08:00
Richard Downer 8991d8e512 Address review comments: use guava checkArgument(), and use switch instead of if for zone network type 2012-01-05 09:51:05 +02:00
Richard Downer 1b80b28613 Rework the validation of network/security groups in CloudStackComputeServiceAdapter.createNodeWithGroupEncodedIntoName(). Add a live test to verify that jclouds works with CloudStack's convention of assigning the user's default security group, if one is not specified. 2012-01-03 15:37:26 +02:00
Adrian Cole 7146572620 Issue 797: converted many adapters to the new gson streaming method 2012-01-01 19:24:42 -08:00
Richard Downer 9b6a141111 Make PortForwardingRule natively use Set<String> for CIDR lists, and have the CloudStackParserModule deal with converting from a comma-separated list 2011-12-22 11:06:52 +00:00
Richard Downer 4248b879a5 Add a cidrlist to the listportforwardingrulesresponse.json test 2011-12-22 10:42:15 +00:00
Richard Downer eca39408ef PortForwardingRule should use commas to separate the CIDR list elements 2011-12-22 10:42:15 +00:00
Adrian Cole 68820d5d61 iso cleanup 2011-12-21 23:29:53 -08:00
Adrian Cole 70269a0091 test cleanup 2011-12-21 23:29:45 -08:00
Adrian Cole cc147a6ec6 fixed cidr list parse error 2011-12-21 22:26:03 -08:00
Adrian Cole d1f4339c84 fixed means by which tests get login credentials 2011-12-21 22:10:34 -08:00
Adrian Cole 55c182484f Merge pull request #277 from richardcloudsoft/cloudstack-lb
CloudStack LoadBalancer fixes
2011-12-21 17:20:07 -08:00
Richard Downer 4d89ed4054 Fix json object name for listLoadBalancerRuleInstances 2011-12-21 23:08:17 +00:00
Richard Downer 5414f7e06a Clarify LoadBalancerClientLiveTest 2011-12-21 23:08:16 +00:00
Richard Downer d9f01e0ff8 Create load balancer rule should be asynchronous 2011-12-21 23:08:16 +00:00
Richard Downer 31bd7c237b LoadBalancerClientLiveTest - it's a requirement of load balancer rules that these are applied to networks with guest IP type of VIRTUAL. 2011-12-21 23:08:16 +00:00
Richard Downer 21105f8322 Retry loop did not increment the counter, so it would never actually terminate after repeated failures. Also decreased the number of attempts from 50 to 10, as 50 took too long to fail. 2011-12-21 23:08:15 +00:00
Andrew Donald Kennedy 7a60ce579b Added stub ISO live test and ListISOsOptions minor refactoring 2011-12-21 18:53:34 +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
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 4eb6c08155 removed deprecated Unwrap fields 2011-12-18 17:59:13 -08: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
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
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
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 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
Adrian Cole b909137c4a mocks are not multithread capable 2011-11-29 13:58:40 -05:00
andreisavu 3ea37bbbe3 Added a few more negative tests 2011-11-29 18:19:33 +02:00
andreisavu 6afe98304c Added more tests for cloudstack predicates 2011-11-29 18:04:57 +02:00
andreisavu eed9501a1c Added unit test for VirtualMachineExpunged predicate 2011-11-29 14:01:45 +02:00
andreisavu 77f05795df Defined new predicate to check if a VM is expunged 2011-11-29 13:00:39 +02:00
Adrian Cole 4981ca6efb updated clone on templateoptions 2011-11-28 09:19:49 -05:00
Adrian Cole 933c9102ec updated cloudstack impl based on advice from citrix 2011-11-28 00:25:14 -05:00
Adrian Cole d31844469b ninefold is now version 2.2.12 2011-11-27 23:59:59 -05:00
Adrian Cole 51ad3139c9 updated cloudstack to setup multiple port forwarding rules so that inboundPorts Template Option can operate 2011-11-27 23:32:42 -05:00
Adrian Cole fc4d4fcd2c block on job complete 2011-11-27 18:45:52 -05:00
Adrian Cole 9dc71cec3a corrected the disableStaticNAT functions, and added code to properly clean up on destroy node 2011-11-27 18:15:58 -05:00
Adrian Cole 4c835851de fixed some quality issues 2011-11-27 11:30:19 -05:00