diff options
| author |   Satoshi Fujii <fujii-satoshi@jp.fujitsu.com> | 2019-12-04 16:15:41 +0900 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-12-05 10:03:59 +0000 |
| commit | 15fabcb9618c6acd6fa604e17777df4d494eca1b (patch) | |
| tree | 3678f1bb3ccd6a519acd50ec1a2416c748b243fd /catalog-model/src/main/java | |
| parent | ee4c4d72ed2118ea44dd5d83e1cf1677b6ebb03c (diff) | |
Fix impossible to drag and drop same service twice into the composition
When a service proxy instance including underscore in its name is added into
the composition, instance ID suffix is not properly calculated and that results
in duplicate key error due to ID conflict.
This change normalizes the name to find existing proxy instances to get suffix
number calculated properly.
Change-Id: I6f2ceb4b9cf020e1523264a99e1347b6caa98965
Issue-ID: SDC-2043
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Diffstat (limited to 'catalog-model/src/main/java')
| -rw-r--r-- | catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java index d5e0675203..0d39bb264f 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaOperationFacade.java @@ -778,7 +778,7 @@ public class ToscaOperationFacade { if (StringUtils.isEmpty(componentInstance.getIcon())) { componentInstance.setIcon(origComponent.getIcon()); } - String nameToFindForCounter = componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy ? componentInstance.getSourceModelName() + PROXY_SUFFIX : origComponent.getName(); + String nameToFindForCounter = componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy ? ValidationUtils.normaliseComponentName(componentInstance.getSourceModelName()) + PROXY_SUFFIX : origComponent.getName(); String nextComponentInstanceCounter = getNextComponentInstanceCounter(containerComponent, nameToFindForCounter); Either<ImmutablePair<TopologyTemplate, String>, StorageOperationStatus> addResult = nodeTemplateOperation.addComponentInstanceToTopologyTemplate(ModelConverter.convertToToscaElement(containerComponent), ModelConverter.convertToToscaElement(origComponent), nextComponentInstanceCounter, componentInstance, allowDeleted, user); |