Commit Graph

685 Commits

Author SHA1 Message Date
Aled Sage 8b6af79214 Issue 915: supports AdminAccess.adminHome, and UserAdd.home
Previously, UserAdd only supported 'defaultHome'. Now it supports 
'home' as well. This involved changing the `mkdir` from making 
defaultHome to making the actual home (felt like easier 
production-code than getting the parent directory of 'home' to mkdir,
but turned out to be a lot of test-code changes!).

Added AdminAccess.adminHome, which is a direct pass-through to 
UserAdd.home.
2012-05-21 21:10:28 +01:00
Adrian Cole 67d8f9a0f4 image extension related classes under extensions package 2012-05-21 12:39:32 -06:00
Adrian Cole 2fef9008eb pretty json test 2012-05-21 10:29:54 -06:00
Adrian Cole 5c647df129 Issue 938:TemplateBuilderSpec 2012-05-21 02:45:25 -06:00
Adrian Cole 408584582c strategy for tags based on empty strings in a map & comma-delimited known key 2012-05-18 19:56:20 -07:00
Adrian Cole 47b3ac3073 Issue 934: make sure we fail when tags don't work 2012-05-18 15:58:51 -07:00
Alex Heneveld 181824bbf0 javadoc to clarify options additivity 2012-05-18 21:38:45 +01:00
Adrian Cole 70cf2bb6a9 Merge pull request #626 from aledsage/Issue-858-LaunchNodeHangs
Issue-858: fix timeout waiting for port connection, and abort when node!=running
2012-05-17 09:02:36 -07:00
Aled Sage 4e02bd5caa Added BaseComputeServiceLiveTest.testConcurrentUseOfComputeServiceToCreateNodes 2012-05-17 13:26:17 +01:00
Aled Sage b3a027f065 Issue 858: extracted OpenSocketFinder from ComputeServiceUtils 2012-05-17 12:32:38 +01:00
Aled Sage 83c9ecc3d8 Issue 858: moved RetryIfSocketNotYetOpen from compute/ to labs/virtualbox/ 2012-05-17 11:29:30 +01:00
Aled Sage 612f8f2bba Issue 858: fix timeout waiting for port connection, and abort when node!=running 2012-05-17 11:29:30 +01:00
Adrian Cole 59f2b6d171 Merge pull request #625 from aledsage/Issue-888-GroupNamingConvention
Issue 888 group naming convention
2012-05-10 16:45:39 -07:00
Adrian Cole a6cc00e078 Merge pull request #603 from dralves/image-extension-all
image extension working on hpcloud, virtualbox and aws-ec2, cloudservers...
2012-05-10 16:43:27 -07:00
Aled Sage 94ac48070d Issue 888: use GroupNamingConvention for keyName/securityGroup; don't include region in name 2012-05-10 16:47:37 +01:00
Richard Downer 034e9d47f2 Regex-quote the image description and version in TemplateBuilder.fromImage() to prevent problems with image descriptions containing + and other regex special characters 2012-05-09 10:59:08 +01:00
David Ribeiro Alves 082158ac3f image extension working on hpcloud, virtualbox and aws-ec2, cloudservers implemented but has issues 2012-05-03 03:55:40 +01:00
Matt Stephenson 381851b8ab Remove IPSocket class, replace with Guava's HostAndPort class. 2012-04-25 17:52:01 -07:00
Adrian Cole ba7ba36d20 switched to buildView 2012-04-24 12:26:37 -07:00
Adrian Cole df7d2acbb4 wrapper -> view 2012-04-23 19:14:36 -07:00
Adrian Cole 2756040b7e removed freegeoip, as it hasn't worked in ages 2012-04-23 16:44:18 -07:00
Adrian Cole 886d2cafb9 created base Context class with ProviderMetadata and Identity 2012-04-23 16:16:51 -07:00
Adrian Cole f1010e13a4 fixed aws-ec2 image parsing 2012-04-21 10:59:01 -07:00
Andrew Bayer 9b80b984a4 Switch to calling apt-get update before every apt-get install.
I found that the previous "apt-get install || (apt-get update; apt-get
install) didn't work in all cases, but switching to always calling
apt-get update got things working properly.
2012-04-19 13:02:47 -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 004c160aac Prefer checkNotNull when appropriate
Calling checkNotNull on parameters better captures our intent.
2012-04-17 13:34:38 -07:00
Adrian Cole 0b59dea073 removed ContextBuilder subclasses; added unwrap; undid generic params 2012-04-16 00:44:20 -07:00
Adrian Cole 707b97e647 typo in OpenJDK check 2012-04-13 13:43:07 -06:00
Adrian Cole 0d93857601 adjusted test glitches 2012-04-13 13:35:11 -06:00
Adrian Cole 281692bd0b switch to OpenJDK assertion as opposed to 1.7 2012-04-13 10:24:00 -06:00
Adrian Cole c56c2d2f72 Issue 897: moved clojure off Factory -> Builder 2012-04-12 17:07:13 -06:00
Adrian Cole 5a3d2a11d6 revert back to openjdk6 and without implicit apt-upgrade 2012-04-11 19:47:22 -06: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
Ignasi Barrera a059a18ada Pretty print in payload is now configurable 2012-04-10 16:03:02 +02:00
Adrian Cole 8425716eb4 Merge pull request #543 from andrewgaul/builder
Use inference to elide duplicated type parameters
2012-04-08 22:42:35 -07: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 915b548d04 Issue 899:NPE on cleanUpIncidentalResourcesOfDeadNodes 2012-04-08 22:23:28 -06:00
Adrian Cole a1913431c4 more details when image doesn't match 2012-04-05 16:55:32 -07:00
Adrian Cole 95b33d335a Issue 891: update to support lucid 2012-04-03 16:22:02 -07:00
Adrian Cole 8a3712fb2f fixed tests to not taint static credential cache 2012-04-02 11:43:55 -07:00
Adrian Cole 764e0907f7 Issue 657:ApiMetadata 2012-04-01 18:43:31 -07:00
Adrian Cole 7e6b419068 Issue 891: ubuntu and centos now work with openjdk 2012-03-30 18:34:52 -07:00
Adrian Cole 8ab1d7f26c return false when node is null 2012-03-30 18:32:16 -07:00
Adrian Cole a6429398fd Issue 891: switch to openjdk; tested on ubuntu 2012-03-30 16:57:31 -07: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 296462ecb5 fromTemplate() doesn't ensure descriptions are equal 2012-03-22 21:34:06 -07:00
Adrian Cole e5d3408d27 more details when ip addresses come out unexpected 2012-03-22 13:47:48 -07: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 2373f89c78 cleaned up toString/equals/hashCode in base options objects 2012-03-21 19:11:49 -07:00
Adrian Cole 728f9612e0 moved logback.xml up to compute module 2012-03-21 13:05:03 -07:00
Adrian Cole 8283e3c17e Issue 767: decouple log4j from compute module 2012-03-21 13:05:03 -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 84fc104a31 Issue 871: renamed LocationPredicate to what it is 2012-03-20 11:59:58 -07:00
Adrian Cole d7bbfe9cd8 oversight double calling build() 2012-03-20 09:37:27 -07:00
Adrian Cole 2f8b127a32 cleaner impl of LocationPredicate, which doesn't eagerly fetch current location on toString() 2012-03-20 09:34:26 -07:00
Adrian Cole acd83ce9f4 Issue 336: define ip permissions syntax 2012-03-19 17:52:47 -07:00
Adrian Cole 94f5d230c8 Issue 876:It is possible to write ComputeServiceAdapter in a way that leads to orphaned credentials 2012-03-19 15:52:07 -07:00
Adrian Cole 9bec280c94 createNodeInGroupWithNameAndTemplate hook 2012-03-19 01:03:24 -07:00
Adrian Cole 6301e23a1a temporary fix to CloudLinux blow-up 2012-03-15 16:33:48 -07:00
Adrian Cole a1fbb00da6 Issue 871: only providers can have null parent 2012-03-15 14:47:12 -07:00
Adrian Cole e8d4fe1687 Issue 871: corrected invalid toString message 2012-03-15 13:59:32 -07:00
Adrian Cole 5298951b91 Issue 871: preserve existing logic, but backfill tests based on javadoc 2012-03-15 13:55:43 -07:00
Adrian Cole 61ca816645 reverted pull 446 2012-03-15 08:59:31 -07:00
Alex Heneveld 0676300841 fixes in location containment predicate.
the grouping of and's and or's was wrong, causing an NPE in cloudstack tests when investigating parents;
the direction of containment (input should be descendent of location) was wrong also, i think,
to judge by the description "locationEqualsOrChildOf";
code is now a loop rather than fixed investigation of 3 levels
2012-03-15 15:55:49 +02:00
Adrian Cole 67d70fae62 state bug 2012-03-12 19:45:35 -07:00
Adrian Cole 755485537b allow execChannel to survive sshclient.disconnect, and not be bound by sessionTimeout 2012-03-10 13:25:12 -08:00
Adrian Cole 5e6ddec874 nasty regression in state found by aled 2012-03-09 10:53:54 -08:00
Adrian Cole dd7b16075e Issue 861:SSHClient should provide access to input/output streams 2012-03-08 15:48:51 -08:00
Adam Lowe 6559322efc VCloud Director 1.5: reverting unnecessary change to non-JAXB Section class 2012-03-01 23:26:20 +00:00
danikov 5dd8f60a9f enable vClouds domain objects to extend Section 2012-03-01 09:55:00 +00:00
Adrian Cole c72b3ae236 InstallJDK for 32bit vms 2012-02-26 16:55:42 +02:00
Andrew Donald Kennedy 34459605fc Large squashed commit with various changes:
- Setup new test properties for catalog names and various ids as injectable
- Make retryable TaskSuccess predicate injectable
- Mark test classes as "user"
- Various tidyup and code fixes as and when required
2012-02-21 16:07:31 +00:00
Adrian Cole d916bb25ac tidied syntax to get eventBus 2012-02-19 09:39:20 +02:00
Adrian Cole 636c3bb6e5 Issue 357:Init script should check for errors + herefile fixes + script events 2012-02-19 01:53:19 +02:00
Ioannis Canellos 5490b3068c [842] Added required import packages to cloudfiles api bundle. Improved import packages in all bundles. 2012-02-17 00:49:39 +02:00
Adrian Cole a4140d5907 typo 2012-02-16 12:10:46 +01:00
Adrian Cole ed7b8895e6 Issue 840:remove compute.clj and blobstore.clj 2012-02-15 14:55:26 +01:00
Adrian Cole 44db3e0d57 fixed test bug 2012-02-15 12:30:18 +01:00
Adrian Cole 03c9dd9915 Issue 824: templateBuilder param for hypervisor 2012-02-15 11:55:30 +01:00
Adrian Cole 2da5d297a5 Issue 838: convert jboss tests and java tests to use InstallJDK 2012-02-14 23:22:24 +01:00
Adrian Cole 2332662a90 move to using AtomicReference for retryable predicates saves at least one network call on re-fetch 2012-02-14 23:22:24 +01:00
David Ribeiro Alves ca602e7db0 Moved RunScriptData to src/main as there are non test dependencies; Deleted orpah and duplicate file GuestAdditionsInstallation.java (wrong place and duplicated in InstallGuestAdditions.java) as well as duplicate script installGuestAdditions.sh (duplicated in installModuleAssistantIfNeeded.sh) 2012-02-13 05:36:14 -06:00
Adrian Cole 993ba39243 stabilized glesys templates 2012-02-09 11:32:31 +00:00
Adrian Cole fe4d148528 updated current version to 1.5.0-SNAPSHOT 2012-02-04 11:06:07 -08:00
Aled Sage ab568f0a09 Issues 364 and #365: destroyNode cleans up incidental resources 2012-02-04 15:40:31 +00:00
Adrian Cole bdd739ad04 Issue 826:support api-generated location metadata across service types, note this ensures authenticationexceptions propagate even after context creation 2012-02-03 00:27:29 -08:00
Adrian Cole ddec84db8e missing centos mapping 2012-01-30 23:58:46 -08:00
Adrian Cole abeffc1119 Issue 824:add field for hypervisor 2012-01-30 22:52:35 -08:00
Adrian Cole 3df052565f updated current version to 1.4.0-SNAPSHOT 2012-01-16 13:08:32 -08:00
Adrian Cole 69c9fd6905 fixed null pointers 2012-01-15 19:45:55 -08:00
Adrian Cole 181f1de4fd updated clojure option map for compute2 2012-01-15 15:30:34 -08:00
Adrian Cole 16a973c08c handle case when image location is null (ex. not scoped to a location)
work on templates where image and hardware have no location

better warning messages on templates we cannot use

lookup images less often in vcloud
2012-01-15 02:12:14 -08:00
Adrian Cole 9791a51039 better exception message
remoced unused import

removed hokey test
2012-01-15 02:08:14 -08:00
Adrian Cole c9f980e59e filtered out null objects 2012-01-15 02:08:12 -08:00
Adrian Cole 9d36c3e4b0 renamed tag -> group
removed old language in exception about tag
2012-01-15 02:07:46 -08:00
Adrian Cole 7e32b0624d add reminder to add exception to this method, so that we can cleanup stale resources 2012-01-14 21:07:39 -08:00
Adrian Cole a28a981931 address case when curl is not yet installed 2012-01-14 21:06:05 -08:00
Adrian Cole ab6c4181ba Issue 710: our ovf classes currently do not support multiple virtual systems 2012-01-14 20:53:49 -08:00
Adrian Cole f363771464 os tidies 2012-01-12 17:59:50 -08:00
Adrian Cole f390f314ee Issue 803: changes needed when guice is in production mode 2012-01-07 06:08:32 -08:00
Adrian Cole 0f71ae1596 added image constants 2012-01-07 01:28:12 -08:00
Adrian Cole 29f32cc6c2 added constant for image-id 2012-01-06 09:51:36 -08:00
Adrian Cole f06e6982eb Issue 800:introduce property for build version 2012-01-05 17:51:55 -08:00
Adrian Cole 99fb37f6cf refactored LiveTest code to share property initialization 2012-01-05 17:51:03 -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
Adrian Cole c6d1f2d56e allow images to get credentials by credentialstore 2011-12-22 02:18:17 -08:00
Adrian Cole 618dc907a1 hardened compute adapter 2011-12-21 23:59:51 -08:00
Adrian Cole d1f4339c84 fixed means by which tests get login credentials 2011-12-21 22:10:34 -08:00
Andrew Donald Kennedy bfe6cd32a6 Typo in Javadoc 2011-12-21 18:53:28 +00:00
Adrian Cole fd4fb98191 updated tests to use jdk7u2 2011-12-21 03:15:08 -08: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
Aled Sage af97d350a7 Issue 746: added runScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.testRepeatedlyChecksIfInitScriptCompleted 2011-12-19 10:48:20 +00:00
Adrian Cole 39290d725c Issue 786:isolate stub computeservice contexts from eachother 2011-12-18 15:19:49 -08:00
Adrian Cole aa00e28d73 Issue 787:clojure terminated? predicate should return true if the node is null 2011-12-18 15:19:26 -08: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 e28d45ec18 example test for properties override 2011-12-16 20:53:06 -08:00
Aled Sage 570fab3dea Issue 746: add properties for initStatusInitialPeriod and initStatusMaxPeriod 2011-12-16 23:59:33 +00:00
Aled Sage aa94c60df9 Issue 746: increasing retry times for init-script 2011-12-16 23:17:45 +00:00
Aled Sage 9a725ba93c Fix testTemplateBuilderWithLoginUserSpecified to clean up credentials added to CredentialStoreModule.BACKING 2011-12-13 22:42:14 +00:00
Aled Sage 60af7f454f testTemplateBuilderCanUseImageId: use new context when building with imageId 2011-12-13 22:42:13 +00: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 a45e16ebb3 Issue 763: code tidy, to use new ImagesToRegionAndIdMap.imagesToMap(Set<Image>) 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
Mattias Holmqvist 9865616c2c Issue 772: Fix clojure tests when running with Clojure 1.3.0. Added ^:dynamic to Vars to support Clojure 1.3.0. Also cleaned up tests a bit, not using earmuffs when inappropriate. 2011-12-08 01:12:52 +01:00
Adrian Cole 7b72ef5cfc reinstated arg so that we are binary compatible for drop-in w/whirr 2011-12-01 19:11:33 -05:00
Adrian Cole 1dbb34c2aa log more details when jboss service fails to start 2011-11-27 18:13:05 -05:00
Adrian Cole c15400ca0e Merge pull request #190 from iocanel/master
Udpdated Fragment definitions so that they are compatible with OSGi 4.3.
2011-11-26 08:16:18 -08:00
Ioannis Canellos 70bb4a17e2 Updated fragment declarations so that they can comply with OSGi 4.3 specification. 2011-11-23 19:03:51 +02: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 3cec3293f0 Expose the Guice injector as a @Beta API 2011-11-21 10:52:32 +02:00
Adrian Cole a377fe04a0 fixed template test when there's no password supplied 2011-11-17 16:11:00 +02:00
Adrian Cole 6392edfcee default to root/Administrator on image login user 2011-11-16 14:02:00 +02:00
Adrian Cole 90dfed8583 ensure templatebuilder tests pass when image-id and login-user properties are set 2011-11-15 18:29:53 +02:00
Adrian Cole 6b4a431665 change test to not use InetAddress.getLocalhost() as this breaks on cloudbees 2011-11-15 15:59:32 +02:00
Adrian Cole e1f66caec0 updated cloudstack to include adminCredential + vlan tests 2011-11-15 12:59:42 +02:00
Adrian Cole 4329129c25 Issue 750:property to set the image id for the default template 2011-11-14 19:25:46 +02:00
Adrian Cole 8569771712 fixed aws-ec2 template tests 2011-11-13 13:28:28 +02:00
Adrian Cole ae92c8005b authorization test failing on guice errors on apis module 2011-11-13 12:57:10 +02:00
Adrian Cole c08a7884bd Issue 750:property to set the image id for the default template 2011-11-11 19:48:28 +02:00
Adrian Cole 1cf2be9b09 Merge pull request #127 from jsonking/master
Issue 695: Updated test url and refactored credentials code into singe location.
2011-11-10 00:52:53 -08:00
Adrian Cole 281c92a581 roughed in cloudstack compute service adapter 2011-11-10 02:11:10 +01:00
Jason King 98e7c6047c Refactored frequently repeated service config (provider,credential etc) into new class BaseVersionedServiceLiveTest and used it in BaseCompute, BaseTerremarkClient and BaseVCloudClient live tests 2011-11-09 15:27:46 +00:00