From dd2e1700187449a017b75589aeb0c2dfb989dec7 Mon Sep 17 00:00:00 2001 From: KrupaNagabhushan Date: Thu, 15 Jul 2021 15:29:02 +0100 Subject: [PATCH] Consider component model when retrieving capability types Issue-ID: SDC-3642 Signed-off-by: KrupaNagabhushan Change-Id: Ie09b5f8d64b95fc2db14f19d3857a9935075b2fe --- .../sdc/be/components/impl/CapabilitiesBusinessLogic.java | 4 ++-- .../org/openecomp/sdc/be/servlets/TypesFetchServlet.java | 5 +++-- .../be/model/operations/api/ICapabilityTypeOperation.java | 2 +- .../be/model/operations/impl/CapabilityTypeOperation.java | 4 ++-- .../req-and-capabilities/req-and-capabilities.service.ts | 2 +- catalog-ui/src/app/ng2/services/tosca-types.service.ts | 12 +++++++++--- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java index be9b519e18..c070d89fd4 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java @@ -566,9 +566,9 @@ public class CapabilitiesBusinessLogic extends BaseBusinessLogic { .equals(capabilityDefinition.getUniqueId())); } - public Either, ResponseFormat> getAllCapabilityTypes() { + public Either, ResponseFormat> getAllCapabilityTypes(String modelName) { Either, JanusGraphOperationStatus> capabilityTypeCacheAll = capabilityTypeOperation - .getAllCapabilityTypes(); + .getAllCapabilityTypes(modelName); if (capabilityTypeCacheAll.isRight()) { JanusGraphOperationStatus operationStatus = capabilityTypeCacheAll.right().value(); if (JanusGraphOperationStatus.NOT_FOUND == operationStatus) { diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java index cafcbfd211..c3c42e27f5 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java @@ -184,7 +184,8 @@ public class TypesFetchServlet extends AbstractValidationsServlet { @ApiResponse(responseCode = "404", description = "Capability types not found")}) @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE) public Response getAllCapabilityTypesServlet(@Context final HttpServletRequest request, - @HeaderParam(value = Constants.USER_ID_HEADER) String userId) { + @HeaderParam(value = Constants.USER_ID_HEADER) String userId, + @Parameter(description = "model", required = false) @QueryParam("model") String modelName) { Wrapper responseWrapper = new Wrapper<>(); Wrapper userWrapper = new Wrapper<>(); try { @@ -193,7 +194,7 @@ public class TypesFetchServlet extends AbstractValidationsServlet { if (responseWrapper.isEmpty()) { String url = request.getMethod() + " " + request.getRequestURI(); log.debug("Start handle request of {} | modifier id is {}", url, userId); - Either, ResponseFormat> allDataTypes = capabilitiesBusinessLogic.getAllCapabilityTypes(); + Either, ResponseFormat> allDataTypes = capabilitiesBusinessLogic.getAllCapabilityTypes(modelName); if (allDataTypes.isRight()) { log.info("Failed to get all capability types. Reason - {}", allDataTypes.right().value()); Response errorResponse = buildErrorResponse(allDataTypes.right().value()); diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java index 88485d7c74..0e7faf7fc1 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/ICapabilityTypeOperation.java @@ -46,5 +46,5 @@ public interface ICapabilityTypeOperation { public Either getCapabilityType(String uniqueId, boolean inTransaction); - Either, JanusGraphOperationStatus> getAllCapabilityTypes(); + Either, JanusGraphOperationStatus> getAllCapabilityTypes(String modelName); } diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java index 0763559af5..f4073baa3d 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CapabilityTypeOperation.java @@ -409,11 +409,11 @@ public class CapabilityTypeOperation extends AbstractOperation implements ICapab return getCapabilityType(uniqueId, true); } - public Either, JanusGraphOperationStatus> getAllCapabilityTypes() { + public Either, JanusGraphOperationStatus> getAllCapabilityTypes(String modelName) { Map capabilityTypes = new HashMap<>(); Either, JanusGraphOperationStatus> result = Either.left(capabilityTypes); Either, JanusGraphOperationStatus> getAllCapabilityTypes = janusGraphGenericDao - .getByCriteria(NodeTypeEnum.CapabilityType, null, CapabilityTypeData.class); + .getByCriteriaForModel(NodeTypeEnum.CapabilityType, null, modelName, CapabilityTypeData.class); if (getAllCapabilityTypes.isRight()) { JanusGraphOperationStatus status = getAllCapabilityTypes.right().value(); if (status != JanusGraphOperationStatus.NOT_FOUND) { diff --git a/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts b/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts index f9b98c6b96..f999c2e627 100644 --- a/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts +++ b/catalog-ui/src/app/ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service.ts @@ -44,7 +44,7 @@ export class ReqAndCapabilitiesService { if (!this.capabilitiesListUpdated){ // -- COMMON for both -- this.capabilityTypesList = []; - let capabilityTypesResult = await this.toscaTypesServiceNg2.fetchCapabilityTypes(); + let capabilityTypesResult = await this.toscaTypesServiceNg2.fetchCapabilityTypes(this.workspaceService.metadata.model); Object.keys(capabilityTypesResult).forEach(key => {this.capabilityTypesList.push(capabilityTypesResult[key])}) this.capabilitiesListUpdated = true; } diff --git a/catalog-ui/src/app/ng2/services/tosca-types.service.ts b/catalog-ui/src/app/ng2/services/tosca-types.service.ts index 2fc2e7a089..fc728111bd 100644 --- a/catalog-ui/src/app/ng2/services/tosca-types.service.ts +++ b/catalog-ui/src/app/ng2/services/tosca-types.service.ts @@ -40,15 +40,21 @@ export class ToscaTypesServiceNg2 { } async fetchRelationshipTypes(modelName: string): Promise { - return this.http.get(this.baseUrl + 'relationshipTypes', {params: {model: modelName}}).toPromise(); + if(modelName) { + return this.http.get(this.baseUrl + 'relationshipTypes', {params: {model: modelName}}).toPromise(); + } + return this.http.get(this.baseUrl + 'relationshipTypes').toPromise(); } async fetchNodeTypes(): Promise { return this.http.get(this.baseUrl + 'nodeTypes').toPromise(); } - async fetchCapabilityTypes(): Promise { + async fetchCapabilityTypes(modelName: string): Promise { + if(modelName) { + return this.http.get(this.baseUrl + 'capabilityTypes', {params: {model: modelName}}).toPromise(); + } return this.http.get(this.baseUrl + 'capabilityTypes').toPromise(); - } + } } -- 2.16.6