change logic to use the UUID translations flow

Author: erikbocks

api/src/main/java/org/apache/cloudstack/api/BaseCmd.java

@@ -501,7 +501,7 @@ public Map<String, String> convertExternalDetailsToMap(Map externalDetails) {
     }
 
     public String getResourceUuid(String parameterName) {
-        String resourceUuid = fullUrlParams.get(parameterName);
+        String resourceUuid = CallContext.current().getApiResourceUuid(parameterName);
 
         if (UuidUtils.isUuid(resourceUuid)) {
             return resourceUuid;

api/src/main/java/org/apache/cloudstack/context/CallContext.java

@@ -63,6 +63,7 @@ protected Stack<CallContext> initialValue() {
     private User user;
     private long userId;
     private final Map<Object, Object> context = new HashMap<Object, Object>();
+    private final Map<String, String > apiResourcesUuids = new HashMap<>();
     private Project project;
     private String apiName;
 
@@ -388,6 +389,14 @@ public void setEventDisplayEnabled(boolean eventDisplayEnabled) {
         isEventDisplayEnabled = eventDisplayEnabled;
     }
 
+    public String getApiResourceUuid(String paramName) {
+        return apiResourcesUuids.get(paramName);
+    }
+
+    public void putApiResourceUuid(String paramName, String uuid) {
+        apiResourcesUuids.put(paramName, uuid);
+    }
+
     public Map<Object, Object> getContextParameters() {
         return context;
     }

server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java

@@ -532,6 +532,11 @@ private Long translateUuidToInternalId(final String uuid, final Parameter annota
                 // Populate CallContext for each of the entity.
                 for (final Class<?> entity : entities) {
                     CallContext.current().putContextParameter(entity, internalId);
+                    final Object objVO = _entityMgr.findByUuidIncludingRemoved(entity, uuid);
+                    if (objVO == null) {
+                        continue;
+                    }
+                    CallContext.current().putApiResourceUuid(annotation.name(), uuid);
                 }
                 validateNaturalNumber(internalId, annotation.name());
                 return internalId;
@@ -556,6 +561,7 @@ private Long translateUuidToInternalId(final String uuid, final Parameter annota
             }
             // Return on first non-null Id for the uuid entity
             if (internalId != null){
+                CallContext.current().putApiResourceUuid(annotation.name(), uuid);
                 CallContext.current().putContextParameter(entity, uuid);
                 break;
             }