Azure: directly attach an existing public IP to a VM from creation

- Add the optional public IP address into the Options model - Only attach the IP address to the first instance to create
ow2-proactive · Apr 19, 2017 · b867861 · b867861
1 parent fc0944b
commit b867861
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/ow2/proactive/connector/iaas/cloud/provider/azure/AzureProvider.java b/src/main/java/org/ow2/proactive/connector/iaas/cloud/provider/azure/AzureProvider.java
@@ -190,6 +190,12 @@ public Set<Instance> createInstance(Infrastructure infrastructure, Instance inst
                                                                                                                                                     secGrpName)
                                                                                                                   .get());
 
+        // Get existing public IP address if specified
+        Optional<PublicIpAddress> optionalPublicIpAddress = options.map(Options::getPublicIpAddress)
+                                                                   .map(publicIpAddress -> azureProviderUtils.searchPublicIpAddressByIp(azureService,
+                                                                                                                                        publicIpAddress)
+                                                                                                             .get());
+
         // Prepare the VM(s)
         Optional<Boolean> optionalStaticPublicIP = options.map(Options::getStaticPublicIP);
         List<Creatable<VirtualMachine>> creatableVirtualMachines = IntStream.rangeClosed(1,
@@ -217,7 +223,8 @@ public Set<Instance> createInstance(Infrastructure infrastructure, Instance inst
                                                                                                                                                                                              creatableNetworkSecurityGroup,
                                                                                                                                                                                              optionalNetworkSecurityGroup.orElse(null),
                                                                                                                                                                                              creatablePublicIpAddress,
-                                                                                                                                                                                             null);
+                                                                                                                                                                                             instanceNumber == 1 ? optionalPublicIpAddress.orElse(null)
+                                                                                                                                                                                                                 : null);
 
                                                                                 return prepareVirtualMachine(instance,
                                                                                                              azureService,

diff --git a/src/main/java/org/ow2/proactive/connector/iaas/model/Options.java b/src/main/java/org/ow2/proactive/connector/iaas/model/Options.java
@@ -54,6 +54,8 @@ public class Options {
 
     private String region;
 
+    private String publicIpAddress;
+
     private String privateNetworkCIDR;
 
     private Boolean staticPublicIP;