Updated Branches: refs/heads/master 833e4c4c5 -> 2c45acab6
JCLOUDS-101 - update GCE compute service to deal with SecurityGroupExtension Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/commit/2c45acab Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/tree/2c45acab Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/diff/2c45acab Branch: refs/heads/master Commit: 2c45acab6936771293db36d6d6b3aa5aef5f2c14 Parents: 833e4c4 Author: Andrew Bayer <[email protected]> Authored: Wed Jun 26 17:07:45 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Wed Jun 26 17:07:45 2013 -0700 ---------------------------------------------------------------------- .../googlecomputeengine/compute/GoogleComputeEngineService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/2c45acab/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java index 7e4690c..e7b9e1c 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java @@ -30,6 +30,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; @@ -111,6 +112,7 @@ public class GoogleComputeEngineService extends BaseComputeService { ComputeServiceConstants.Timeouts timeouts, @Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, Optional<ImageExtension> imageExtension, + Optional<SecurityGroupExtension> securityGroupExtension, Function<Set<? extends NodeMetadata>, Set<String>> findOrphanedGroups, GroupNamingConvention.Factory namingConvention, GoogleComputeEngineApi api, @@ -123,7 +125,7 @@ public class GoogleComputeEngineService extends BaseComputeService { getNodeMetadataStrategy, runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, resumeNodeStrategy, suspendNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated, nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, - persistNodeCredentials, timeouts, userExecutor, imageExtension); + persistNodeCredentials, timeouts, userExecutor, imageExtension, securityGroupExtension); this.findOrphanedGroups = checkNotNull(findOrphanedGroups, "find orphaned groups function"); this.namingConvention = checkNotNull(namingConvention, "naming convention factory"); this.api = checkNotNull(api, "google compute api");
