Merge pull request #930 from grycap/devel

Devel
grycap · Oct 18, 2019 · eb4af8c · eb4af8c
2 parents 81e8504 + 424a73e
commit eb4af8c
Showing 1 changed file with 32 additions and 20 deletions.
diff --git a/IM/connectors/EC2.py b/IM/connectors/EC2.py
@@ -668,26 +668,26 @@ def launch(self, inf, radl, requested_radl, num_vm, auth_data):
 
         i = 0
         while i < num_vm:
+            try:
+                err_msg = "Launching in region %s with image: %s" % (region_name, ami)
+                err_msg += " in VPC: %s-%s " % (vpc, subnet)
 
-            vm = VirtualMachine(inf, None, self.cloud, radl, requested_radl, self)
-            vm.destroy = True
-            inf.add_vm(vm)
-            user_data = self.get_cloud_init_data(radl, vm, public_key, user)
+                vm = VirtualMachine(inf, None, self.cloud, radl, requested_radl, self)
+                vm.destroy = True
+                inf.add_vm(vm)
+                user_data = self.get_cloud_init_data(radl, vm, public_key, user)
 
-            bdm = boto.ec2.blockdevicemapping.BlockDeviceMapping(conn)
-            # Force to use magnetic volumes in root device
-            bdm[block_device_name] = boto.ec2.blockdevicemapping.BlockDeviceType(volume_type="standard",
-                                                                                 delete_on_termination=True)
+                bdm = boto.ec2.blockdevicemapping.BlockDeviceMapping(conn)
+                # Force to use magnetic volumes in root device
+                bdm[block_device_name] = boto.ec2.blockdevicemapping.BlockDeviceType(volume_type="standard",
+                                                                                     delete_on_termination=True)
 
-            volumes = self.get_volumes(conn, vm)
-            for device, (size, snapshot_id, disk_type) in volumes.items():
-                bdm[device] = boto.ec2.blockdevicemapping.BlockDeviceType(snapshot_id=snapshot_id,
-                                                                          volume_type=disk_type,
-                                                                          size=size, delete_on_termination=True)
+                volumes = self.get_volumes(conn, vm)
+                for device, (size, snapshot_id, disk_type) in volumes.items():
+                    bdm[device] = boto.ec2.blockdevicemapping.BlockDeviceType(snapshot_id=snapshot_id,
+                                                                              volume_type=disk_type,
+                                                                              size=size, delete_on_termination=True)
 
-            err_msg = "Launching in region %s with image: %s" % (region_name, ami)
-            err_msg += " in VPC: %s-%s " % (vpc, subnet)
-            try:
                 if spot:
                     self.log_info("Launching a spot instance")
                     err_msg += " a spot instance "
@@ -835,14 +835,26 @@ def get_volumes(conn, vm):
             disk_device = "sd%s" % disk_device[-1]
 
             disk_size = None
+            snapshot_id = None
             if disk_url:
-                _, snapshot_id = EC2CloudConnector.getAMIData(disk_url)
-                snapshot = conn.get_all_snapshots([snapshot_id])[0]
-                disk_url = snapshot.id
+                _, elem_id = EC2CloudConnector.getAMIData(disk_url)
+                if elem_id.startswith('snap-'):
+                    snapshot_id = conn.get_all_snapshots([elem_id])[0].id
+                else:
+                    snapshot = conn.get_all_snapshots(filters={'tag:Name': elem_id})
+                    if snapshot:
+                        snapshot_id = snapshot[0].id
+                    else:
+                        raise Exception("No snapshot found with name: %s" % elem_id)
             else:
                 disk_size = vm.info.systems[0].getFeature("disk." + str(cont) + ".size").getValue('G')
 
-            res["/dev/" + disk_device] = (disk_size, disk_url, disk_type)
+            # Set standard as default type
+            if not disk_type:
+                disk_type = "standard"
+                vm.info.systems[0].setValue("disk." + str(cont) + ".type", disk_type)
+
+            res["/dev/" + disk_device] = (disk_size, snapshot_id, disk_type)
             cont += 1
 
         return res