Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1052: Fix DigitalOcean2 deleteImage

This commit is contained in:
Ignasi Barrera 2015-12-22 23:05:29 +01:00
parent 575d39e7c5
commit 1ac6fa8426
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/extensions/DigitalOcean2ImageExtension.java
View File

@ -118,17 +118,21 @@ public class DigitalOcean2ImageExtension implements ImageExtension {
@Override
public boolean deleteImage(String id) {
try {
// The id of the image can be an id or a slug. Use the corresponding method of the API depending on what is
// provided. If it can be parsed as a number, use the method to destroy by ID. Otherwise, destroy by slug.
Integer imageId = Ints.tryParse(id);
if (imageId != null) {
logger.debug(">> image does not have a slug. Using the id to delete the image...");
api.imageApi().delete(imageId);
String imageId = ImageInRegion.extractImageId(id);
Integer numericId = Ints.tryParse(imageId); // User images don't have a slug, so we expect a numeric id here
if (numericId != null) {
try {
logger.debug(">> deleting image %s...", id);
api.imageApi().delete(numericId);
return true;
} catch (Exception ex) {
logger.error(ex, ">> error deleting image %s", id);
}
return true;
} catch (Exception ex) {
return false;
} else {
logger.warn(">> image %s is not a user image and cannot be deleted", id);
}
return false;
}
}