Merge pull request jclouds#679 from aplowe/cloudstackfix

Fix for cloudstack ip to network mapping call
rahulbhawsar · Jun 20, 2012 · a12e10d · a12e10d
2 parents 805712d + 2526e7a
commit a12e10d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...rc/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java b/...rc/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java
@@ -48,7 +48,7 @@ public DeployVirtualMachineOptions apply(CloudStackTemplateOptions templateOptio
       checkArgument(templateOptions.getSecurityGroupIds().isEmpty(), "security groups cannot be specified for locations (zones) that use advanced networking");
       if (templateOptions.getNetworkIds().size() > 0) {
          options.networkIds(templateOptions.getNetworkIds());
-      } else {
+      } else if (templateOptions.getIpsToNetworks().isEmpty()) {
          checkArgument(!networks.isEmpty(), "please setup a network for zone: " + zoneId);
          Network defaultNetworkInZone = Iterables.getFirst(filter(networks.values(), and(defaultNetworkInZone(zoneId), supportsStaticNAT())), null);
          if(defaultNetworkInZone == null) {

diff --git a/.../cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java b/.../cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java
@@ -129,8 +129,8 @@ public DeployVirtualMachineOptions ipOnDefaultNetwork(String ipOnDefaultNetwork)
    public DeployVirtualMachineOptions ipsToNetworks(Map<String, String> ipsToNetworks) {
       int count = 0;
       for (String ip : ipsToNetworks.keySet()) {
-         this.queryParameters.replaceValues(String.format("ipnetworklist[%d].ip", count), ImmutableSet.of(ip));
-         this.queryParameters.replaceValues(String.format("ipnetworklist[%d].networkid", count),
+         this.queryParameters.replaceValues(String.format("iptonetworklist[%d].ip", count), ImmutableSet.of(ip));
+         this.queryParameters.replaceValues(String.format("iptonetworklist[%d].networkid", count),
                ImmutableSet.of("" + ipsToNetworks.get(ip)));
          count += 1;
       }