diff options
| author |   xuegao <xg353y@intl.att.com> | 2020-09-04 15:29:15 +0200 |
|---|---|---|
| committer |   Sébastien Determe <sebastien.determe@intl.att.com> | 2020-09-07 13:27:32 +0000 |
| commit | 84a51513bca9c41c8757db017eb45b2d801da195 (patch) | |
| tree | d8919801c30d8831e2e4ba55102f35fc95d05ea4 /catalog-be/src/main/java/org/openecomp | |
| parent | 44c6c0d23504e8d1353cd449541f95bc2033cddb (diff) | |
Use meaningful workflow name
When generate csar, use meaningful workflow name instead of null.
Issue-ID: SDC-3230
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: I250e2f928aa33b2da86a7c458c098713c43a5074
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp')
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java | 9 |
1 files changed, 5 insertions, 4 deletions
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; } |