Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-416. Use new TemplateOptions#networks field, albeit a bit janky.

This commit is contained in:
Andrew Bayer 2014-01-08 10:59:36 -08:00
parent 582e9b38e6
commit f6a7bba3d6
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java
View File

@ -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);
}
/**
@ -280,6 +281,22 @@ public class GoogleComputeEngineTemplateOptions extends TemplateOptions {
return GoogleComputeEngineTemplateOptions.class.cast(super.nodeNames(nodeNames));
}
/**
* {@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}
*/
@ -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));
}
/**