Updated Branches: refs/heads/master 92095569e -> 66f73e4e6
JCLOUDS-101 - update joyent compute service to deal with SecurityGroupExtension Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/commit/66f73e4e Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/66f73e4e Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/66f73e4e Branch: refs/heads/master Commit: 66f73e4e64992abd81c8a18eb0ccddd4f038248f Parents: 9209556 Author: Andrew Bayer <[email protected]> Authored: Wed Jun 26 17:05:23 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Wed Jun 26 17:05:23 2013 -0700 ---------------------------------------------------------------------- .../cloudapi/v6_5/compute/JoyentCloudComputeService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/66f73e4e/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java index 9e1e18e..1961903 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/JoyentCloudComputeService.java @@ -40,6 +40,7 @@ import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.compute.extensions.ImageExtension; +import org.jclouds.compute.extensions.SecurityGroupExtension; import org.jclouds.compute.functions.GroupNamingConvention; import org.jclouds.compute.internal.BaseComputeService; import org.jclouds.compute.internal.PersistNodeCredentials; @@ -103,12 +104,13 @@ public class JoyentCloudComputeService extends BaseComputeService { @Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, JoyentCloudApi novaApi, LoadingCache<DatacenterAndName, KeyAndPrivateKey> keyCache, Function<Set<? extends NodeMetadata>, Multimap<String, String>> orphanedGroupsByDatacenterId, - GroupNamingConvention.Factory namingConvention, Optional<ImageExtension> imageExtension) { + GroupNamingConvention.Factory namingConvention, Optional<ImageExtension> imageExtension, + Optional<SecurityGroupExtension> securityGroupExtension) { super(context, credentialStore, images, sizes, locations, listNodesStrategy, getImageStrategy, getNodeMetadataStrategy, runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, startNodeStrategy, stopNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated, nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, - persistNodeCredentials, timeouts, userExecutor, imageExtension); + persistNodeCredentials, timeouts, userExecutor, imageExtension, securityGroupExtension); this.novaApi = checkNotNull(novaApi, "novaApi"); this.keyCache = checkNotNull(keyCache, "keyCache"); this.orphanedGroupsByDatacenterId = checkNotNull(orphanedGroupsByDatacenterId, "orphanedGroupsByDatacenterId");
