> */
> - private Network getOrCreateNetwork(GoogleComputeEngineTemplateOptions
> templateOptions, String sharedResourceName) {
> - String networkName = templateOptions.network() != null ?
> toName(templateOptions.network()) : sharedResourceName;
> - return
> networkMap.getUnchecked(NetworkAndAddressRange.create(networkName,
> DEFAULT_INTERNAL_NETWORK_RANGE, null));
> + private Network getNetwork(Set<String> networks) {
> + String networkName;
> + if (networks == null || networks.isEmpty()){
> + networkName = DEFAULT_NETWORK_NAME;
> + }
> + else {
> + Iterator<String> iterator = networks.iterator();
> + networkName = nameFromNetworkString(iterator.next());
> + assert !iterator.hasNext() : "Error: Please specify only one
> network in TemplateOptions when using GCE.";
> + }
> + Network network = api.networks().get(networkName);
> + return checkNotNull(network, "Error: no network with name %s was
> found", networkName);
Would it be more convenient to propagate an IllegalArgumentException instead of
a NPE here?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/138/files#r29559640
