BUG-ID: CLOUDSTACK-8922: Unable to delete IP tag

Author: Subhash Yedugundla

server/src/com/cloud/tags/TaggedResourceManagerImpl.java

@@ -299,16 +299,46 @@ public String getUuid(String resourceId, ResourceObjectType resourceType) {
     @ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = "deleting resource tags")
     public boolean deleteTags(List<String> resourceIds, ResourceObjectType resourceType, Map<String, String> tags) {
         Account caller = CallContext.current().getCallingAccount();
+        List<String> uuids = new ArrayList<String>();
+        List<String> internalIds = new ArrayList<String>();
+        for(String resourceId : resourceIds){
+            if(resourceId.matches("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$")){
+                uuids.add(resourceId);
+            }else{
+                Long internalId = null;
+                try {
+                    internalId = Long.parseLong(resourceId);
+                } catch (final NumberFormatException e) {
+                    internalId = null;
+                }
+                if (internalId != null) {
+                    internalIds.add(resourceId);
+                }else{
+                    throw new InvalidParameterValueException("Invalid resourceId");
+                }
+            }
+        }
 
         SearchBuilder<ResourceTagVO> sb = _resourceTagDao.createSearchBuilder();
-        sb.and().op("resourceId", sb.entity().getResourceId(), SearchCriteria.Op.IN);
-        sb.or("resourceUuid", sb.entity().getResourceUuid(), SearchCriteria.Op.IN);
-        sb.cp();
+
+        if(!uuids.isEmpty() && !internalIds.isEmpty()){
+            throw new InvalidParameterValueException("Expecting only uuids or Ids");
+        }else if (!uuids.isEmpty()){
+            sb.and("resourceUuid", sb.entity().getResourceUuid(), SearchCriteria.Op.IN);
+        }else if (!internalIds.isEmpty()){
+            sb.and("resourceId", sb.entity().getResourceId(), SearchCriteria.Op.IN);
+        }
+
         sb.and("resourceType", sb.entity().getResourceType(), SearchCriteria.Op.EQ);
 
         SearchCriteria<ResourceTagVO> sc = sb.create();
-        sc.setParameters("resourceId", resourceIds.toArray());
-        sc.setParameters("resourceUuid", resourceIds.toArray());
+
+        if (!uuids.isEmpty()){
+            sc.setParameters("resourceUuid", resourceIds.toArray());
+        }else if (!internalIds.isEmpty()){
+            sc.setParameters("resourceId", resourceIds.toArray());
+        }
+
         sc.setParameters("resourceType", resourceType);
 
         List<? extends ResourceTag> resourceTags = _resourceTagDao.search(sc, null);