From 323f2467653c81bdf61723f05b0577c7a61e91c1 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Tue, 6 Aug 2013 15:58:02 +0530 Subject: [PATCH] CLOUDSTACK-2955: [PortableIPrange deletePortableIpRange fails because of UI firing an incorrect API adding 'portableiprange' tag to the job result of CreatePortableIpRangeCmd api job response --- .../api/command/admin/region/ListPortableIpRangesCmd.java | 2 -- server/src/com/cloud/api/ApiResponseHelper.java | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java index 1f77c2c5164..bf0e34bf5a0 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java @@ -96,8 +96,6 @@ public class ListPortableIpRangesCmd extends BaseListCmd { } rangeResponse.setPortableIpResponses(portableIpResponses); } - - rangeResponse.setObjectName("portableiprange"); responses.add(rangeResponse); } } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 4cc64a8a940..ef69ef78f5f 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -3684,6 +3684,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setGateway(ipRange.getGateway()); response.setNetmask(ipRange.getNetmask()); response.setRegionId(ipRange.getRegionId()); + response.setObjectName("portableiprange"); return response; } @@ -3730,7 +3731,7 @@ public class ApiResponseHelper implements ResponseGenerator { } response.setState(portableIp.getState().name()); - + response.setObjectName("portableip"); return response; }