Commit Graph

525 Commits

Author SHA1 Message Date
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
Adrian Cole a530b5b5d6 fixed bad state in cloudstack when node is stopped 2011-11-27 11:13:55 -05:00
andreisavu 89e575f2b3 A few test & template extraction fixes 2011-11-23 17:51:34 +02:00
Adrian Cole 8370a20654 fixed broken tests 2011-11-22 23:59:17 +02:00
Jason King 4aa9e4e8c5 Merge pull request #185 from andreisavu/multiple-ip-forwarding
A VM and an IP address can have multiple forwarding rules attached
2011-11-22 09:52:31 -08:00
Andrew Donald Kennedy 3a2660ad5d Added Snapshot live tests 2011-11-22 15:19:32 +00:00
andreisavu f0fc752865 A VM and an IP address can have multiple forwarding rules attached 2011-11-22 16:37:10 +02:00
Jason King bf6c0f4984 Merge branch 'master' of https://github.com/grkvlt/jclouds into grkvlt-master
Conflicts:
	apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeClientLiveTest.java
2011-11-22 12:30:53 +00:00
Andrew Donald Kennedy 2fe71a4ea2 Added unit test for getVolume 2011-11-22 11:26:35 +00:00
Andrew Donald Kennedy 7a2c6c6edd Add extra test for getVolume 2011-11-22 11:11:45 +00:00
Jason King 4341cc21e5 Merge pull request #182 from andreisavu/admin-remove-vlan
Use the domain admin client to remove the vlan network
2011-11-22 02:35:28 -08:00
andreisavu 1d7fd87f59 Use the domain admin client to remove the vlan network 2011-11-22 11:47:20 +02:00
Andrew Donald Kennedy 42a2cc73e4 Added getVolume command 2011-11-21 18:40:08 +00:00
Adrian Cole 009c1e30f6 made new cloudstackcontext with visibility to domainAdmin and also globalAdmin clients 2011-11-21 19:57:39 +02:00
Andrew Donald Kennedy 4095ebd4ab Clean up volume tests 2011-11-21 17:44:09 +00:00
Adrian Cole 4a5af1e7a5 Issue 441: added new type: LoginCredentials, and (jclouds|provider).image.(login-user|authenticate-sudo) context properties 2011-11-21 11:00:12 +02:00
andreisavu 4dfa16c6f8 Allow users to disable the creation of a static nat for a new virtual machine 2011-11-20 18:25:33 +02:00
Richard Downer 74e61aaada Implement a live test for Cloudstack registerTemplate API call 2011-11-18 15:26:07 +00:00
Richard Downer ed865f100a CloudStack registerTemplate call actually returns an array of templates, not a single template 2011-11-18 14:53:41 +00:00
Adrian Cole e08372a8aa cloudstack doesn't authoritatively set the hostname 2011-11-17 16:12:12 +02:00
Adrian Cole 2e675f0fbc fixed broken parser test 2011-11-17 15:42:14 +02:00
Adrian Cole 3b4bc8d1d2 Merge pull request #166 from vijaykiran/networkclient-fixes
Sync the output of network json with the domain model
2011-11-17 05:03:08 -08:00
Adrian Cole 5cdff59bfe Merge pull request #164 from richardcloudsoft/cloudstack-template-live-test
Cloudstack template live test - extract template functionality
2011-11-17 05:00:07 -08:00
vijaykiran 3894d7fb3f Sync the output of network json with the domain model 2011-11-17 12:38:18 +01:00
Richard Downer e1bfb07780 Changes to TemplateClientLiveTest following review. Test now passes without a java SSL certificate exception. 2011-11-17 10:28:37 +00:00
andreisavu 7eb954c90c Expose the static ip settings as options 2011-11-17 09:48:15 +02:00
Richard Downer 75752db64c Add TemplateClientLiveTest.testExtractTemplate() 2011-11-16 21:09:18 +00:00
Richard Downer 1e7592ac98 Add a special case to distinguish when Cloudstack says 'template' but means 'TemplateExtract' - fixes the failing unit test 2011-11-16 20:38:13 +00:00
Adrian Cole b2d6c6b19c Merge pull request #162 from andreisavu/fixed-tests
Fixed tests that did not expect the group to work
2011-11-16 09:53:00 -08:00
andreisavu 4fa3d7d94d Fixed tests that did not expect the group to work 2011-11-16 19:44:58 +02:00
andreisavu 6c3ecfb0f3 Allow user the specify the ip address for a cloudstack vm 2011-11-16 19:29:06 +02:00
Adrian Cole 2f2277683c Merge pull request #158 from richardcloudsoft/cloudstack-template-live-test
Cloudstack template live tests
2011-11-16 07:26:08 -08:00
Richard Downer a2b6eac75f Cloudstack uses the JSON key "template" to mean a different type in different contexts, confusing ParseAsyncJobFromHttpResponse. Add a (currently failing) unit test to reproduce this issue. 2011-11-16 15:24:20 +00:00
Adrian Cole fdeb26f91e Merge pull request #159 from andreisavu/vlan-test-fix
Improved the experimental test to be able to cleanup existing networks
2011-11-16 07:24:20 -08:00
Richard Downer b31c589462 Add TemplateExtract domain model to Cloudstack 2011-11-16 15:24:20 +00:00
Richard Downer eef07939c1 Fix up TemplateClientLiveTest.testCreateTemplate so it runs on Citrix test cloud 2011-11-16 13:31:33 +00:00
Richard Downer 0e52fcb040 First steps in making a live test for Cloudstack templates 2011-11-16 13:31:33 +00:00
andreisavu f4c1e5b882 Addressed some of the offline comments made by Adrian 2011-11-16 14:40:32 +02:00
Adrian Cole 122338ba6a name field isn't always settable, switch to displayName 2011-11-16 14:03:29 +02:00
Adrian Cole d53d473481 throw exception as opposed to returning false when a job errors 2011-11-16 14:03:12 +02:00
andreisavu dc5c04951b Improved the experimental test to be able to cleanup existing networks 2011-11-16 11:37:27 +02:00
Adrian Cole 1f304ededb fix missing name in cloudstack and also disable static nat on destroy 2011-11-15 18:29:53 +02:00
Adrian Cole 2d31d6db23 add disable static nat 2011-11-15 18:29:53 +02:00
Adrian Cole 5ce8b4177c Merge pull request #155 from andreisavu/select-default-network
Select the default virtual network when creating a new virtual machine
2011-11-15 07:06:55 -08:00
andreisavu e74d58634c Select the default virtual network when creating a new virtual machine 2011-11-15 17:03:23 +02:00
Adrian Cole 95f00a8cda removed prefix inside async tests 2011-11-15 16:36:22 +02:00
Adrian Cole ef2c2277d0 re-enabled test, as it works in public providers 2011-11-15 14:42:02 +02:00
Adrian Cole 0b9cb6238d fixed VolumeAsyncClientTest 2011-11-15 14:41:24 +02:00
Adrian Cole 6b834c9d44 Merge pull request #153 from vijaykiran/volume-client
Volume client
2011-11-15 04:23:37 -08:00
Adrian Cole 2f21049cbd Merge pull request #151 from andreisavu/illegal-state-on-firewall-auth
Throw an IllegalStateException on firewall authorization failure
2011-11-15 04:19:32 -08:00
Adrian Cole 3f28aa0b2a Merge pull request #150 from andreisavu/presetup-valid-root-device-type
PreSetup is a valid root device type
2011-11-15 04:18:09 -08:00
Adrian Cole 056085428f Merge pull request #149 from andreisavu/more-test-fixing
Fixed and disabled some tests (disk offerings, ssh keys, service execution)
2011-11-15 04:17:23 -08:00
vijaykiran 5e27696481 VolumeClient Implementation - Attach/Detach/CreateFromSnapshot and CreatefromVolume with parrial tests. 2011-11-15 12:14:30 +01:00
Adrian Cole e1f66caec0 updated cloudstack to include adminCredential + vlan tests 2011-11-15 12:59:42 +02:00
andreisavu b508f87e3d Throw an IllegalStateException on firewall authorization failure 2011-11-15 12:22:03 +02:00
andreisavu 0963e9ebce PreSetup is a valid root device type 2011-11-15 11:50:41 +02:00
andreisavu 2c5d5efec6 Make sure we are removing any test ssh keys 2011-11-15 11:17:46 +02:00
andreisavu 43e6d22149 Disable testCreateAndRunAService because it's never going to pass without an internet connection 2011-11-15 11:16:49 +02:00
andreisavu af99850a54 listDiskOfferings not fully working on 2.2.12 2011-11-15 11:11:46 +02:00
vijaykiran e6090530be volume-client create volume test 2011-11-14 21:57:01 +01:00
andreisavu 564587047b Use a retry loop when trying to acquire an ssh connection 2011-11-14 22:21:23 +02:00
vijaykiran 0dad4db0a3 Volume Client implementation : init 2011-11-14 21:05:36 +01:00
Adrian Cole 31c75e7874 move cloudstack out of sandbox 2011-11-14 19:29:45 +02:00