You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2014/01/08 22:34:32 UTC
git commit: JCLOUDS-416. Use new TemplateOptions#networks field,
albeit a bit janky.
Updated Branches:
refs/heads/master 506b2a204 -> 5e2052b2b
JCLOUDS-416. Use new TemplateOptions#networks field, albeit a bit janky.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/5e2052b2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/5e2052b2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/5e2052b2
Branch: refs/heads/master
Commit: 5e2052b2bb82ef427e9d6873bf82f9446e08cafe
Parents: 506b2a2
Author: Andrew Bayer <an...@gmail.com>
Authored: Wed Jan 8 10:59:36 2014 -0800
Committer: Andrew Bayer <an...@gmail.com>
Committed: Wed Jan 8 10:59:36 2014 -0800
----------------------------------------------------------------------
.../GoogleComputeEngineTemplateOptions.java | 26 +++++++++++++++++---
1 file changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/5e2052b2/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java
index 63e3685..580e104 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java
@@ -30,6 +30,7 @@ import org.jclouds.googlecomputeengine.domain.InstanceTemplate.PersistentDisk;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.base.Optional;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
/**
@@ -60,7 +61,6 @@ public class GoogleComputeEngineTemplateOptions extends TemplateOptions {
if (to instanceof GoogleComputeEngineTemplateOptions) {
GoogleComputeEngineTemplateOptions eTo = GoogleComputeEngineTemplateOptions.class.cast(to);
eTo.network(getNetwork().orNull());
- eTo.network(getNetworkName().orNull());
eTo.serviceAccounts(getServiceAccounts());
eTo.enableNat(isEnableNat());
eTo.disks(getDisks());
@@ -69,11 +69,12 @@ public class GoogleComputeEngineTemplateOptions extends TemplateOptions {
}
/**
+ * @deprecated See TemplateOptions#networks
* @see #getNetworkName()
*/
+ @Deprecated
public GoogleComputeEngineTemplateOptions network(String networkName) {
- this.networkName = fromNullable(networkName);
- return this;
+ return this.networks(networkName);
}
/**
@@ -284,6 +285,22 @@ public class GoogleComputeEngineTemplateOptions extends TemplateOptions {
* {@inheritDoc}
*/
@Override
+ public GoogleComputeEngineTemplateOptions networks(Iterable<String> networks) {
+ return GoogleComputeEngineTemplateOptions.class.cast(super.networks(networks));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public GoogleComputeEngineTemplateOptions networks(String... networks) {
+ return GoogleComputeEngineTemplateOptions.class.cast(super.networks(networks));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public GoogleComputeEngineTemplateOptions tags(Iterable<String> tags) {
return GoogleComputeEngineTemplateOptions.class.cast(super.tags(tags));
}
@@ -337,9 +354,10 @@ public class GoogleComputeEngineTemplateOptions extends TemplateOptions {
/**
* @return the name of an existing network the instances will be attached to, the network is assumed to belong to
* user's project. If no network URI network name are provided a new network will be created for the project.
+ * <b>Note that this is now pulling from the first element in the networks field from TemplateOptions.</b>
*/
public Optional<String> getNetworkName() {
- return networkName;
+ return fromNullable(Iterables.getFirst(getNetworks(), null));
}
/**