Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,167 Commits 22 Branches 130 Tags 97 MiB
Commit Graph

1111 Commits

Author SHA1 Message Date
Andrew Donald Kennedy 6b10fb8f32 Problem when instantiating the SessionClient via ContextBuilder, solved by forcing the getProviderMetadata override method to be used 2012-04-19 01:08:05 +01:00
Andrew Donald Kennedy 47cbbeef57 Fixing some issues with XmlEnum annotated types 2012-04-19 00:16:43 +01:00
Andrew Donald Kennedy d7bf98017b Fixup session and login live testing 2012-04-19 00:16:43 +01:00
Andrew Donald Kennedy 27fb042c11 Misc 2012-04-19 00:16:43 +01:00
Andrew Donald Kennedy 18c6313eb4 Change context return type 2012-04-19 00:16:43 +01:00
Andrew Donald Kennedy d30f6548ee Use Status enum not value 2012-04-19 00:16:43 +01:00
Andrew Donald Kennedy a8e5938b6a Wrong check for not found 2012-04-19 00:16:42 +01:00
Andrew Donald Kennedy 437bb83496 Do not create new users just for the tests, run them with the passed in credentials 2012-04-19 00:16:42 +01:00
Adrian Cole dab1dd69fc fix covariance/assignability in RestContext<? extends Client> subclasses 2012-04-18 15:05:39 -07:00
Adrian Cole 98a205b603 Issue 891: ensure we run apt update when install jdk fails 2012-04-18 15:02:06 -07:00
Adrian Cole 2f9b1738a0 Merge pull request #572 from dralves/image-extension 
implemented image extension
 2012-04-18 07:37:02 -07:00
Adrian Cole 5ea29cbbb7 Merge pull request #560 from danikov/covariant-future-iterables 
covariant compatible version of futureIterables
 2012-04-18 07:35:23 -07:00
danikov fff1c7dc2d make FutureIterables covariant compatible + update tests 2012-04-18 13:06:54 +01:00
David Ribeiro Alves 05212b75fa implemented image extension 2012-04-18 09:37:44 +01:00
Andrew Gaul a3161ba7ba Throw return value instead of returning null 
Throwables.propagate always throws its argument and throwing its
impossible return value better represents our intent than returning
null.
 2012-04-16 13:45:23 -07:00
Adrian Cole 0b59dea073 removed ContextBuilder subclasses; added unwrap; undid generic params 2012-04-16 00:44:20 -07:00
Andrew Donald Kennedy c0d781a11d Fix vCloud test usage of new ContextBuilder 2012-04-13 12:23:45 +01:00
Adrian Cole a5ddf1057f Merge pull request #562 from grkvlt/vcloud-domain-objects 
Issue 830: vCloud Director Domain Objects
 2012-04-12 10:33:02 -07:00
Andrew Donald Kennedy 585cfae860 Reorganized domain objects in sub-packages for easier assimilation 2012-04-12 17:09:18 +01:00
Adrian Cole 0f542efcd4 Merge pull request #561 from grkvlt/vcloud-metadata 
Issue 830: vCloud Director ApiMetadata
 2012-04-12 08:53:32 -07:00
Andrew Donald Kennedy 30cee89d53 Remove default endpoint from ApiMetadata 2012-04-12 13:32:50 +01:00
Andrew Donald Kennedy ee9a659b7e Updated Carrenza provider 2012-04-12 12:04:02 +01:00
Andrew Donald Kennedy 190a28ba16 Rename Carrenza provider 2012-04-12 09:32:25 +01:00
Adrian Cole 23cb01f977 refactor PropertiesBuilder and related types into ApiMetadata and ProviderMetadata, and update all usage 2012-04-11 19:47:09 -06:00
Andrew Donald Kennedy 5de8e7bad6 Various minor changes to fix live tests 2012-04-11 22:49:16 +01:00
Andrew Donald Kennedy 19c88aa1fe Updated test annotations for command-line test tool 2012-04-11 22:48:48 +01:00
Andrew Donald Kennedy 2e67af2075 Minor fixups 2012-04-11 14:03:34 +01:00
Andrew Donald Kennedy fd616ddbed Error handler check for empty payload 2012-04-11 13:14:53 +01:00
Andrew Donald Kennedy b786178a90 Better error checking and logging in test tear down/clean up methods 2012-04-11 13:14:53 +01:00
Andrew Donald Kennedy 98a89aa68d Fix DMTF section types 2012-04-11 13:14:51 +01:00
Adrian Cole 8100246d8b Merge pull request #556 from grkvlt/vcloud-live-tests 
Issue 830: Fixes for vCloud live tests
 2012-04-10 17:49:33 -07:00
Andrew Donald Kennedy 9c40c3a34d Fixed NPE in error handler 2012-04-11 01:06:28 +01:00
Andrew Donald Kennedy ef66989727 Corrections to fix expect and live test errors, including JAXB type naming for enumerations 2012-04-11 01:06:27 +01:00
Adrian Cole ce0b181e0d Merge pull request #555 from danikov/vcloud-director-carrenza 
Issue 830: vCloud director Carrenza provider
 2012-04-10 10:42:35 -07:00
Andrew Donald Kennedy 4de062c636 Fixing live test failures due to new enums and DMTF changes 2012-04-10 18:29:59 +01:00
Andrew Donald Kennedy ad1250984b Use value of Role enum 2012-04-10 18:24:27 +01:00
Andrew Donald Kennedy 9dbdbb13a7 Fix failing tests due to new ReturnNullOnNotFoundOr404 behaviour 2012-04-10 18:24:27 +01:00
Andrew Donald Kennedy a4d433d513 Update DMTF dependencies (removed log4j) 2012-04-10 18:23:55 +01:00
Andrew Donald Kennedy 2cfe215592 Updated XmlType annotations 2012-04-10 18:06:16 +01:00
Andrew Donald Kennedy 0e01520240 Updated types to fix some failing tests 2012-04-10 18:02:26 +01:00
Andrew Donald Kennedy 98f0c51b28 Update usage of collections of OVF sections 2012-04-10 18:02:26 +01:00
Andrew Donald Kennedy 74b5ef76e7 Creation of DMTF labs project 2012-04-10 18:02:25 +01:00
danikov f3c5bbf4da carrenza-vcloud-director provider 2012-04-10 17:10:56 +01:00
Ignasi Barrera a059a18ada Pretty print in payload is now configurable 2012-04-10 16:03:02 +02:00
danikov 5e44ad39c2 xml enum annotation 2012-04-10 14:03:56 +01:00
danikov facc48f2a6 eliminate/reduce need for vcloud properties 2012-04-09 16:57:56 +01:00
Andrew Donald Kennedy 6128947c7e Issue 830: Minor updates 2012-04-09 11:46:48 +01:00
Andrew Gaul b47860afc1 Use inference to elide duplicated type parameters 
Found with:
grep 'Builder.*<.*>.*Immutable.*<.*>.*builder();'
 2012-04-08 22:32:04 -07:00
Adrian Cole 83b72d483a Merge pull request #539 from danikov/vcloud-director-admin-refactor3 
Issue 830: vCloud director Admin Refactor
 2012-04-03 07:15:40 -07:00
danikov 1b9f29a706 ensure tests are tidy, consistent, and clean up after themselves 2012-04-03 15:01:38 +01:00
danikov 19cd7b4aa3 refactor out test session to exist on the suite scope 2012-04-03 15:01:38 +01:00
danikov f20b7a902a make adminContext more robust 2012-04-03 11:23:04 +01:00
danikov 075dc00a13 refactor out admin tests 2012-04-03 11:23:03 +01:00
Andrew Donald Kennedy c4cc8821d6 Issue 830: Updates and improvements for domain objects 2012-04-03 11:21:21 +01:00
Adrian Cole 3923e78b9a Issue 896:ec2 doesn't pay attention to api version property 2012-04-02 22:24:59 -07:00
Adrian Cole af3a226b3d Issue 894:update to guava 12 2012-04-02 11:44:10 -07:00
Adrian Cole 8cf71adedf Merge pull request #537 from dralves/vbox-linux 
oneiric update and a few other goodies
 2012-04-02 07:28:28 -07:00
Adrian Cole 764e0907f7 Issue 657:ApiMetadata 2012-04-01 18:43:31 -07:00
David Ribeiro Alves 17c1abdb71 updated readme to include paswwordless ssh requirement 2012-04-02 01:15:08 +01:00
David Ribeiro Alves f7f241a12f reverted the preseed and corrected a test to account for multiple masters 2012-04-01 22:07:50 +01:00
David Ribeiro Alves ba7a981a54 added unit test for defaultimagespredicate and corrected preseed 2012-04-01 21:06:07 +01:00
David Ribeiro Alves a715b0e5ba removed mac osx reference 2012-04-01 00:50:29 +01:00
David Ribeiro Alves b62ef9ba9e updated ubuntu, implemented multiple images for guests, consolidated jetty and enforced masters creation on itests 2012-04-01 00:03:11 +01:00
Adrian Cole 358737c70f Merge pull request #519 from andreaturli/1.5.1 
issue 384: preparing 1.5.0-beta - guestAdditions installations fixed
 2012-03-31 07:26:44 -07:00
Andrew Donald Kennedy 4324edc1d2 Issue 830: Fixing NPE in test listener 2012-03-31 13:21:26 +01:00
Andrea Turli abeeb4b936 issue 384: fixed IMachineToNodeMetadataLiveTest as suggested by dralves 2012-03-31 11:44:47 +01:00
Andrea Turli 50815d2483 issue 384: added support for creation of hostOnly interface with DHCP enabled 2012-03-31 11:44:47 +01:00
Andrea Turli af309232ad issue 384: preparing vbox 1.5.1 - adapt ContextModule to external changes 2012-03-31 11:44:47 +01:00
Andrea Turli e27db18cfd issue 384: vbox 1.5.1 2012-03-31 11:44:47 +01:00
Andrea Turli a2922006c9 issue 384: preparing 1.5.0-beta - guestAdditions installations fixed 2012-03-31 11:44:47 +01:00
danikov fea72442b6 minor vcloud bugfixes 2012-03-30 18:23:20 +01:00
Adrian Cole 5b19e25582 Merge branch 'fix' of https://github.com/grkvlt/jclouds into vcloud-director-admin-refactor 
* 'fix' of https://github.com/grkvlt/jclouds:
  Issue 830: Remove wrong exception parser
  Issue 830: Add some Javadoc for UndeployVAppParams
 2012-03-30 09:48:40 -07:00
Adrian Cole b5ae8073da expect test structure for new admin client 2012-03-30 09:48:08 -07:00
Andrew Donald Kennedy 40e38a3ad6 Issue 830: Remove wrong exception parser 2012-03-30 17:24:00 +01:00
Andrew Donald Kennedy ab4d8da22b Issue 830: Add some Javadoc for UndeployVAppParams 2012-03-30 17:23:55 +01:00
Adrian Cole 73ec8a66ff merged with latest vcloud-director lists-gone stuff 2012-03-30 09:23:20 -07:00
Adrian Cole fc6f5ffd2f Merge pull request #524 from grkvlt/rename 
Issue 830: Method name tidying
 2012-03-30 08:49:02 -07:00
danikov 557cf5e9b3 trying to fix guice to have both user/admin modules 2012-03-30 16:29:56 +01:00
Andrew Donald Kennedy 708b065454 Issue 830: Method name tidying 2012-03-29 19:41:48 +01:00
Kedar Dave 132418aa51 First set of api's for opsource 2012-03-29 14:18:10 -04:00
Andrew Donald Kennedy 2a60e1aedb Issue 830: Update client get methods to use new error handler 2012-03-29 13:53:14 +01:00
danikov 17e90c22b1 build users ahead of tests using admin credentials (WIP) 2012-03-28 09:50:38 +01:00
danikov 6ddd2072dc refractor out admin 2012-03-28 09:49:51 +01:00
Adrian Cole 49e475edcd Issue 888: consolidate code that addresses naming conventions, using hyphen as default delimiter 2012-03-28 03:37:54 -04:00
Adrian Cole 5c6ce9f081 organize imports 2012-03-28 03:37:48 -04:00
Adrian Cole 343470d0a5 removed deprecated RunScriptOptions & TemplateOptions 2012-03-28 03:37:43 -04:00
Adrian Cole 025396be37 added new properties object 2012-03-28 03:37:41 -04:00
Adrian Cole b18e61ae7a Merge pull request #526 from dralves/master 
simple patch with a readme.md update that includes troubleshooting instructions
 2012-03-27 23:07:44 -07:00
Adrian Cole 59330991a5 Merge pull request #525 from grkvlt/jaxb 
Intermittent JAXB error in AdminCatalogClientExpectTest
 2012-03-27 23:07:06 -07:00
David Ribeiro Alves 6743f0bbf6 corrected spacing and new lines for README.md 2012-03-28 00:37:08 +01:00
David Ribeiro Alves 3be85a61de updated readme.md 2012-03-27 20:39:02 +01:00
Andrew Donald Kennedy e173612288 Intermittent JAXB error 2012-03-27 18:24:26 +01:00
Andrew Donald Kennedy d35de3cc23 Issue 830: Use ResourceNotFoundException 2012-03-27 18:13:27 +01:00
Andrew Donald Kennedy 9bc2640601 Issue 830: Make RasdItemsList implement Set 2012-03-27 13:48:08 +01:00
Andrew Donald Kennedy 680a202b20 Issue 830: Tidy up client imports and javadoc 2012-03-27 13:48:07 +01:00
Andrew Donald Kennedy 8443bbe8f2 Issue 830: Tidy up domain object imports and remove unnecessary annotations 2012-03-27 13:48:07 +01:00
Andrew Donald Kennedy 9e860a2328 Issue 830: Use XmlElementWrapper annotation where possible 2012-03-27 13:48:06 +01:00
Andrew Donald Kennedy d4713572e4 Issue 830: Update API listener - Log timestamp, test name - Get test duration from framework - Uses test description paramater for operation request details - Updated live client tests to use description instead of testName 2012-03-27 13:39:38 +01:00
Andrew Donald Kennedy c7381501f0 Issue 830: Change fenceMode to ISOLATED 2012-03-23 16:48:24 +00:00
Andrew Donald Kennedy 0534821234 Issue 830: Fix for modifyLeaseSettingsSection 2012-03-23 16:09:58 +00:00
Andrew Donald Kennedy 7998e1b012 Issue 830: Added entity media type 2012-03-23 16:09:58 +00:00
Andrew Donald Kennedy 1ccd5f806a Issue 830: Added entity operation to query client 2012-03-23 16:09:58 +00:00
Andrew Donald Kennedy c71ff11fc5 Issue 830: Tidy up reference predicates 2012-03-23 16:09:58 +00:00
danikov d91a8efe70 remove not-needed properties + vars 2012-03-23 15:31:51 +00:00
danikov 7d4f81a46c non-client operation tests (legacy login + get schema) 2012-03-23 14:01:01 +00:00
Adrian Cole a6ff7579f5 Issue 885:add TryStack provider 2012-03-22 21:50:27 -07:00
Adrian Cole 305b0b8972 Issue 864:create hpcloud-compute provider 2012-03-22 21:48:11 -07:00
Adrian Cole 33fa1ec555 Issue 879:keystone v2 hpcloud-objectstorage provider 2012-03-22 21:45:25 -07:00
Adrian Cole c3dd362b4b Issue 814:recreate nova api as openstack-nova 2012-03-22 21:42:22 -07:00
Adrian Cole f3aaa62779 Issue 885:add TryStack provider 2012-03-22 21:37:45 -07:00
Adrian Cole 91661f4759 Issue 814: changes needed to be compatible with trystack 2012-03-22 21:37:21 -07:00
Adrian Cole 4ccd20e660 incorrect tags 2012-03-22 21:36:07 -07:00
Adrian Cole 5f6815904b added base test for openstack-nova 2012-03-22 17:15:49 -07:00
Adrian Cole 2a1b423f2b removed excess logic since floating ips are already present in server list 2012-03-22 16:28:41 -07:00
Adrian Cole f9694ad56c re-added mike's fix for ips 2012-03-22 16:17:34 -07:00
Adrian Cole 9e21b48bd3 Merge pull request #515 from jdaggett/master 
hpcloud-objectstore provider bug fix
 2012-03-22 14:48:25 -07:00
Adrian Cole 59f1d0b316 rename vbox live test 2012-03-22 14:46:03 -07:00
Adrian Cole 73865f6dd8 tidy + make sure we use private key and not password for auth when keypair option set 2012-03-22 13:47:48 -07:00
Mike Arnold 541fe98391 fixing injection error in async client due to inheritence chain 2012-03-22 15:26:08 -05:00
Adrian Cole 2ae849dd94 Issue 883:Allow login credentials by osfamily to be specified per-provider 2012-03-22 12:39:48 -07:00
Adrian Cole 774c4412aa start call can take a very long time to complete 2012-03-22 12:39:48 -07:00
Adrian Cole 49c873d17a Merge pull request #513 from dralves/jclouds-vbox 
final functionality-oriented commit on jclouds vbox
 2012-03-22 11:52:44 -07:00
David Ribeiro Alves 893d2d9e55 removed lock printous 2012-03-22 17:58:58 +00:00
David Ribeiro Alves 1f31e96a9f fixed locking transient bug 2012-03-22 17:49:04 +00:00
Adrian Cole ff0cc154d3 Merge pull request #512 from grkvlt/tests 
Issue 830: Make live test before methods always run
 2012-03-22 08:54:40 -07:00
David Ribeiro Alves 28bd62edfc added a unit test for guest additions installer. installguestadditions is now able to mount the pre-downloaded iso 2012-03-22 15:16:19 +00:00
danikov 9ff1a792af fix adminOrg testName annotations 2012-03-22 13:48:49 +00:00
danikov e153b1ed22 formatting fix 2012-03-22 13:43:58 +00:00
danikov 98adf79f93 add login group to login session test class 2012-03-22 13:14:37 +00:00
Andrew Donald Kennedy 1d886305ba Issue 830: Make live test before methods always run 2012-03-22 13:01:40 +00:00
danikov d4b03f0119 minor bugfix + skeletal code for groups/LDAP 2012-03-22 11:48:49 +00:00
David Ribeiro Alves 582423bd2d commented machine utils 2012-03-22 03:46:22 +00:00
David Ribeiro Alves 6b4a4c6054 consolidated locking machines as locking was crashing all over the place 2012-03-22 03:36:42 +00:00
David Ribeiro Alves 4a32b0107f parsed names from vm so that nodemetadata has correct group and name (updated unit test), corrected transient bug obtaining locks for vms 2012-03-22 02:44:41 +00:00
Adrian Cole 18562f5dbb switched hp default availablility zone to 2 2012-03-21 19:11:55 -07:00
Adrian Cole 09d97a2103 changed to not use # as a delimiter, and fixed keypair prefix logic 2012-03-21 19:11:55 -07:00
Adrian Cole 6fda2580f5 Merge pull request #509 from grkvlt/vapp-updates 
Issue 830: Misc updates
 2012-03-21 17:28:36 -07:00
Andrew Donald Kennedy 704d0c00fb Issue 830: Add logging output during cleanUp and fix VApp deletion 2012-03-21 23:59:35 +00:00
Andrew Donald Kennedy 35391b876b Issue 830: Use XmlWrapper for collections in Vdc 2012-03-21 23:59:35 +00:00
Adrian Cole c604b47f2d Merge pull request #508 from dralves/jclouds-vbox 
vbox - guests are now reachable through a non-nat ip
 2012-03-21 16:42:46 -07:00
David Ribeiro Alves aceaaf0eb0 updated readme 2012-03-21 22:36:14 +00:00
David Ribeiro Alves 5bca27923c corrected IMachineToNodeMetadata to comply with the new non-natted ip 2012-03-21 22:19:03 +00:00
David Ribeiro Alves 92a940e95d guests are now accessible because host-only ips are assigned in the same network as the default vbox host-only network (vboxnet0) 2012-03-21 22:04:05 +00:00
David Ribeiro Alves 68290ba2b2 added mock identity prop to prevent NPE in some cases 2012-03-21 22:04:05 +00:00
David Ribeiro Alves d742d53f6b reverted formatting changes 2012-03-21 22:03:48 +00:00
David Ribeiro Alves f4d0e18320 prevented tests from failing due to missing property 
!
 2012-03-21 22:02:11 +00:00
Mike Arnold b95e890f83 expecting provider specific client when creating provider-specific blobstore 2012-03-21 16:07:36 -05:00
Andrew Donald Kennedy 25fac3b36e Issue 830: Add control access tests to Org 2012-03-21 21:01:41 +00:00
Adrian Cole 6918d1c448 Issue 767: change openstack-nova and downstream to logging module discovery 2012-03-21 13:05:03 -07:00
Adrian Cole 728f9612e0 moved logback.xml up to compute module 2012-03-21 13:05:03 -07:00
Adrian Cole 0f15559f2c Merge pull request #503 from aplowe/master 
openstack-nova: Auto key pair generation wiring into compute service and adaptor
 2012-03-21 11:50:58 -07:00
Andrew Donald Kennedy 235ed12337 Issue 830: Add missing operations to Org clients 2012-03-21 17:33:54 +00:00
Andrew Donald Kennedy 78a4a674ab Issue 830: Updates for failing tests 2012-03-21 17:33:54 +00:00
Adam Lowe 9d4e58f9f3 openstack-nova: invalidating group key from cache 2012-03-21 17:33:44 +00:00
Aled Sage 16d72204b0 Issue 830: Fix QueryClientLiveTest testQueryMedia 2012-03-21 17:33:15 +00:00
Adrian Cole 35dc8f1224 Merge pull request #506 from danikov/vclouds-director-bugfixes-3 
Issue 830: vCloud director Bugfixs
 2012-03-21 10:17:50 -07:00
danikov f99302b1e6 implement shadow vas + order tests to guarantee success 2012-03-21 17:03:53 +00:00
Adam Lowe 89cb8ec161 openstack-nova: adding logic for implicit keypair option 2012-03-21 16:19:51 +00:00
Adam Lowe 9045fa2463 openstack-nova: adding logic for implicit keypair option 2012-03-21 16:17:26 +00:00
Adam Lowe e81ac99daa openstack-nova: setup user syntax for implicit keypair option, adding missing unit test 2012-03-21 16:17:26 +00:00
Adam Lowe e6a949005b openstack-nova: setup user syntax for implicit keypair option 2012-03-21 16:17:25 +00:00
danikov 1c363b5e40 more testName annotation fixes 2012-03-21 15:22:05 +00:00
Adrian Cole 70c1d4c05c Merge pull request #502 from grkvlt/vapp-reordering 
Issue 830: VApp power test reordering
 2012-03-21 08:09:41 -07:00
Andrew Donald Kennedy 26646872d5 Issue 830: Fix HTTP method for answerQuestion operation 2012-03-21 14:04:44 +00:00
Andrew Donald Kennedy 4706ea4057 Issue 830: More power related test ordering and dependency 
Includes changes from patch submitted by <aled.sage@gmail.com>
 2012-03-21 14:04:44 +00:00
danikov 0e97401b48 last few testName annotation fixes 2012-03-21 13:55:54 +00:00
danikov 5873157074 avoid NPE in testResetNetwork 2012-03-21 13:38:26 +00:00
danikov a4272f5429 tidy up test annotations + documentation + missing client/test methods for groupClient 2012-03-21 12:33:44 +00:00
Adrian Cole e31eecb4a6 fixed cycle in pom 2012-03-21 02:04:47 -07:00
Adrian Cole 44261f4465 fixed logback format 2012-03-21 00:52:06 -07:00
Adrian Cole 71f4e5c0d9 Issue 879:keystone v2 hpcloud-objectstorage provider 2012-03-21 00:51:49 -07:00
Adrian Cole c9b5b1db87 openstack implicit security group integration with compute service; ensured hpcloud doesn't pickup kernel or ramdisk images 2012-03-21 00:20:29 -07:00
Adrian Cole ac2528ef6f Merge pull request #499 from danikov/vclouds-director-bugfixes-2 
Issue 830: vCloud director Bugfix
 2012-03-20 22:29:21 -07:00
danikov 0e9ba3eb1e create metadata for metadata testing 2012-03-21 03:59:39 +00:00
Mike Arnold 592c387330 catching exception thrown when user does not have CDN enabled...even if there are no CDN operations being called? 2012-03-20 22:46:13 -05:00
Mike Arnold d8fc0a9786 using a better location supplier 2012-03-20 22:45:25 -05:00
Andrew Donald Kennedy 648c401427 Issue 830: Typo in QueryClientLiveTest from merge 2012-03-21 01:49:41 +00:00
Adrian Cole b782fce5bf Merge pull request #497 from grkvlt/vapp-reorder 
Issue 830: Fix VApp power and virtual hardware section tests
 2012-03-20 18:25:50 -07:00
Mike Arnold b5e8458446 Merge remote-tracking branch 'upstream/master' 2012-03-20 20:25:17 -05:00
Mike Arnold c1ea447f1b correcting spelling of extension 2012-03-20 20:24:48 -05:00
Mike Arnold cdd042ba75 adding example keystone responses with and without the CDN block in the service catalog 2012-03-20 20:23:13 -05:00
Andrew Donald Kennedy 7e6ce283ec Issue 830: Fix testModifyVirtualHardwareSection 2012-03-21 01:18:48 +00:00
Andrew Donald Kennedy 71c96ea073 Issue 830: VApp power tests 2012-03-21 01:18:47 +00:00
Adrian Cole 0165724559 Merge pull request #496 from danikov/vclouds-director-bugfixes-3 
Issue 830: vCloud director Bugfix
 2012-03-20 17:35:15 -07:00
Adrian Cole a2966b1555 refined domain objects related to security groups, implemented implicit security group lookup + creator 2012-03-20 17:34:38 -07:00
danikov f0913ee6b4 fix cloneMedia (bad path) and deleteMedia (wrong ID) 2012-03-20 23:55:27 +00:00
danikov 0f5cae3eaf re-order and fix media tests 2012-03-20 23:37:57 +00:00
Andrew Donald Kennedy 5b4dbcd659 Issue 830: Fix random names 2012-03-20 22:27:40 +00:00
Andrew Donald Kennedy a8c1228f7b Issue 830: Tidy up test annotations 2012-03-20 22:14:10 +00:00
Adrian Cole 58ee8fa1a4 added security group options and offline tests to nova 2012-03-20 14:45:09 -07:00
Andrew Donald Kennedy c51143c12b Issue 830: Use existing cleanUp method in query test 2012-03-20 21:23:51 +00:00
Andrew Donald Kennedy de099bfb36 Issue 830: Delete unused CIM types 2012-03-20 21:23:22 +00:00
Mike Arnold 6e6f9e9ce5 Merge branch 'feature/hpcloud-objectstorage-keystonev2' 2012-03-20 15:27:05 -05:00
Mike Arnold f1bbfde1b2 fixing tests after changing provider and adding Expect test for the provider 2012-03-20 15:26:11 -05:00
Adrian Cole cdf87d57a2 Merge pull request #494 from aledsage/issue-830-fixes 
Issue #830 vcloud-director: fixes/tidy for live tests
 2012-03-20 13:18:27 -07:00
Aled Sage 9cdda91b99 Issue #830 vcloud-director: fixes/tidy for live tests 2012-03-20 20:04:06 +00:00
Adrian Cole 417107f29a Merge pull request #492 from grkvlt/vapp-cleanup 
Issue 830: VApp cleanUp after tests
 2012-03-20 12:46:20 -07:00
Andrew Donald Kennedy 07c5dabceb Issue 830: Add mediaList client query methods 2012-03-20 19:25:08 +00:00
Andrew Donald Kennedy d081f771b4 Issue 830: Record created VApp names for cleanUp 2012-03-20 19:25:07 +00:00
Andrew Donald Kennedy b4579518c4 Issue 830: Cleanup live test classes 2012-03-20 19:19:06 +00:00
Andrew Donald Kennedy ace4282fba Issue 830: make cleanUp run at end of test only 2012-03-20 19:19:06 +00:00
danikov 0b9fbc025c correctly use roles for create/update User tests 2012-03-20 19:18:32 +00:00
danikov f25fb0807f add roleReferenceQuery variation 2012-03-20 19:18:31 +00:00
danikov 13cf27cd0f guard against task already finished in createMedia test 2012-03-20 19:18:03 +00:00
Aled Sage 35c994fe07 Issue #830 vcloud-director: vdc admin client 2012-03-20 18:55:13 +00:00
Andrew Donald Kennedy 9ad27d12a3 Issue 830: Accidentally deleted namespace declaration 2012-03-20 17:59:37 +00:00
Adrian Cole 2359ee9ec5 Merge pull request #484 from aplowe/catalogclient 
Issue 830: vCloud 1.5 - Improving CatalogClientLiveTest
 2012-03-20 10:49:24 -07:00
Andrew Donald Kennedy 797484917c Issue 830: Remove generics from QueryResultRecords, fixes JDK7 build 2012-03-20 17:24:39 +00:00
Andrew Donald Kennedy 323238168c Issue 830: AdminCatalog issues 2012-03-20 16:50:04 +00:00
Andrew Donald Kennedy b1f560e560 Issue 830: Fixed delete VApp test 2012-03-20 16:50:04 +00:00
Andrew Donald Kennedy cee5fcc58b Issue 830: Add non-JAXB response parser for screen image 2012-03-20 16:50:04 +00:00
Andrew Donald Kennedy d2dc81a1a9 Issue 830: Use MetadataClient in VAppTemplateClient and tests 2012-03-20 16:50:03 +00:00
Andrew Donald Kennedy 3e114c7b2e Issue 830: Rename RASD to ResourceAllocationSettingData and change RASD and VSSD domain objects to OVF namespace 2012-03-20 16:50:03 +00:00
Andrew Donald Kennedy 6846dad9fc Issue 830: Fixes for various failing tests, updates for CIM and RASD domain objects 2012-03-20 16:50:03 +00:00
Andrew Donald Kennedy 45fd7c443e Issue 830: Updated ProductSection domain objects and associated tests 2012-03-20 16:50:02 +00:00
Andrew Donald Kennedy 22a718c07e Issue 830: Randomize name of instantiated VApps (implemented by @aledsage) and Metadata 2012-03-20 16:50:02 +00:00
Andrew Donald Kennedy 86f249d0d8 Issue 830: Create shared parent class for VApp and VAppTemplate tests 2012-03-20 16:50:01 +00:00
Mike Arnold b01a88cf8b changing a few more references to vegas 2012-03-20 11:46:04 -05:00
Mike Arnold 094c106f87 adding port number for identity service 2012-03-20 11:44:50 -05:00
Mike Arnold 1e60ab4d1f initial create of hpcloud-objectstorage to labs project 2012-03-20 11:38:33 -05:00
Adam Lowe 383dd43a55 vcloud-director 1.5: Adjusting CatalogClientLiveTest to ensure all operations are tested 2012-03-20 15:41:36 +00:00
Adrian Cole cf3261e5e7 Merge pull request #483 from danikov/vclouds-director-bugfixes-2 
Issue 830: vCloud director Bugfixes
 2012-03-20 08:29:08 -07:00
Adrian Cole 0f2f5e47fa Merge pull request #482 from aledsage/issue-830-admin-query 
Issue #830 vcloud-director: added admin-query client
 2012-03-20 08:27:17 -07:00
danikov 3295c1fdc7 fix NPE and test ordering 2012-03-20 13:25:53 +00:00
Aled Sage eea5b261ba Issue #830 vcloud-director: added admin-query client 2012-03-20 11:30:41 +00:00
danikov 33128f8d8b fix createUser test 2012-03-20 10:20:06 +00:00
danikov f301a2ec18 adminCatalog live test now uses its own user/owner 2012-03-20 10:20:06 +00:00
danikov 4200f59c29 enable failing live tests 
Conflicts:

	labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/GroupClientLiveTest.java
 2012-03-20 10:18:37 +00:00
Adrian Cole f2ce700ec1 cleaned security group syntax for rule creation 2012-03-19 18:38:22 -07:00
Adrian Cole 206dd67c00 revised syntax of security groups 2012-03-19 17:52:47 -07:00
Adrian Cole e1b1ba4afa all around cleanup on server object; fixed creatednode.nodeId & addressed new node where hostId is not set 2012-03-19 15:52:08 -07:00
Adam Lowe deeaa675bb vcloud-director 1.5: adding tests of unlockUser 2012-03-19 20:15:41 +00:00
Aled Sage bf5e73f057 Issue #830 vcloud-director: fixing live tests (User and Task) 2012-03-19 08:03:43 +00:00
Adrian Cole 28fd2742fb multizone and floating ip support 2012-03-19 01:03:25 -07:00
Adrian Cole 45b4725fc7 fixed logging as log4j was being inherited 2012-03-19 01:03:25 -07:00
Adrian Cole 811abdb43c removed the floating ip option, as it needs more thought 2012-03-19 01:03:24 -07:00
Adrian Cole 31575a812f changed loaders to loaders package 2012-03-19 01:03:24 -07:00
Adam Lowe f0d6c9f10d openstack-nova: wiring Floating IP functionality into ComputeServiceAdaptor and ServerToNodeMetadata 2012-03-19 01:03:24 -07:00
Adam Lowe dd4d13d6bb openstack-nova: wiring in LoadFloatingIpsForInstance 2012-03-19 01:03:24 -07:00
Adam Lowe d7b4a31e70 openstack-nova: adding LoadFloatingIpsForInstance 2012-03-19 01:03:24 -07:00
Adam Lowe cd33c5d901 openstack-nova: fixing getInstanceId 2012-03-19 01:03:24 -07:00
Adam Lowe b290a2e7c9 openstack-nova: adding comment about region support 2012-03-19 01:03:24 -07:00
Adam Lowe cc76f96553 openstack-nova: adjusting in case multiple floating ips are possible 2012-03-19 01:03:24 -07:00
Adam Lowe a58474a674 openstack-nova: adding function to retrieve and filter correct floating ip for a vm 2012-03-19 01:03:23 -07:00
Adam Lowe 706fe80f3d openstack-nova: adding NovaTemplateOptions with floatingIp options 2012-03-19 01:03:23 -07:00
Adam Lowe 7bc3fddbf6 openstack-nova: adding auto-allocate-ips context property 2012-03-19 01:03:23 -07:00
Aled Sage 028791a179 Issue #830 vcloud-director: fix VAppTemplate live tests 2012-03-18 18:59:35 +00:00
Aled Sage 214e25863b Issue #830 vcloud-director: fix querying of VMs (and move instantiateVApp up to BaseVCloudDirectorClientLiveTest) 2012-03-17 17:12:00 +00:00
Aled Sage 6852d9b45f Issue #830 vcloud-director: add missing class for QueryClient (oops!) 2012-03-17 13:33:56 +00:00
Adrian Cole 166c7765f0 Merge pull request #464 from dralves/jclouds-vbox-nat-host-only-working-cluster-and-live-test 
updated vbox readme
 2012-03-16 19:36:12 -07:00
David Ribeiro Alves c4a02a6753 added ssh command to log into hosts 2012-03-17 01:27:36 +00:00
David Ribeiro Alves fc8c5417e1 updated vbox readme 2012-03-17 01:17:31 +00:00
Aled Sage 30f5f0d6b4 Issue #830 vcloud-director: QueryClient live tests and fixes 2012-03-16 22:28:17 +00:00
danikov 84fe8fa419 NPE guard in test formatter 2012-03-16 19:21:45 +00:00
danikov 2af7272d66 fix Network class name collision in Checks 2012-03-16 19:17:18 +00:00
danikov 9206bc0342 rename adminNetwork live test to have correct/consistent naming 2012-03-16 19:15:35 +00:00
danikov 304cf4bd38 re-add adminOrg media type to ALL 2012-03-16 19:15:35 +00:00
danikov 9f94c96f7f fix ResourceType to always have an empty collection 2012-03-16 19:15:35 +00:00
danikov 22b72ad25f merge to Master 2012-03-16 19:15:35 +00:00
danikov 595211b0d7 adminNetwork resetNetwork action w/tests 2012-03-16 19:15:35 +00:00
danikov d28eed358a adminNetwork updateNetwork w/tests 2012-03-16 19:15:34 +00:00
danikov 5fdc6dd522 adminNetwork getNetwork w/tests 2012-03-16 19:15:34 +00:00
danikov 1c53a0402f adminNetwork base 2012-03-16 19:15:34 +00:00
Aled Sage 677cdfaafa Issue #830: added VdcClient.upload comment about file size of -1 2012-03-16 17:44:34 +00:00
Aled Sage 0904766a3f Issue #830: VAppClientLiveTest for virtualHardwareSection/*, and some tidying 2012-03-16 17:44:29 +00:00
Adrian Cole 70d549a31b Merge pull request #459 from grkvlt/admin-catalog-fixes 
Issue 830: Admin catalog fixes
 2012-03-16 10:14:46 -07:00
Adrian Cole e4abf0b25f Merge pull request #458 from grkvlt/namespace-fix 
Issue 830: Fix typo in namespace constant
 2012-03-16 10:12:48 -07:00
Adrian Cole 795f8f69c8 merged Issue #830: VdcClient live tests 2012-03-16 09:11:36 -07:00
Andrew Donald Kennedy 70aa8e05ef Issue 830: Fix typo in namespace constant 2012-03-16 16:00:01 +00:00
Andrew Donald Kennedy 21f960341a Issue 830: Disabling AdminCatalog expect test temporarily 2012-03-16 15:54:16 +00:00
Andrew Donald Kennedy 24c26676fe Issue 830: Fixes for AdminCatalog live tests 2012-03-16 15:54:09 +00:00
Adrian Cole c0fdbdaa27 Merge pull request #455 from grkvlt/vapp-live-tests 
Issue 830: VApp live tests
 2012-03-16 08:30:40 -07:00
Adrian Cole 30a8222769 Merge pull request #456 from doo/elb-in-vpc 
Update ELB API version and fix exception to support ELB in VPC
 2012-03-16 08:27:14 -07:00
Andrew Donald Kennedy 2af8ec527f Issue 830: Fix get/modifyOperatingSystemSection tests 2012-03-16 14:50:55 +00:00
Andrew Donald Kennedy f90135097f Issue 830: Make vcloud the default XML namespace 2012-03-16 14:50:55 +00:00
Andrew Donald Kennedy ab1de34bcd Issue 830: Add AdminVdcClient to DELEGATE_MAP in VCloudDirectorRestClientModule 2012-03-16 14:50:55 +00:00
Aled Sage e5a8038370 Issue #830: VdcClient live tests 2012-03-16 13:20:56 +00:00
Fabian Steeg 59aa2710cf Update ELB API version and fix exception to support ELB in VPC 2012-03-16 13:30:43 +01:00
Andrew Donald Kennedy ba9a1e85cb Fix formatting 2012-03-16 10:38:50 +00:00
Andrew Donald Kennedy 044e38d3cb Issue 830: Change URI used from VApp to VM in client methods 2012-03-16 10:38:50 +00:00
Andrew Donald Kennedy fed320cdda Issue 830: Updated QueryClient with VApp queries, added associated domain objects 2012-03-16 10:38:50 +00:00
Andrew Donald Kennedy 78b5a16e29 Issue 830: Updates to VAppClientLiveTest and Checks, and changes to associated domain objects 2012-03-16 10:38:49 +00:00
Adrian Cole a9bceb9027 removed unnecessary bind statement 2012-03-16 02:45:51 -07:00
Adrian Cole a845331eba implemented optional extension lookup per region 2012-03-16 02:33:09 -07:00
Adrian Cole 1bef09ab91 format and imports 2012-03-15 21:52:23 -07:00
Aled Sage e2a966a51c Issue #830: vappTemplate live tests improvements 2012-03-16 00:00:21 +00:00
Adrian Cole ff00374d4d Merge branch 'vapp-live-tests' of https://github.com/grkvlt/jclouds 
* 'vapp-live-tests' of https://github.com/grkvlt/jclouds:
  Fix VApp instantiation failure
  Refactor clients to be more consistent
  Comments for media types
 2012-03-15 14:10:56 -07:00
Andrew Donald Kennedy 3420a1794c Fix VApp instantiation failure 2012-03-15 19:11:40 +00:00
Aled Sage 6a03592786 Issue #830: added metadata live tests for VApp 2012-03-15 18:10:52 +00:00
Andrew Donald Kennedy 5bb34f4599 Refactor clients to be more consistent 2012-03-15 17:24:25 +00:00
Andrew Donald Kennedy eef98d85d3 Comments for media types 2012-03-15 17:21:46 +00:00
Adrian Cole da8ebc0c26 Merge github.com:jdaggett/jclouds 
* github.com:jdaggett/jclouds:
  adding more tests for security group async client including for security group rules, and fixing a bug found in the delete methods
  making security groups and keypairs extensions optional
  adding more security group async client tests
  optimizing imports
 2012-03-15 09:56:21 -07:00
Adrian Cole cf7243f7e1 Merge branch 'issue-830-vapptemplate-tests' of https://github.com/aledsage/jclouds 
* 'issue-830-vapptemplate-tests' of https://github.com/aledsage/jclouds:
  Issue #830: more VAppTemplate live test fixes
 2012-03-15 09:49:17 -07:00
Adrian Cole c6060e999f Merge branch 'issue-830-vcloud-builders-and-test-fixing' of https://github.com/aledsage/jclouds 
* 'issue-830-vcloud-builders-and-test-fixing' of https://github.com/aledsage/jclouds:
  Issue 830 vcloud-director: re-enable fixed tests, except for VAppClientExpectTest
  Issue #830: deleted FilesList, to instead use Set<File> instead
  Issue #830 vcloud-director: fix failing tests
  Issue #830 vcloud-director: combined ReferenceType and Reference domain classes
  Issue #830 vcloud-director: use improved builder pattern
 2012-03-15 09:42:56 -07:00
Adrian Cole 5eba65ecfa extension util 2012-03-15 09:42:00 -07:00
Mike Arnold 39180e0cc9 adding more tests for security group async client including for security group rules, and fixing a bug found in the delete methods 2012-03-15 11:04:49 -05:00
Mike Arnold 40395d1723 making security groups and keypairs extensions optional 2012-03-15 11:02:39 -05:00
Aled Sage 1b5aa81f00 Issue #830: more VAppTemplate live test fixes 2012-03-15 15:18:36 +00:00
Mike Arnold d3f0e64de1 merge with upstream master, resolving conflicts in SecurityGroupClientExpectTest 2012-03-15 09:06:28 -05:00
Aled Sage f307308ca6 Issue 830 vcloud-director: re-enable fixed tests, except for VAppClientExpectTest 2012-03-15 12:48:01 +00:00
Aled Sage 50c7cf62b2 Issue #830: deleted FilesList, to instead use Set<File> instead 2012-03-15 12:42:48 +00:00
Aled Sage a89905bd98 Issue #830 vcloud-director: fix failing tests 2012-03-15 12:42:47 +00:00
Aled Sage a862b53fe5 Issue #830 vcloud-director: combined ReferenceType and Reference domain classes 2012-03-15 12:41:31 +00:00
Aled Sage 68d455d1d9 Issue #830 vcloud-director: use improved builder pattern 2012-03-15 12:41:29 +00:00
Adrian Cole fad4cee803 Merge pull request #448 from dralves/jclouds-vbox-nat-host-only-working-cluster-and-live-test 
one machine (the first one) was being wasted due to bad ip reporting
 2012-03-15 01:00:35 -07:00
David Ribeiro Alves e4259b5cc8 one machine was being wasted due to bad ip reporting 2012-03-15 07:58:04 +00:00
Adrian Cole d778465f02 Merge pull request #447 from dralves/jclouds-vbox-nat-host-only-working-cluster-and-live-test 
whirr working with vbox
 2012-03-15 00:34:50 -07:00
David Ribeiro Alves d987e847ca made vbox start nodes in HEADLESS mode (since we don't have access after AdminAccess anyway 2012-03-15 06:44:58 +00:00
David Ribeiro Alves 641f530e0c preseed.cfg was being server from target/classes but not from the jar 2012-03-15 06:33:37 +00:00
David Ribeiro Alves c9c4a1aef0 made jetty serve preseed.cfg from inside the jar (was serving from src/test/resources) 2012-03-15 04:42:33 +00:00
David Ribeiro Alves 04f72a67d7 made taking snapshots more resilient with retries 2012-03-15 03:24:53 +00:00
David Ribeiro Alves b1333b1f2c moved deleting gshadow lock to the clones since it was reappearing on the master 2012-03-15 03:03:53 +00:00
David Ribeiro Alves ec7552cdbb added waitForCompletion on snapshot creation and deletion has multi-node was failing 2012-03-15 02:57:22 +00:00
David Ribeiro Alves 6967743044 commented mastersloadingcache and nodecreator 2012-03-15 02:38:44 +00:00
David Ribeiro Alves 78d85fc960 fixed broken multi-node cloning due to missing synchronized keyword on NodeCreator. changed name of masterscache to mastersloadingcache. changed jetty port to a non common one. checked null on finally block 2012-03-15 02:20:31 +00:00
Adrian Cole 20df21e75e disabled failing vcloud tests 2012-03-14 18:25:09 -07:00
Adrian Cole e9f29883d9 added new Extension annotation for determining if clients are available or not 2012-03-14 18:25:04 -07:00
Mike Arnold 0f3f576c8f adding more security group async client tests 2012-03-14 20:12:21 -05:00
Mike Arnold 48430ba9ea optimizing imports 2012-03-14 19:48:10 -05:00
Adrian Cole 6df4fd9afa Merge pull request #444 from jdaggett/master 
openstack-nova changes
 2012-03-14 17:46:07 -07:00
Adrian Cole 663052ce93 Merge pull request #443 from dralves/jclouds-vbox-nat-host-only-working-cluster-and-live-test 
vbox - last pr broke master creation. worked around qemu bug that prevented clones from adding users. AdminAccess is working
 2012-03-14 17:45:29 -07:00
Mike Arnold aea2fe73ba Removing cruft 2012-03-14 19:42:05 -05:00
Mike Arnold e6c91de7df fixing typo to get test passing 2012-03-14 19:40:29 -05:00
Mike Arnold d3da56a06c fixing typo to get test passing 2012-03-14 19:39:02 -05:00
David Ribeiro Alves 1036c7a0f1 fixed broken master creation because guestAdditions was not executed.fixed but related to qemu (https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/732864) where 
a lock file (/etc/gshadow.lock) on the master prevents clones from adding users. AdminAccess should work now
 2012-03-14 23:55:55 +00:00
Mike Arnold d06f4a74cb fixing a bug -- ensure setting rules in constructor 2012-03-14 18:14:16 -05:00
Mike Arnold 14f2aa4e56 adding security group async client tests 2012-03-14 17:44:25 -05:00
David Ribeiro Alves c161f9bc09 changed experiment live test to use admin access 2012-03-14 22:28:29 +00:00
Aled Sage bd1b430e77 Issue #830 VAppTemplate: live tests and various fixes 2012-03-14 19:43:10 +00:00
Andrew Donald Kennedy c888586cd4 Moved CustomizationSection back to domain package 2012-03-14 18:04:31 +00:00
Aled Sage d027497d5d VAppTemplateLiveTest fixes 2012-03-14 18:04:31 +00:00
Andrew Donald Kennedy ddb70df2d9 Incorporate code review comments from @jclouds 2012-03-14 18:04:30 +00:00
Andrew Donald Kennedy e232aed0ca Re-enable test listener and all VApp live tests 2012-03-14 18:04:30 +00:00
Aled Sage de16cb00be Added builder for RASD and CIMResourceAllocationSettingDataType 2012-03-14 18:04:29 +00:00
Andrew Donald Kennedy e559d13b84 Updates to domain objects, tests and checks as well as setings for JAXB access in classes and packages 2012-03-14 18:04:28 +00:00
Aled Sage 113b8fc7df Domain object cleanup: add builders, hashCode and equals 2012-03-14 16:08:31 +00:00
Andrew Donald Kennedy 392c836688 Changed VAppTemplateClientLiveTest to allow code to build 2012-03-14 16:08:28 +00:00
Andrew Donald Kennedy 4706af5cc8 Updated tests and domain objects if required 2012-03-14 16:08:25 +00:00
Aled Sage d08a0a99c4 Domain objects implement List/Set where appropriate 2012-03-14 16:05:26 +00:00
Aled Sage 1116fcb823 VappTemplateClientLiveTest: work in progress 2012-03-14 16:05:23 +00:00
Andrew Donald Kennedy 21925dde2b Added more checks 2012-03-14 16:05:19 +00:00
Aled Sage af39fd4b32 vcloud-director: added NetworkConnection.IpAddressAllocationMode for constants 2012-03-14 16:02:38 +00:00
Andrew Donald Kennedy 7c80f7a989 Issue 830: Initial setup for tests (both Live and Unit) 2012-03-14 16:02:35 +00:00
Andrew Donald Kennedy 7cfce5dd44 Adding VAppClient and all associated domain objects 2012-03-14 16:02:25 +00:00
David Ribeiro Alves 33b5cc2922 corrected compilation problem. unit and experiments tests pass 2012-03-14 04:23:30 +00:00
David Ribeiro Alves 0c55cf581b merged bridged iface changes 2012-03-14 04:18:39 +00:00
Matt Stephenson 4054eaee4f Add metadata to nova compute service 2012-03-13 14:50:46 -07:00
Matt Stephenson 0f0209e3c4 Removing vestigial code 2012-03-13 14:36:21 -07:00
Mike Arnold c92a76cc8e Merge remote-tracking branch 'upstream/master' 2012-03-13 10:26:44 -05:00
Mike Arnold f8d2b34e96 adding expect-style tests for image client 2012-03-13 10:12:27 -05:00