CLOUDSTACK-9937 : dedicateCluster API response does not return correct detail in response

niteshsarda · Rohit Yadav · commit 9334e091c001 · 2017-08-01T20:40:25.000+02:00
(cherry picked from commit 7364616) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java
@@ -105,14 +105,12 @@ public void execute() {
         List<? extends DedicatedResources> result = dedicatedService.dedicateCluster(getClusterId(), getDomainId(), getAccountName());
         ListResponse<DedicateClusterResponse> response = new ListResponse<DedicateClusterResponse>();
         List<DedicateClusterResponse> clusterResponseList = new ArrayList<DedicateClusterResponse>();
-        if (result != null) {
-            for (DedicatedResources resource : result) {
-                DedicateClusterResponse clusterResponse = dedicatedService.createDedicateClusterResponse(resource);
-                clusterResponseList.add(clusterResponse);
-            }
-            response.setResponses(clusterResponseList);
-            response.setResponseName(getCommandName());
-            this.setResponseObject(response);
+
+        // List of result should always contain single element as only one cluster will be associated with each cluster ID.
+        if (result != null && result.size() == 1) {
+            DedicateClusterResponse clusterResponse = dedicatedService.createDedicateClusterResponse(result.get(0));
+            clusterResponse.setResponseName(getCommandName());
+            this.setResponseObject(clusterResponse);
         } else {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to dedicate cluster");
         }
