Merge pull request #92 from 2ndWatch/adjust-private-handling

Add check for sg/subnet existance in config and patch privateIPAction

Author: twarnock

cloudendure/cloudendure.py

@@ -71,6 +71,11 @@ def __init__(
             "destination_role", ""
         )
         self.subnet_id: str = self.config.active_config.get("subnet_id", "")
+        self.private_ip_action: str = self.config.active_config.get(
+            "private_ip_action", ""
+        )
+        if self.subnet_id and not self.private_ip_action:
+            self.private_ip_action = "CREATE_NEW"
         self.security_group_id: str = self.config.active_config.get(
             "security_group_id", ""
         )
@@ -491,9 +496,13 @@ def update_blueprint(self) -> bool:
                     )
                 blueprint["disks"] = new_disks
 
-                # Update launch subnets and SG IDs
-                blueprint["subnetIDs"] = [self.subnet_id]
-                blueprint["securityGroupIDs"] = [self.security_group_id]
+                if self.subnet_id:
+                    # Update launch subnets and SG IDs
+                    blueprint["subnetIDs"] = [self.subnet_id]
+                if self.private_ip_action:
+                    blueprint["privateIPAction"] = self.private_ip_action
+                if self.security_group_id:
+                    blueprint["securityGroupIDs"] = [self.security_group_id]
 
                 # Update machine tags
                 blueprint["tags"] = [

cloudendure/config.py

@@ -37,6 +37,7 @@ class CloudEndureConfig:
         "destination_role": "",
         "subnet_id": "",
         "security_group_id": "",
+        "private_ip_action": "",
         "disk_type": "SSD",
         "public_ip": "DONT_ALLOCATE",
     }