Skip to content

Commit eee28b0

Browse files
shwstpprshwstppr
committed
fix
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 2d451d8 commit eee28b0

29 files changed

Lines changed: 442 additions & 134 deletions

‎api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,6 @@ ZoneResponse createZoneResponse(ResponseView view, DataCenter dataCenter, Boolea
331331

332332
InstanceGroupResponse createInstanceGroupResponse(InstanceGroup group);
333333

334-
org.apache.cloudstack.api.response.InstanceBootGroupResponse createInstanceBootGroupResponse(org.apache.cloudstack.vm.bootgroup.InstanceBootGroup group);
335-
336-
org.apache.cloudstack.api.response.InstanceBootGroupMemberResponse createInstanceBootGroupMemberResponse(org.apache.cloudstack.vm.bootgroup.InstanceBootGroupMember member);
337-
338334
StoragePoolResponse createStoragePoolResponse(StoragePool pool);
339335

340336
StoragePoolResponse createStoragePoolForMigrationResponse(StoragePool pool);

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/AddMemberToInstanceBootGroupCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void execute() {
9797
if (result == null) {
9898
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add member to instance boot group");
9999
}
100-
InstanceBootGroupMemberResponse response = _responseGenerator.createInstanceBootGroupMemberResponse(result);
100+
InstanceBootGroupMemberResponse response = instanceBootGroupService.createInstanceBootGroupMemberResponse(result);
101101
response.setResponseName(getCommandName());
102102
setResponseObject(response);
103103
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/CreateInstanceBootGroupCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void execute() {
102102
if (result == null) {
103103
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create instance boot group");
104104
}
105-
InstanceBootGroupResponse response = _responseGenerator.createInstanceBootGroupResponse(result);
105+
InstanceBootGroupResponse response = instanceBootGroupService.createInstanceBootGroupResponse(result.getId());
106106
response.setResponseName(getCommandName());
107107
setResponseObject(response);
108108
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/ListInstanceBootGroupMembersCmd.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.cloudstack.api.command.user.bootgroup;
1919

20-
import java.util.List;
21-
2220
import javax.inject.Inject;
2321

2422
import org.apache.cloudstack.acl.RoleType;
@@ -33,8 +31,6 @@
3331
import org.apache.cloudstack.vm.bootgroup.InstanceBootGroupMember;
3432
import org.apache.cloudstack.vm.bootgroup.InstanceBootGroupService;
3533

36-
import com.cloud.utils.Pair;
37-
3834
@APICommand(name = "listInstanceBootGroupMembers",
3935
description = "Lists members of an instance boot group, sorted by boot order",
4036
responseObject = InstanceBootGroupMemberResponse.class,
@@ -63,12 +59,7 @@ public String getMemberType() {
6359

6460
@Override
6561
public void execute() {
66-
Pair<List<? extends InstanceBootGroupMember>, Integer> result = instanceBootGroupService.listInstanceBootGroupMembers(this);
67-
ListResponse<InstanceBootGroupMemberResponse> response = new ListResponse<>();
68-
List<InstanceBootGroupMemberResponse> responses = result.first().stream()
69-
.map(m -> _responseGenerator.createInstanceBootGroupMemberResponse(m))
70-
.collect(java.util.stream.Collectors.toList());
71-
response.setResponses(responses, result.second());
62+
ListResponse<InstanceBootGroupMemberResponse> response = instanceBootGroupService.listInstanceBootGroupMembers(this);
7263
response.setResponseName(getCommandName());
7364
setResponseObject(response);
7465
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/ListInstanceBootGroupsCmd.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.cloudstack.api.command.user.bootgroup;
1919

20-
import java.util.List;
21-
2220
import javax.inject.Inject;
2321

2422
import org.apache.cloudstack.acl.RoleType;
@@ -28,14 +26,12 @@
2826
import org.apache.cloudstack.api.Parameter;
2927
import org.apache.cloudstack.api.command.user.UserCmd;
3028
import org.apache.cloudstack.api.response.InstanceBootGroupResponse;
29+
import org.apache.cloudstack.api.response.InstanceGroupResponse;
3130
import org.apache.cloudstack.api.response.ListResponse;
3231
import org.apache.cloudstack.api.response.UserVmResponse;
33-
import org.apache.cloudstack.api.response.InstanceGroupResponse;
3432
import org.apache.cloudstack.vm.bootgroup.InstanceBootGroup;
3533
import org.apache.cloudstack.vm.bootgroup.InstanceBootGroupService;
3634

37-
import com.cloud.utils.Pair;
38-
3935
@APICommand(name = "listInstanceBootGroups",
4036
description = "Lists instance boot groups",
4137
responseObject = InstanceBootGroupResponse.class,
@@ -79,12 +75,7 @@ public Long getInstanceGroupId() {
7975

8076
@Override
8177
public void execute() {
82-
Pair<List<? extends InstanceBootGroup>, Integer> result = instanceBootGroupService.listInstanceBootGroups(this);
83-
ListResponse<InstanceBootGroupResponse> response = new ListResponse<>();
84-
List<InstanceBootGroupResponse> responses = result.first().stream()
85-
.map(g -> _responseGenerator.createInstanceBootGroupResponse(g))
86-
.collect(java.util.stream.Collectors.toList());
87-
response.setResponses(responses, result.second());
78+
ListResponse<InstanceBootGroupResponse> response = instanceBootGroupService.listInstanceBootGroups(this);
8879
response.setResponseName(getCommandName());
8980
setResponseObject(response);
9081
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/RebootInstanceBootGroupCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void execute() {
9191
if (result == null) {
9292
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reboot instance boot group");
9393
}
94-
InstanceBootGroupResponse response = _responseGenerator.createInstanceBootGroupResponse(result);
94+
InstanceBootGroupResponse response = instanceBootGroupService.createInstanceBootGroupResponse(result.getId());
9595
response.setResponseName(getCommandName());
9696
setResponseObject(response);
9797
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/StartInstanceBootGroupCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void execute() {
9191
if (result == null) {
9292
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to start instance boot group");
9393
}
94-
InstanceBootGroupResponse response = _responseGenerator.createInstanceBootGroupResponse(result);
94+
InstanceBootGroupResponse response = instanceBootGroupService.createInstanceBootGroupResponse(result.getId());
9595
response.setResponseName(getCommandName());
9696
setResponseObject(response);
9797
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/StopInstanceBootGroupCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void execute() {
8585
if (result == null) {
8686
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to stop instance boot group");
8787
}
88-
InstanceBootGroupResponse response = _responseGenerator.createInstanceBootGroupResponse(result);
88+
InstanceBootGroupResponse response = instanceBootGroupService.createInstanceBootGroupResponse(result.getId());
8989
response.setResponseName(getCommandName());
9090
setResponseObject(response);
9191
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/UpdateInstanceBootGroupCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void execute() {
8787
if (result == null) {
8888
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update instance boot group");
8989
}
90-
InstanceBootGroupResponse response = _responseGenerator.createInstanceBootGroupResponse(result);
90+
InstanceBootGroupResponse response = instanceBootGroupService.createInstanceBootGroupResponse(result.getId());
9191
response.setResponseName(getCommandName());
9292
setResponseObject(response);
9393
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/UpdateInstanceBootGroupMemberCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void execute() {
8080
if (result == null) {
8181
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update instance boot group member");
8282
}
83-
InstanceBootGroupMemberResponse response = _responseGenerator.createInstanceBootGroupMemberResponse(result);
83+
InstanceBootGroupMemberResponse response = instanceBootGroupService.createInstanceBootGroupMemberResponse(result);
8484
response.setResponseName(getCommandName());
8585
setResponseObject(response);
8686
}

0 commit comments

Comments
 (0)