Skip to content

Commit 64fc1f3

Browse files
shwstpprshwstppr
committed
more changes
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent eaff6f0 commit 64fc1f3

File tree

11 files changed

+32
-132
lines changed

11 files changed

+32
-132
lines changed

‎api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.cloudstack.api.response.VpnUsersResponse;
2929
import org.apache.cloudstack.context.CallContext;
3030

31-
import com.cloud.domain.Domain;
3231
import com.cloud.event.EventTypes;
3332
import com.cloud.network.VpnUser;
3433
import com.cloud.user.Account;
@@ -110,32 +109,17 @@ public String getEventType() {
110109
@Override
111110
public void execute() {
112111
VpnUser vpnUser = _entityMgr.findById(VpnUser.class, getEntityId());
113-
Account account = _entityMgr.findById(Account.class, vpnUser.getAccountId());
114112
try {
115113
if (!_ravService.applyVpnUsers(vpnUser.getAccountId(), userName)) {
116114
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add vpn user");
117115
}
118116
} catch (Exception ex) {
119117
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
120118
}
121-
122-
VpnUsersResponse vpnResponse = new VpnUsersResponse();
123-
vpnResponse.setId(vpnUser.getUuid());
124-
vpnResponse.setUserName(vpnUser.getUsername());
125-
vpnResponse.setAccountName(account.getAccountName());
126119
// re-retrieve the vpnuser, as the call to `applyVpnUsers` might have changed the state
127120
vpnUser = _entityMgr.findById(VpnUser.class, getEntityId());
128-
vpnResponse.setState(vpnUser.getState().toString());
129-
130-
Domain domain = _entityMgr.findById(Domain.class, account.getDomainId());
131-
if (domain != null) {
132-
vpnResponse.setDomainId(domain.getUuid());
133-
vpnResponse.setDomainName(domain.getName());
134-
vpnResponse.setDomainPath(domain.getPath());
135-
}
136-
121+
VpnUsersResponse vpnResponse = _responseGenerator.createVpnUserResponse(vpnUser);
137122
vpnResponse.setResponseName(getCommandName());
138-
vpnResponse.setObjectName("vpnuser");
139123
setResponseObject(vpnResponse);
140124
}
141125

‎api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
@SuppressWarnings("unused")
4343
@EntityReference(value = {VirtualMachine.class, UserVm.class, VirtualRouter.class})
44-
public class UserVmResponse extends BaseResponseWithTagInformation implements ControlledEntityResponse, SetResourceIconResponse {
44+
public class UserVmResponse extends BaseResponseWithTagInformation implements ControlledViewEntityResponse, SetResourceIconResponse {
4545
@SerializedName(ApiConstants.ID)
4646
@Param(description = "the ID of the virtual machine")
4747
private String id;

‎plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
import org.apache.logging.log4j.Level;
119119

120120
import com.cloud.api.ApiDBUtils;
121+
import com.cloud.api.ApiResponseHelper;
121122
import com.cloud.api.query.dao.NetworkOfferingJoinDao;
122123
import com.cloud.api.query.dao.TemplateJoinDao;
123124
import com.cloud.api.query.dao.UserVmJoinDao;
@@ -135,7 +136,6 @@
135136
import com.cloud.dc.dao.DataCenterDao;
136137
import com.cloud.dc.dao.DedicatedResourceDao;
137138
import com.cloud.deploy.DeployDestination;
138-
import com.cloud.domain.Domain;
139139
import com.cloud.event.ActionEvent;
140140
import com.cloud.exception.ConcurrentOperationException;
141141
import com.cloud.exception.InsufficientCapacityException;
@@ -796,18 +796,7 @@ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetes
796796
response.setKubernetesVersionId(version.getUuid());
797797
response.setKubernetesVersionName(version.getName());
798798
}
799-
Account account = ApiDBUtils.findAccountById(kubernetesCluster.getAccountId());
800-
if (account.getType() == Account.Type.PROJECT) {
801-
Project project = ApiDBUtils.findProjectByProjectAccountId(account.getId());
802-
response.setProjectId(project.getUuid());
803-
response.setProjectName(project.getName());
804-
} else {
805-
response.setAccountName(account.getAccountName());
806-
}
807-
Domain domain = ApiDBUtils.findDomainById(kubernetesCluster.getDomainId());
808-
response.setDomainId(domain.getUuid());
809-
response.setDomainName(domain.getName());
810-
response.setDomainPath(domain.getPath());
799+
ApiResponseHelper.populateOwner(response, kubernetesCluster);
811800
response.setKeypair(kubernetesCluster.getKeyPair());
812801
response.setState(kubernetesCluster.getState().toString());
813802
response.setCores(String.valueOf(kubernetesCluster.getCores()));

‎plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
@SuppressWarnings("unused")
3232
@EntityReference(value = {KubernetesCluster.class})
33-
public class KubernetesClusterResponse extends BaseResponseWithAnnotations implements ControlledEntityResponse {
33+
public class KubernetesClusterResponse extends BaseResponseWithAnnotations implements ControlledViewEntityResponse {
3434
@SerializedName(ApiConstants.ID)
3535
@Param(description = "the id of the Kubernetes cluster")
3636
private String id;

‎server/src/main/java/com/cloud/api/ApiResponseHelper.java‎

Lines changed: 22 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -829,21 +829,6 @@ public VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot) {
829829
}
830830
}
831831
populateOwner(vmSnapshotResponse, vmSnapshot);
832-
Project project = ApiDBUtils.findProjectByProjectAccountId(vmSnapshot.getAccountId());
833-
if (project != null) {
834-
vmSnapshotResponse.setProjectId(project.getUuid());
835-
vmSnapshotResponse.setProjectName(project.getName());
836-
}
837-
Account account = ApiDBUtils.findAccountById(vmSnapshot.getAccountId());
838-
if (account != null) {
839-
vmSnapshotResponse.setAccountName(account.getAccountName());
840-
}
841-
DomainVO domain = ApiDBUtils.findDomainById(vmSnapshot.getDomainId());
842-
if (domain != null) {
843-
vmSnapshotResponse.setDomainId(domain.getUuid());
844-
vmSnapshotResponse.setDomainName(domain.getName());
845-
vmSnapshotResponse.setDomainPath(domain.getPath());
846-
}
847832

848833
List<? extends ResourceTag> tags = _resourceTagDao.listBy(vmSnapshot.getId(), ResourceObjectType.VMSnapshot);
849834
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
@@ -2357,18 +2342,7 @@ public SecurityGroupResponse createSecurityGroupResponseFromSecurityGroupRule(Li
23572342
response.setName(securityGroup.getName());
23582343
response.setDescription(securityGroup.getDescription());
23592344

2360-
Account account = securiytGroupAccounts.get(securityGroup.getAccountId());
2361-
2362-
if (securityGroup.getAccountType() == Account.Type.PROJECT) {
2363-
response.setProjectId(securityGroup.getProjectUuid());
2364-
response.setProjectName(securityGroup.getProjectName());
2365-
} else {
2366-
response.setAccountName(securityGroup.getAccountName());
2367-
}
2368-
2369-
response.setDomainId(securityGroup.getDomainUuid());
2370-
response.setDomainName(securityGroup.getDomainName());
2371-
response.setDomainPath(securityGroup.getDomainPath());
2345+
populateOwner(response, securityGroup);
23722346

23732347
for (SecurityRule securityRule : securityRules) {
23742348
SecurityGroupRuleResponse securityGroupData = new SecurityGroupRuleResponse();
@@ -2765,29 +2739,18 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
27652739
// get domain from network_domain table
27662740
Pair<Long, Boolean> domainNetworkDetails = ApiDBUtils.getDomainNetworkDetails(network.getId());
27672741
if (domainNetworkDetails.first() != null) {
2768-
Domain domain = ApiDBUtils.findDomainById(domainNetworkDetails.first());
2769-
if (domain != null) {
2770-
response.setDomainId(domain.getUuid());
2771-
response.setDomainPath(getPrettyDomainPath(domain.getPath()));
2772-
}
2742+
populateDomain(response, domainNetworkDetails.first());
27732743
}
27742744
response.setSubdomainAccess(domainNetworkDetails.second());
27752745
}
27762746

27772747
Long dedicatedDomainId = ApiDBUtils.getDedicatedNetworkDomain(network.getId());
27782748
if (dedicatedDomainId != null) {
2779-
Domain domain = ApiDBUtils.findDomainById(dedicatedDomainId);
2780-
if (domain != null) {
2781-
response.setDomainId(domain.getUuid());
2782-
response.setDomainName(domain.getName());
2783-
response.setDomainPath(domain.getPath());
2784-
}
2785-
2749+
populateDomain(response, dedicatedDomainId);
27862750
}
27872751

27882752
response.setSpecifyIpRanges(network.getSpecifyIpRanges());
27892753

2790-
27912754
setVpcIdInResponse(network.getVpcId(), response::setVpcId, response::setVpcName);
27922755

27932756
setResponseAssociatedNetworkInformation(response, network.getId());
@@ -3049,14 +3012,10 @@ private void populateOwner(ControlledEntityResponse response, ControlledEntity o
30493012
} else {
30503013
response.setAccountName(account.getAccountName());
30513014
}
3052-
3053-
Domain domain = ApiDBUtils.findDomainById(object.getDomainId());
3054-
response.setDomainId(domain.getUuid());
3055-
response.setDomainName(domain.getName());
3056-
response.setDomainPath(getPrettyDomainPath(domain.getPath()));
3015+
populateDomain(response, object.getDomainId());
30573016
}
30583017

3059-
private void populateOwner(ControlledViewEntityResponse response, ControlledEntity object) {
3018+
public static void populateOwner(ControlledViewEntityResponse response, ControlledEntity object) {
30603019
Account account = ApiDBUtils.findAccountById(object.getAccountId());
30613020

30623021
if (account.getType() == Account.Type.PROJECT) {
@@ -3068,10 +3027,7 @@ private void populateOwner(ControlledViewEntityResponse response, ControlledEnti
30683027
response.setAccountName(account.getAccountName());
30693028
}
30703029

3071-
Domain domain = ApiDBUtils.findDomainById(object.getDomainId());
3072-
response.setDomainId(domain.getUuid());
3073-
response.setDomainName(domain.getName());
3074-
response.setDomainPath(domain.getPath());
3030+
populateDomain(response, object.getDomainId());
30753031
}
30763032

30773033
public static void populateOwner(ControlledViewEntityResponse response, ControlledViewEntity object) {
@@ -3085,7 +3041,7 @@ public static void populateOwner(ControlledViewEntityResponse response, Controll
30853041

30863042
response.setDomainId(object.getDomainUuid());
30873043
response.setDomainName(object.getDomainName());
3088-
response.setDomainPath(object.getDomainPath());
3044+
response.setDomainPath(getPrettyDomainPath(object.getDomainPath()));
30893045
}
30903046

30913047
private void populateAccount(ControlledEntityResponse response, long accountId) {
@@ -3109,10 +3065,22 @@ private void populateAccount(ControlledEntityResponse response, long accountId)
31093065

31103066
private void populateDomain(ControlledEntityResponse response, long domainId) {
31113067
Domain domain = ApiDBUtils.findDomainById(domainId);
3068+
if (domain == null) {
3069+
return;
3070+
}
3071+
response.setDomainId(domain.getUuid());
3072+
response.setDomainName(domain.getName());
3073+
response.setDomainPath(getPrettyDomainPath(domain.getPath()));
3074+
}
31123075

3076+
private static void populateDomain(ControlledViewEntityResponse response, long domainId) {
3077+
Domain domain = ApiDBUtils.findDomainById(domainId);
3078+
if (domain == null) {
3079+
return;
3080+
}
31133081
response.setDomainId(domain.getUuid());
31143082
response.setDomainName(domain.getName());
3115-
response.setDomainPath(domain.getPath());
3083+
response.setDomainPath(getPrettyDomainPath(domain.getPath()));
31163084
}
31173085

31183086
@Override
@@ -4104,12 +4072,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
41044072
usageRecResponse.setAccountName(account.getAccountName());
41054073
}
41064074

4107-
Domain domain = ApiDBUtils.findDomainById(usageRecord.getDomainId());
4108-
if (domain != null) {
4109-
usageRecResponse.setDomainId(domain.getUuid());
4110-
usageRecResponse.setDomainName(domain.getName());
4111-
usageRecResponse.setDomainPath(domain.getPath());
4112-
}
4075+
populateDomain(usageRecResponse, account.getDomainId());
41134076

41144077
if (usageRecord.getZoneId() != null) {
41154078
DataCenter zone = ApiDBUtils.findZoneById(usageRecord.getZoneId());
@@ -4896,18 +4859,11 @@ public AffinityGroupResponse createAffinityGroupResponse(AffinityGroup group) {
48964859

48974860
AffinityGroupResponse response = new AffinityGroupResponse();
48984861

4899-
Account account = ApiDBUtils.findAccountById(group.getAccountId());
49004862
response.setId(group.getUuid());
4901-
response.setAccountName(account.getAccountName());
49024863
response.setName(group.getName());
49034864
response.setType(group.getType());
49044865
response.setDescription(group.getDescription());
4905-
Domain domain = ApiDBUtils.findDomainById(account.getDomainId());
4906-
if (domain != null) {
4907-
response.setDomainId(domain.getUuid());
4908-
response.setDomainName(domain.getName());
4909-
response.setDomainPath(domain.getPath());
4910-
}
4866+
populateOwner(response, group);
49114867

49124868
response.setObjectName("affinitygroup");
49134869
return response;

‎server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,6 @@ public DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A
207207
// populate owner.
208208
ApiResponseHelper.populateOwner(routerResponse, router);
209209

210-
routerResponse.setDomainId(router.getDomainUuid());
211-
routerResponse.setDomainName(router.getDomainName());
212-
routerResponse.setDomainPath(router.getDomainPath());
213-
214210
routerResponse.setZoneName(router.getDataCenterName());
215211
routerResponse.setDns1(router.getDns1());
216212
routerResponse.setDns2(router.getDns2());

‎server/src/main/java/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import org.apache.cloudstack.api.response.ProjectAccountResponse;
2525

26+
import com.cloud.api.ApiResponseHelper;
2627
import com.cloud.api.query.vo.ProjectAccountJoinVO;
2728
import com.cloud.projects.ProjectAccount;
2829
import com.cloud.utils.db.GenericDaoBase;
@@ -59,7 +60,7 @@ public ProjectAccountResponse newProjectAccountResponse(ProjectAccountJoinVO pro
5960
projectAccountResponse.setRole(proj.getAccountRole().toString());
6061
projectAccountResponse.setDomainId(proj.getDomainUuid());
6162
projectAccountResponse.setDomainName(proj.getDomainName());
62-
projectAccountResponse.setDomainPath(proj.getDomainPath());
63+
projectAccountResponse.setDomainPath(ApiResponseHelper.getPrettyDomainPath(proj.getDomainPath()));
6364

6465
projectAccountResponse.setObjectName("projectaccount");
6566

‎server/src/main/java/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import org.apache.cloudstack.api.response.ProjectInvitationResponse;
2525

26+
import com.cloud.api.ApiResponseHelper;
2627
import com.cloud.api.query.vo.ProjectInvitationJoinVO;
2728
import com.cloud.projects.ProjectInvitation;
2829
import com.cloud.utils.db.GenericDaoBase;
@@ -65,7 +66,7 @@ public ProjectInvitationResponse newProjectInvitationResponse(ProjectInvitationJ
6566

6667
response.setDomainId(invite.getDomainUuid());
6768
response.setDomainName(invite.getDomainName());
68-
response.setDomainPath(invite.getDomainPath());
69+
response.setDomainPath(ApiResponseHelper.getPrettyDomainPath(invite.getDomainPath()));
6970

7071
response.setObjectName("projectinvitation");
7172
return response;

‎server/src/main/java/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ public ResourceTagResponse newResourceTagResponse(ResourceTagJoinVO resourceTag,
7878

7979
ApiResponseHelper.populateOwner(response, resourceTag);
8080

81-
response.setDomainId(resourceTag.getDomainUuid());
82-
response.setDomainName(resourceTag.getDomainName());
83-
response.setDomainPath(resourceTag.getDomainPath());
84-
8581
response.setCustomer(resourceTag.getCustomer());
8682
}
8783

‎server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,6 @@ public TemplateResponse newTemplateResponse(EnumSet<ApiConstants.DomainDetails>
266266
// populate owner.
267267
ApiResponseHelper.populateOwner(templateResponse, template);
268268

269-
// populate domain
270-
templateResponse.setDomainId(template.getDomainUuid());
271-
templateResponse.setDomainName(template.getDomainName());
272-
templateResponse.setDomainPath(template.getDomainPath());
273-
274269
// If the user is an 'Admin' or 'the owner of template' or template belongs to a project, add the template download status
275270
if (view == ResponseView.Full ||
276271
template.getAccountId() == CallContext.current().getCallingAccount().getId() ||
@@ -415,11 +410,6 @@ public TemplateResponse newUpdateResponse(TemplateJoinVO result) {
415410
// populate owner.
416411
ApiResponseHelper.populateOwner(response, result);
417412

418-
// populate domain
419-
response.setDomainId(result.getDomainUuid());
420-
response.setDomainName(result.getDomainName());
421-
response.setDomainPath(result.getDomainPath());
422-
423413
// set details map
424414
if (result.getDetailName() != null) {
425415
Map<String, String> details = new HashMap<>();
@@ -504,11 +494,6 @@ public TemplateResponse newIsoResponse(TemplateJoinVO iso, ResponseView view) {
504494
// populate owner.
505495
ApiResponseHelper.populateOwner(isoResponse, iso);
506496

507-
// populate domain
508-
isoResponse.setDomainId(iso.getDomainUuid());
509-
isoResponse.setDomainName(iso.getDomainName());
510-
isoResponse.setDomainPath(iso.getDomainPath());
511-
512497
Account caller = CallContext.current().getCallingAccount();
513498
boolean isAdmin = false;
514499
if ((caller == null) || _accountService.isAdmin(caller.getId())) {

0 commit comments

Comments
 (0)