Updated Branches: refs/heads/1.6.x 091881ab2 -> 746dc2ed1
Cleaning up changes from JCLOUDS-106 Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/746dc2ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/746dc2ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/746dc2ed Branch: refs/heads/1.6.x Commit: 746dc2ed143280bc8f6a723d1821a2246f525803 Parents: 091881a Author: Andrew Bayer <[email protected]> Authored: Mon Jun 24 12:09:57 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Mon Jun 24 13:02:24 2013 -0700 ---------------------------------------------------------------------- .../jclouds/cloudstack/compute/CloudStackComputeService.java | 4 ++-- .../compute/config/CloudStackComputeServiceContextModule.java | 7 ++----- .../cloudstack/compute/loaders/CreateUniqueKeyPair.java | 5 ++++- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/746dc2ed/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java index bb17cac..32d4d59 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java @@ -119,7 +119,7 @@ public class CloudStackComputeService extends BaseComputeService { startNodeStrategy, stopNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated, nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, persistNodeCredentials, timeouts, userExecutor, imageExtension); - this.zoneIdToZone = zoneIdToZone; + this.zoneIdToZone = checkNotNull(zoneIdToZone, "zoneIdToZone"); this.client = checkNotNull(client, "client"); this.securityGroupMap = checkNotNull(securityGroupMap, "securityGroupMap"); this.keyPairCache = checkNotNull(keyPairCache, "keyPairCache"); @@ -173,7 +173,7 @@ public class CloudStackComputeService extends BaseComputeService { } /** - * returns template options, except of type {@link CloudStackTemplateOptions}. + * returns template options, as {@link CloudStackTemplateOptions}. */ @Override public CloudStackTemplateOptions templateOptions() { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/746dc2ed/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java index b4924be..8f054cf 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java @@ -129,13 +129,10 @@ public class CloudStackComputeServiceContextModule extends }).to(CreateUniqueKeyPair.class); bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() { }).to(ZoneIdToZoneSupplier.class); - bind(new TypeLiteral<Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup>>() { }).to(CreateSecurityGroupIfNeeded.class); - bind(new TypeLiteral<CacheLoader<ZoneAndName, SecurityGroup>>() { }).to(FindSecurityGroupOrCreate.class); - bind(new TypeLiteral<Function<Set<? extends NodeMetadata>, Multimap<String, String>>>() { }).to(OrphanedGroupsByZoneId.class); @@ -236,8 +233,8 @@ public class CloudStackComputeServiceContextModule extends @Provides @Singleton protected LoadingCache<String, Set<IPForwardingRule>> getIPForwardingRulesByVirtualMachine( - CacheLoader<String, Set<IPForwardingRule>> getIPForwardingRules) { - return CacheBuilder.newBuilder().build(getIPForwardingRules); + CacheLoader<String, Set<IPForwardingRule>> in) { + return CacheBuilder.newBuilder().build(in); } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/746dc2ed/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java index 0ae2b05..f225d04 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java @@ -31,6 +31,7 @@ import org.jclouds.cloudstack.domain.SshKeyPair; import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult; import com.google.common.base.Optional; +import com.google.common.base.Throwables; import com.google.common.cache.CacheLoader; import com.google.inject.Inject; @@ -58,7 +59,9 @@ public class CreateUniqueKeyPair extends CacheLoader<String, SshKeyPair> { keyPair = client.getSSHKeyPairClient().createSSHKeyPair(input); logger.debug(">> creating SSH key pair with name %s", input); } catch (IllegalStateException e) { - + logger.error(e, "<< error creating SSH key pair with name %s: ", + Throwables.getRootCause(e).getMessage()); + throw Throwables.propagate(e); } }
