diff options
Diffstat (limited to 'dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl')
7 files changed, 260 insertions, 51 deletions
diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java index bfec7ed..6779257 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java @@ -11,6 +11,7 @@ import org.onap.sdc.dcae.composition.restmodels.CreateMcResponse; import org.onap.sdc.dcae.composition.restmodels.VfcmtData; import org.onap.sdc.dcae.composition.restmodels.sdc.*; import org.onap.sdc.dcae.composition.util.DcaeBeConstants; +import org.onap.sdc.dcae.composition.util.SystemProperties; import org.onap.sdc.dcae.enums.AssetType; import org.onap.sdc.dcae.enums.LifecycleOperationType; import org.onap.sdc.dcae.errormng.ActionStatus; @@ -21,7 +22,6 @@ import org.onap.sdc.dcae.utils.Normalizers; import org.onap.sdc.dcae.utils.SdcRestClientUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.util.Base64Utils; @@ -29,6 +29,10 @@ import java.io.IOException; @Component public class BaseBusinessLogic { + + @Autowired + protected SystemProperties systemProperties; + @Autowired protected ISdcClient sdcRestClient; @@ -39,6 +43,10 @@ public class BaseBusinessLogic { return sdcRestClient; } + public SystemProperties getSystemProperties() { + return systemProperties; + } + void setSdcRestClient(ISdcClient sdcRestClient) { this.sdcRestClient = sdcRestClient; } @@ -85,7 +93,7 @@ public class BaseBusinessLogic { return new CreateMcResponse(vfcmt, new ObjectMapper().readValue(cdumpPayload, Object.class)); } - public Artifact fetchCdump(ResourceDetailed vfcmt, String requestId) { + Artifact fetchCdump(ResourceDetailed vfcmt, String requestId) { Artifact cdumpArtifactData = findCdumpArtifactData(vfcmt); if (null != cdumpArtifactData) { String cdumpPayload = sdcRestClient.getResourceArtifact(vfcmt.getUuid(), cdumpArtifactData.getArtifactUUID(), requestId); @@ -110,22 +118,19 @@ public class BaseBusinessLogic { .filter(p -> Normalizers.normalizeComponentInstanceName(vfiName).equals(Normalizers.normalizeComponentInstanceName(p.getResourceInstanceName()))).findAny().orElse(null); } - public String extractFlowTypeFromCdump(String cdump) { + String extractFlowTypeFromCdump(String cdump) { return StringUtils.substringBetween(cdump,"\"flowType\":\"","\""); } - // TODO - reuse - - ResourceDetailed checkinVfcmt(String userId, String uuid, String requestId) { + public ResourceDetailed checkinVfcmt(String userId, String uuid, String requestId) { return getSdcRestClient().changeResourceLifecycleState(userId, uuid, LifecycleOperationType.CHECKIN.name(), "checking in vfcmt" + uuid, requestId); } - ResourceDetailed checkoutVfcmt(String userId, String uuid, String requestId) { + public ResourceDetailed checkoutVfcmt(String userId, String uuid, String requestId) { return getSdcRestClient().changeResourceLifecycleState(userId, uuid, LifecycleOperationType.CHECKOUT.name(), null, requestId); } - // TODO - remove from BaseController - void checkUserIfResourceCheckedOut(String userId, Asset asset) { + public void checkUserIfResourceCheckedOut(String userId, Asset asset) { if (DcaeBeConstants.LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT == DcaeBeConstants.LifecycleStateEnum.findState(asset.getLifecycleState())) { String lastUpdaterUserId = asset.getLastUpdaterUserId(); if (lastUpdaterUserId != null && !lastUpdaterUserId.equals(userId)) { @@ -136,18 +141,18 @@ public class BaseBusinessLogic { } } - boolean isNeedToCheckOut(String lifecycleState) { + public boolean isNeedToCheckOut(String lifecycleState) { return DcaeBeConstants.LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT != DcaeBeConstants.LifecycleStateEnum.findState(lifecycleState); } - void checkVfcmtType(ResourceDetailed vfcmt) { + public void checkVfcmtType(ResourceDetailed vfcmt) { if (AssetType.VFCMT != getValidAssetTypeOrNull(vfcmt.getResourceType()) || !"Template".equals(vfcmt.getCategory())) { ResponseFormat responseFormat = ErrConfMgr.INSTANCE.getResponseFormat(ActionStatus.RESOURCE_NOT_VFCMT_ERROR, null, vfcmt.getUuid()); throw new DcaeException(HttpStatus.BAD_REQUEST, responseFormat.getRequestError()); } } - AssetType getValidAssetTypeOrNull(String type) { + public AssetType getValidAssetTypeOrNull(String type) { try { return AssetType.getAssetTypeByName(type); } catch (IllegalArgumentException e) { @@ -156,9 +161,4 @@ public class BaseBusinessLogic { } } - ResponseEntity handleException(Exception e, ErrConfMgr.ApiType apiType, String... variables){ - errLogger.log(LogLevel.ERROR, this.getClass().getName(), e.getMessage()); - return ErrConfMgr.INSTANCE.handleException(e, apiType, variables); - } - } diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java index 0ccb6d8..7a6f9a7 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java @@ -10,7 +10,6 @@ import org.onap.sdc.dcae.composition.restmodels.VfcmtData; import org.onap.sdc.dcae.composition.restmodels.sdc.Artifact; import org.onap.sdc.dcae.composition.restmodels.sdc.ResourceDetailed; import org.onap.sdc.dcae.composition.util.DcaeBeConstants; -import org.onap.sdc.dcae.composition.util.SystemProperties; import org.onap.sdc.dcae.errormng.ActionStatus; import org.onap.sdc.dcae.errormng.ErrConfMgr; import org.springframework.beans.factory.annotation.Autowired; @@ -23,15 +22,12 @@ import java.io.StringReader; import java.net.URI; @Component -public class BlueprintBusinessLogic extends BaseBusinessLogic { +public class BlueprintBusinessLogic extends CompositionBusinessLogic { @Autowired private Blueprinter blueprinter; @Autowired private ASDC asdc; - @Autowired - private SystemProperties systemProperties; - @Autowired private CompositionBusinessLogic compositionBusinessLogic; @PostConstruct @@ -41,6 +37,7 @@ public class BlueprintBusinessLogic extends BaseBusinessLogic { debugLogger.log(LogLevel.DEBUG, this.getClass().getName(), "SDC uri: {}", sdcUri); } + public ResponseEntity generateAndSaveBlueprint(String userId, String context, String vfcmtUuid, String serviceUuid, String vfiName, String flowType, String requestId) { try { // prepare - fetch vfcmt and cdump @@ -69,7 +66,7 @@ public class BlueprintBusinessLogic extends BaseBusinessLogic { } VfcmtData vfcmtData = new VfcmtData(vfcmt, vfiName, flowTypeFromCdump, serviceUuid); - Artifact blueprintArtifactResult = compositionBusinessLogic.submitComposition(userId, context, vfcmtData, resultBlueprintCreation, requestId); + Artifact blueprintArtifactResult = submitComposition(userId, context, vfcmtData, resultBlueprintCreation, requestId); if (null == blueprintArtifactResult) { return ErrConfMgr.INSTANCE.buildErrorResponse(ActionStatus.SUBMIT_BLUEPRINT_ERROR); } @@ -78,7 +75,8 @@ public class BlueprintBusinessLogic extends BaseBusinessLogic { response.setSuccessResponse("Blueprint build complete \n. Blueprint=" + blueprintArtifactResult.getArtifactName()); return new ResponseEntity<>(response, HttpStatus.OK); } catch (Exception e) { - return handleException(e, ErrConfMgr.ApiType.SUBMIT_BLUEPRINT); + errLogger.log(LogLevel.ERROR, this.getClass().getName(), e.getMessage()); + return ErrConfMgr.INSTANCE.handleException(e, ErrConfMgr.ApiType.SUBMIT_BLUEPRINT); } } diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java index e81ffe0..a3c68f6 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java @@ -31,6 +31,13 @@ public class CompositionBusinessLogic extends BaseBusinessLogic { private static final String CREATE_DESC = "creating new artifact blueprint on the service vfi"; private static final String UPDATE_DESC = "updating artifact blueprint on the service vfi"; + //canvas cdump as simple string + public Artifact getComposition(String vfcmtUuid, String requestId) { + ResourceDetailed vfcmt = sdcRestClient.getResource(vfcmtUuid, requestId); + return fetchCdump(vfcmt, requestId); + } + + //cdump and vfcmt for monitoring configuration public CreateMcResponse getDataAndComposition(String vfcmtUuid, String requestId) throws IOException { ResourceDetailed vfcmt = sdcRestClient.getResource(vfcmtUuid, requestId); Artifact composition = fetchCdump(vfcmt, requestId); @@ -73,7 +80,7 @@ public class CompositionBusinessLogic extends BaseBusinessLogic { } } - public Artifact submitComposition(String userId, String context, VfcmtData vfcmtData, String resultBlueprintCreation, String requestId) throws JsonProcessingException { + Artifact submitComposition(String userId, String context, VfcmtData vfcmtData, String resultBlueprintCreation, String requestId) throws JsonProcessingException { // get service / find vfi ServiceDetailed service = sdcRestClient.getAssetMetadata(context, vfcmtData.getServiceUuid(), requestId); diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java new file mode 100644 index 0000000..ff596b5 --- /dev/null +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java @@ -0,0 +1,205 @@ +package org.onap.sdc.dcae.composition.impl; + +import org.json.JSONArray; +import org.json.JSONException; +import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.OnapLoggerError; +import org.onap.sdc.dcae.catalog.Catalog; +import org.onap.sdc.dcae.catalog.engine.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.async.DeferredResult; + +@Component +public class CompositionCatalogBusinessLogic { + + @Autowired + private CatalogController catalogController; + + protected OnapLoggerError errLogger = OnapLoggerError.getInstance(); + + public DeferredResult<CatalogResponse> getItems(ItemsRequest theRequest) { + + final ItemsRequest request = (theRequest == null) ? ItemsRequest.EMPTY_REQUEST : theRequest; + + Catalog catalog = catalogController.getCatalog(request.getCatalog()); + DeferredResult<CatalogResponse> result = new DeferredResult<>(request.getTimeout()); + + catalog.rootsByLabel(request.getStartingLabel()).setHandler(catalogController.new CatalogHandler<Catalog.Folders>(request, result) { + public CatalogResponse handleData(Catalog.Folders theFolders) { + JSONArray ja = new JSONArray(); + if (theFolders != null) { + for (Catalog.Folder folder : theFolders) { + ja.put(catalogController.patchData(catalog, folder.data())); + } + } + CatalogResponse response = new CatalogResponse(this.request); + try { + response.data().put("elements", ja); + } catch (JSONException e) { + errLogger.log(LogLevel.ERROR, this.getClass().getName(), "JSONException putting json elements to response {}", e); + } + return response; + } + }); + return result; + } + + public DeferredResult<CatalogResponse> getItemById(ItemsRequest theRequest, String theItemId) { + + final ItemsRequest request = (theRequest == null) ? ItemsRequest.EMPTY_REQUEST : theRequest; + + Catalog catalog = catalogController.getCatalog(request.getCatalog()); + DeferredResult<CatalogResponse> result = new DeferredResult<>(request.getTimeout()); + + catalog.folder(theItemId).withParts().withPartAnnotations().withItems().withItemAnnotations().withItemModels().execute().setHandler(new FolderHandler(catalog, request, result)); + return result; + } + + public DeferredResult getModelById(ElementRequest theRequest, String theItemId) { + final ElementRequest request = (theRequest == null) ? ElementRequest.EMPTY_REQUEST : theRequest; + + Catalog catalog = catalogController.getCatalog(request.getCatalog()); + DeferredResult<CatalogResponse> result = new DeferredResult<>(request.getTimeout()); + +// try { + catalog.item(theItemId).withModels().execute().setHandler(new ItemHandler(catalog, request, result)); +// } catch (IllegalArgumentException e) { +// errLogger.log(LogLevel.ERROR, this.getClass().getName(), "Error fetching catalog model with id {}. Message: {}", theItemId, e); +// result.setErrorResult(new CatalogError(request, "Catalog API failed", e)); +// } + return result; + } + + public DeferredResult<CatalogResponse> getTypeInfo(ElementRequest theRequest, String theItemId, String theTypeName) { + final ElementRequest request = (theRequest == null) ? ElementRequest.EMPTY_REQUEST : theRequest; + + Catalog catalog = catalogController.getCatalog(request.getCatalog()); + DeferredResult<CatalogResponse> result = new DeferredResult<>(request.getTimeout()); + + catalog.type(theItemId, theTypeName).withHierarchy().withCapabilities().withRequirements().execute().setHandler(catalogController.new CatalogHandler<Catalog.Type>(request, result) { + public CatalogResponse handleData(Catalog.Type theType) { + CatalogResponse response = new CatalogResponse(this.request); + if (theType != null) { + try { + response.data().put("type", catalogController.patchData(catalog, theType.data())); + } catch (JSONException e) { + errLogger.log(LogLevel.ERROR, this.getClass().getName(), "Exception processing catalog {}", e); + } + } + return response; + } + }); + return result; + } + + /// Nested Catalog Data Handlers /// + + private class FolderHandler extends CatalogController.CatalogHandler<Catalog.Folder> { + + private Catalog catalog; + + private FolderHandler(Catalog catalog, ItemsRequest request, DeferredResult result) { + catalogController.super(request, result); + this.catalog = catalog; + } + + private void patchCatalogData(Catalog.Elements folders, Catalog catalog) { + if (folders != null) { + folders.forEach(folder -> { + catalogController.patchData(catalog, ((Catalog.Element) folder).data()); + // lots of ephemere proxies created here .. + Catalog.Elements annotations = ((Catalog.Element) folder).elements("annotations", Catalog.Annotations.class); + if (annotations != null) { + annotations.forEach(a -> catalogController.patchData(catalog, ((Catalog.Annotation) a).data())); + } + }); + } + } + + public CatalogResponse handleData(Catalog.Folder theFolder) { + CatalogResponse response = new CatalogResponse(this.request); + if (theFolder == null) { + return response; + } + try { + Catalog.Elements folders = theFolder.elements("parts", Catalog.Folders.class); + patchCatalogData(folders, catalog); + Catalog.Elements items = theFolder.elements("items", Catalog.Items.class); + patchCatalogData(items, catalog); + } catch (Exception x) { + errLogger.log(LogLevel.ERROR, this.getClass().getName(), "Exception processing catalog {}", x); + return new CatalogError(this.request, "", x); + } + try { + response.data().put("element", theFolder.data()); + } catch (JSONException e) { + errLogger.log(LogLevel.ERROR, this.getClass().getName(), "JSONException putting element to response {}", e); + } + return response; + } + } + + private class ItemHandler extends CatalogController.CatalogHandler<Catalog.Item> { + + private Catalog catalog; + + private ItemHandler(Catalog catalog, ElementRequest request, DeferredResult result) { + catalogController.super(request, result); + this.catalog = catalog; + } + + public CatalogResponse handleData(Catalog.Item theItem) { + if (theItem == null) { + return new CatalogError(this.request, "No such item"); + } + Catalog.Templates models; + try { + models = (Catalog.Templates) theItem.elements("models", Catalog.Templates.class); + } catch (Exception x) { + return new CatalogError(this.request, "Failed to decode templates from result", x); + } + if (models == null || models.isEmpty()) { + return new CatalogError(this.request, "Item has no models"); + } + if (models.size() > 1) { + return new CatalogError(this.request, "Item has more than one model !?"); + } + try { + catalog.template(models.get(0).id()).withInputs().withOutputs().withNodes().withNodeProperties().withNodePropertiesAssignments().withNodeRequirements().withNodeCapabilities().withNodeCapabilityProperties() + .withNodeCapabilityPropertyAssignments().withPolicies().withPolicyProperties().withPolicyPropertiesAssignments().execute().setHandler(new TemplateHandler(this.catalog, this.request, this.result)); + } catch (Exception e) { + errLogger.log(LogLevel.ERROR, this.getClass().getName(), "Exception caught during Catalog Item Handler: {}", e); + } + return null; + } + } + + private class TemplateHandler extends CatalogController.CatalogHandler<Catalog.Template> { + + private Catalog catalog; + + private TemplateHandler(Catalog catalog, CatalogRequest request, DeferredResult result) { + catalogController.super(request, result); + this.catalog = catalog; + } + + public CatalogResponse handleData(Catalog.Template theTemplate) { + CatalogResponse response = new CatalogResponse(this.request); + if (theTemplate != null) { + try { + response.data().put("model", catalogController.patchData(catalog, theTemplate.data())); + } catch (JSONException e) { + errLogger.log(LogLevel.ERROR, this.getClass().getName(), "JSONException putting model to response {}", e); + } + } + return response; + } + } +} + + + + + + diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java index 1396cc9..9c950b6 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java @@ -34,7 +34,7 @@ public class ReferenceBusinessLogic extends BaseBusinessLogic { .ifPresent(artifact -> sdcRestClient.deleteInstanceArtifact(userId, context, serviceUuid, normalizedVfiName, artifact.getArtifactUUID(), requestId)); } } catch (Exception e) { - debugLogger.log(LogLevel.DEBUG, this.getClass().getName(),"Failed to delete blueprint with serviceUuid {}, vfcmtUuid . message: {} ", serviceUuid, vfcmtUuid, e); + debugLogger.log(LogLevel.DEBUG, this.getClass().getName(),"Failed to delete blueprint with serviceUuid {}, vfcmtUuid {}, message: {} ", serviceUuid, vfcmtUuid, e); return ErrConfMgr.INSTANCE.buildErrorResponse(ActionStatus.DELETE_BLUEPRINT_FAILED, e.getMessage()); } return new ResponseEntity<>(HttpStatus.OK); diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java index d17a6bf..298ffac 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java @@ -29,7 +29,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.util.Base64Utils; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; import java.util.*; import java.util.stream.Collectors; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java index d04c67a..8dbe2e9 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java @@ -1,29 +1,29 @@ package org.onap.sdc.dcae.composition.impl; - import org.onap.sdc.common.onaplog.Enums.LogLevel; - import org.onap.sdc.dcae.composition.restmodels.AttachVFCMTServiceRequest; - import org.onap.sdc.dcae.composition.restmodels.DcaeMinimizedService; - import org.onap.sdc.dcae.composition.restmodels.MessageResponse; - import org.onap.sdc.dcae.composition.restmodels.sdc.*; - import org.onap.sdc.dcae.composition.util.DcaeBeConstants; - import org.onap.sdc.dcae.enums.ArtifactType; - import org.onap.sdc.dcae.enums.LifecycleOperationType; - import org.onap.sdc.dcae.errormng.ActionStatus; - import org.onap.sdc.dcae.errormng.DcaeException; - import org.onap.sdc.dcae.errormng.ErrConfMgr; - import org.onap.sdc.dcae.errormng.ResponseFormat; - import org.onap.sdc.dcae.utils.SdcRestClientUtils; - import org.springframework.http.HttpStatus; - import org.springframework.http.ResponseEntity; - import org.springframework.stereotype.Component; - import org.springframework.util.Base64Utils; - import org.springframework.util.CollectionUtils; - - import java.util.ArrayList; - import java.util.Comparator; - import java.util.LinkedHashMap; - import java.util.List; - import java.util.stream.Collectors; +import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.dcae.composition.restmodels.AttachVFCMTServiceRequest; +import org.onap.sdc.dcae.composition.restmodels.DcaeMinimizedService; +import org.onap.sdc.dcae.composition.restmodels.MessageResponse; +import org.onap.sdc.dcae.composition.restmodels.sdc.*; +import org.onap.sdc.dcae.composition.util.DcaeBeConstants; +import org.onap.sdc.dcae.enums.ArtifactType; +import org.onap.sdc.dcae.enums.LifecycleOperationType; +import org.onap.sdc.dcae.errormng.ActionStatus; +import org.onap.sdc.dcae.errormng.DcaeException; +import org.onap.sdc.dcae.errormng.ErrConfMgr; +import org.onap.sdc.dcae.errormng.ResponseFormat; +import org.onap.sdc.dcae.utils.SdcRestClientUtils; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.util.Base64Utils; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.stream.Collectors; @Component public class ServiceBusinessLogic extends BaseBusinessLogic { |