From 84a51513bca9c41c8757db017eb45b2d801da195 Mon Sep 17 00:00:00 2001 From: xuegao Date: Fri, 4 Sep 2020 15:29:15 +0200 Subject: Use meaningful workflow name When generate csar, use meaningful workflow name instead of null. Issue-ID: SDC-3230 Signed-off-by: xuegao Change-Id: I250e2f928aa33b2da86a7c458c098713c43a5074 --- .../sdc/be/components/impl/InterfaceOperationBusinessLogic.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'catalog-be') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java index 7bbe24d8e8..3aabe82db5 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java @@ -526,26 +526,27 @@ public class InterfaceOperationBusinessLogic extends BaseBusinessLogic { private void addOperationToInterface(InterfaceDefinition interfaceDefinition, Operation interfaceOperation) { interfaceOperation.setUniqueId(UUID.randomUUID().toString()); - interfaceOperation.setImplementation(createArtifactDefinition(UUID.randomUUID().toString(), interfaceOperation.getName())); + interfaceOperation.setImplementation(createArtifactDefinition(UUID.randomUUID().toString(), interfaceOperation)); interfaceDefinition.getOperations() .put(interfaceOperation.getUniqueId(), new OperationDataDefinition(interfaceOperation)); } private void updateOperationOnInterface(InterfaceDefinition interfaceDefinition, Operation interfaceOperation, String artifactUuId) { - interfaceOperation.setImplementation(createArtifactDefinition(artifactUuId, interfaceOperation.getName())); + interfaceOperation.setImplementation(createArtifactDefinition(artifactUuId, interfaceOperation)); interfaceDefinition.getOperations() .put(interfaceOperation.getUniqueId(), new OperationDataDefinition(interfaceOperation)); } - private ArtifactDefinition createArtifactDefinition(String artifactUuId, String operationName) { + private ArtifactDefinition createArtifactDefinition(String artifactUuId, Operation operation) { ArtifactDefinition artifactDefinition = new ArtifactDefinition(); artifactDefinition.setArtifactUUID(artifactUuId); artifactDefinition.setUniqueId(artifactUuId); artifactDefinition.setEsId(artifactUuId); artifactDefinition.setArtifactType(ArtifactTypeEnum.WORKFLOW.getType()); artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.DEPLOYMENT); - artifactDefinition.setArtifactLabel(operationName + ".workflowArtifact"); + artifactDefinition.setArtifactLabel(operation.getName() + ".workflowArtifact"); + artifactDefinition.setArtifactName(operation.getWorkflowName() + "_" + operation.getWorkflowVersion()); return artifactDefinition; } -- cgit 1.2.3-korg