Commit Graph

728 Commits

Author SHA1 Message Date
Andrew Gaul 3d191253ec Enforce use of Collection helpers via Checkstyle
This ensures that we do not repeat the type name.  Some instances remain
due to auto-generated code in dmtf/cim/Cim*.
2012-11-04 20:45:49 -08:00
Aled Sage 3f3037c729 Support for setting RunScriptOnNode.Factory
- Set default RunScriptOnNode.Factory impl using @ImplementedBy,
  rather than hardcoding the binding
2012-11-04 22:29:52 +00:00
Ignasi Barrera 652bc2f75e Improved setupPublicCurl script
With this changes, apt and yum helper functions can be used to install
many packages at one as follows:
ensure_cmd_or_install_package_apt git git-core build-essentials <...>
2012-11-04 19:43:39 +01:00
Andrew Gaul 0761874578 Prefer Assert.fail over assert
The former cannot be disabled.
2012-11-03 14:51:52 -07:00
Andrew Gaul 08b9982384 Enforce modifier order via Checkstyle
Also fix violations, via:

find -name \*.java | xargs sed -i 's/final static/static final/'
find -name \*.java | xargs sed -i 's/static private/private static/'
find -name \*.java | xargs sed -i 's/static abstract/abstract static/'
2012-11-01 20:01:30 -07:00
Andrew Gaul 35ce78f15a Correct typos 2012-11-01 13:25:44 -07:00
Adrian Cole 5da5161485 Merge pull request #909 from andrewgaul/clear-container-timeout-exception
Throw TimeoutException from awaitCompletion
2012-10-30 08:57:20 -07:00
Andrew Gaul 93d69ece2b Enforce newline at end of file via Checkstyle
Also address all warnings, via:

find -name \*.java | while read i; do if [ x`tail -c 1 $i` != x"" ]; then echo >> $i; fi; done
2012-10-29 22:12:44 -07:00
Andrew Gaul 709ca69a2d Enforce that all imports are used via Checkstyle
Also remove all unused imports, via:

mvn checkstyle:checkstyle -Dcheckstyle.output.file=/dev/stdout -Dcheckstyle.output.format=plain | tac | awk -v FS=: '/warning/{print "sed -i " $2 "d " $1}' | while read i; do $i; done
2012-10-29 17:11:08 -07:00
Andrew Gaul 336ccfa2e6 Throw TimeoutException from awaitCompletion
This is a common error that callers should interpret correctly.  For
DeleteAllKeysInList, we integrate into its retry and backoff logic,
and for other callers, we continue to propagate RuntimeException.
2012-10-25 13:50:29 -07:00
Adrian Cole bc82296702 Issue 1103: isolate polling of nodes into its own class 2012-10-20 11:05:18 -07:00
Everett Toews add1182960 Made the polling period between updates for servers and images configurable when using the ComputeService. 2012-10-04 20:45:20 -05:00
Adrian Cole 1edbb0ab4b override-login-privateKey should be :override-login-private-key 2012-10-04 10:28:14 -07:00
Adrian Cole 8ca0dc3c1d better error reporting 2012-09-16 21:28:51 -07:00
Adrian Cole 2ebd5f0247 not all cloud providers accept mixed case metadata keys 2012-09-16 16:20:45 -07:00
Adrian Cole a70e3adb20 Issue 1075:switch to use jetty for java install/web service tests 2012-08-27 00:10:18 -07:00
Dies Koper b7666da170 nslookup on CentOS 6.2 doesn't set error code when failing, so grep expected output instead 2012-08-27 14:31:33 +10:00
Dies Koper cc5dc55bb0 configure .gitattributes to not convert shell scripts to CRLF on Windows 2012-08-24 17:29:40 +10:00
Adrian Cole 0d805574ed Issue 1070:TemplateBuilderSpec with loginUser=user:password doesn't use that for login credentials 2012-08-22 12:05:33 -07:00
Dies Koper c684a59cb3 add predicates and template builder live tests for location scopes SYSTEM and NETWORK 2012-08-06 23:29:26 +10:00
Adrian Cole 513fe2ee3e fixed typo 2012-08-01 21:54:37 -07:00
Adrian Cole b478b02bbe switched to binary-based package manager checks 2012-08-01 11:35:10 -07:00
Andrew Gaul 8ed0e28e68 Spelling corrections 2012-07-26 22:39:35 -07:00
Adrian Cole 3e2e24493e Issue 981: better toString on template 2012-07-26 11:28:38 -07:00
Adrian Cole 5d6e005e8b Issue 1030:defaults not picking up on compute.templateOptions() 2012-07-25 00:33:39 -07:00
Adrian Cole 32da070317 revised tests that AdminAccess change recently broke 2012-07-23 19:28:58 -07:00
Andrew Gaul 985cccff9a Prefer valueOf over explicit object creation
This allows use of cached values.  Patched with:

find -name \*.java | xargs sed -i 's/new Boolean(false)/Boolean.FALSE/g'
find -name \*.java | xargs sed -i 's/new Boolean(true)/Boolean.TRUE/g'
find -name \*.java | xargs sed -i 's/new Boolean(/Boolean.valueOf(/g'
find -name \*.java | xargs sed -i 's/new Integer(/Integer.valueOf(/g'
find -name \*.java | xargs sed -i 's/new Long(/Long.valueOf(/g'
2012-07-22 21:01:46 -07:00
Andrew Gaul a40983a39d Prefer InputSupplier helpers
These ensure that inputs are closed properly.

Updated with: find -name \*.java | xargs sed -i
's/toStringAndClose(\(.*\)\.getInput())/toString(\1)/'
2012-07-18 17:42:48 -07:00
Adrian Cole 05fd64af44 cleaned up http builders and expect tests 2012-07-15 01:50:38 -07:00
David Ribeiro Alves d4453b2ac2 nodepool progress and AdminAccessBuilderSpec 2012-07-12 11:04:55 -07:00
Andrew Bayer 4aa8e1055a Issue #1020. Fill in GECOS field when creating a user.
We'll just use the username there as well for now.
2012-07-11 17:48:20 -07:00
Adrian Cole 9f05a64c8d usage update wrt group name 2012-07-05 10:12:21 -07:00
Adrian Cole 4d6e8fdd73 Issue 1005:openjdk install fails on ubuntu precise 2012-07-03 22:13:53 -07:00
Adrian Cole fb98ce82f7 cleanup of module binding, clarity in toStrings, reduced wrapper depth for memoized sets 2012-07-02 19:36:27 -07:00
Adrian Cole 547c73ab00 cleaner error messages in templateBuilder 2012-07-02 12:21:13 -07:00
Aled Sage 65b813b1be Issue 989: handles transient node-not-found in nodeRunning
Sometimes on aws-ec2, the client returns null (i.e. node not found).
This fix will cause us retry with the correct node-id, rather than
"forgetting" the original nodeId and retrying with null each time.
2012-06-26 10:09:07 +01:00
Adrian Cole 8c4e74296d added min-disk to compute2.clj 2012-06-19 18:40:45 -06:00
Adrian Cole 09d5e8add4 consistent ordering of hardware 2012-06-19 18:31:39 -06:00
vijaykiran 600e6e0feb Add minDisk to toString. 2012-06-18 11:03:25 +02:00
vijaykiran c3a6ecf757 Test for minDisk 2012-06-18 10:52:26 +02:00
vijaykiran bd675a22eb Merge upstream changes to template builder 2012-06-18 10:12:11 +02:00
Adrian Cole 3afdcb66b3 Issue 981:Quiet down jclouds.compute logger 2012-06-16 18:27:29 -04:00
Adrian Cole 585f44639b Issue 978:image location ignored in templateBuilder 2012-06-15 23:36:21 -04:00
Adrian Cole d980b4fd42 changed test poms to use provider.template and provider.ec2-template accordingly 2012-06-15 23:35:10 -04:00
Andrew Gaul 227dbf777a Correct spelled from delimeter to delimiter 2012-06-14 10:05:13 -04:00
Adrian Cole 73ddd9095c runscript data incorrectly in main source tree 2012-06-12 19:11:15 -07:00
Adrian Cole 4dd8fdd0e2 Issue 964:change script builder variable case format from lowerCamel to UPPER_UNDERSCORE 2012-06-12 19:11:09 -07:00
Adrian Cole cea605b2b0 Merge pull request #671 from aledsage/Fix-TemplateBuilder-javadoc
Fixes TemplateBuilder.from(...) javadoc
2012-06-12 09:51:59 -07:00
Aled Sage 899cd6ebd1 Fixes TemplateBuilder.from(...) javadoc 2012-06-12 17:39:29 +01:00
Aled Sage c50edefef6 Remove deprecated code
Removes PopulateDefaultLoginCredentialsForImageStrategy.execute().
The javadoc said it would be removed in jclouds 1.4.

Adds javadoc to ExecResponse.getExitCode, saying to be deleted in 1.6.
It was deprecated in 1.4 release (so 1.6 would be two releases time).
2012-06-11 15:03:31 -07:00
Adrian Cole 67d375dbd1 Issue 966: retry when exitstatus shows process is still running 2012-06-08 21:44:43 -07:00
Adrian Cole dcad558752 Issue 966: removed pid bracketing 2012-06-08 17:44:16 -07:00
Adrian Cole 5f29c52c19 updated javadoc for imageMatches 2012-06-05 11:35:43 -07:00
Adrian Cole 37e2cc7c1b predicates for image 2012-06-04 17:19:24 -07:00
Adrian Cole d2e1599c26 typo in timeout 2012-06-04 17:18:45 -07:00
Adrian Cole bcd3d50ad6 Issue 956:add getImage by id to ComputeService 2012-06-04 16:54:49 -07:00
Adrian Cole 9bf92e0403 Issue 955:introduce NodeMetadata/Image.backendStatus 2012-06-04 12:50:54 -07:00
Adrian Cole 7203286a90 formatting 2012-06-04 11:42:08 -07:00
Adrian Cole 5a3f6011a2 removed junit test dependency 2012-06-03 17:26:57 -07:00
Adrian Cole 3ddff73609 fixed auth test 2012-06-01 15:55:43 -07:00
Adrian Cole 160cd273e2 group name in test was too long, making dns exceptions 2012-06-01 15:55:42 -07:00
Adrian Cole 96773b8a1b Issue 952:add status field to image 2012-05-30 21:22:10 -07:00
Adrian Cole 07c2c24721 Issue 949:Introduce: ComputeMetadataIncludingStatus; Deprecate NodeState -> NodeMetadata.Status 2012-05-29 20:41:10 -07:00
Adrian Cole 40bd08ee6b Issue 915: don't create full path on useradd 2012-05-22 23:10:41 -06:00
Aled Sage 8033edf72f Issue 889: fixes error msg on aborting early wait for node-running.
If nodeRunning retry-predicate returns early, then message says about
aborting prematurely rather than saying we waited for the full length
of time.
2012-05-22 21:29:25 +01:00
Adrian Cole 7d9bba750a more compatible delimiter as - doesn't work in rackspace 2012-05-21 20:19:42 -06:00
Adrian Cole 6e306175ee Merge pull request #646 from aledsage/Issue-915-AdminAccess-HomeDir
Issue 915: supports AdminAccess.adminHome, and UserAdd.home
2012-05-21 13:56:57 -07:00
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
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