From a9d0bcd206b7a677b82e5e9b497a8b52b38e3a43 Mon Sep 17 00:00:00 2001 From: imamSidero Date: Thu, 21 Jul 2022 17:17:38 +0100 Subject: Enabled configuration of instance name The given name for the instance dragged and dropped is changed to _ Signed-off-by: Imam hussain Issue-ID: SDC-4109 Change-Id: Ibce6f911480841df496f0e7bb17a6d7cd533e803 --- .../sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 2 ++ .../be/model/jsonjanusgraph/operations/NodeTemplateOperation.java | 6 +++++- .../be/model/jsonjanusgraph/operations/ToscaOperationFacade.java | 6 +++--- .../src/main/java/org/openecomp/sdc/be/config/Configuration.java | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index b0cb7ddec5..d1f3bd2c60 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -1289,3 +1289,5 @@ externalCsarStore: secretKey: "password" tempPath: "/home/onap/temp/" uploadPartSize: 200000000 +#This configuration specifies the delimiter used to differentiate instance name and count +componentInstanceCounterDelimiter: " " diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperation.java index 0e7b9f0193..910b9e3afa 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperation.java @@ -1559,7 +1559,11 @@ public class NodeTemplateOperation extends BaseOperation { } private String buildComponentInstanceName(String instanceSuffixNumber, String instanceName) { - return instanceName + " " + (instanceSuffixNumber == null ? 0 : instanceSuffixNumber); + String delimiter = ConfigurationManager.getConfigurationManager().getConfiguration().getComponentInstanceCounterDelimiter(); + if(delimiter == null){ + delimiter = " "; + } + return instanceName + delimiter + (instanceSuffixNumber == null ? 0 : instanceSuffixNumber); } public Either associateResourceInstances(Component component, String componentId, 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 7c34da89f0..02fda3c51b 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 @@ -1323,10 +1323,10 @@ public class ToscaOperationFacade { private Integer getMaxCounterFromNamesAndIds(Component containerComponent, String normalizedName) { List countersInNames = containerComponent.getComponentInstances().stream() .filter(ci -> ci.getNormalizedName() != null && ci.getNormalizedName().startsWith(normalizedName)) - .map(ci -> ci.getNormalizedName().split(normalizedName)[1]).collect(Collectors.toList()); + .map(ci -> ci.getNormalizedName().split(normalizedName)[1].replaceAll("\\D", "")).collect(Collectors.toList()); List countersInIds = containerComponent.getComponentInstances().stream() - .filter(ci -> ci.getUniqueId() != null && ci.getUniqueId().contains(normalizedName)).map(ci -> ci.getUniqueId().split(normalizedName)[1]) - .collect(Collectors.toList()); + .filter(ci -> ci.getUniqueId() != null && ci.getUniqueId().contains(normalizedName)) + .map(ci -> ci.getUniqueId().split(normalizedName)[1].replaceAll("\\D", "")).collect(Collectors.toList()); List namesAndIdsList = new ArrayList<>(countersInNames); namesAndIdsList.addAll(countersInIds); return getMaxInteger(namesAndIdsList); diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java index 69e863b4fd..5a1eacdb58 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java @@ -146,6 +146,7 @@ public class Configuration extends BasicConfiguration { private Map>> componentAllowedInstanceTypes; private ExternalCsarStore externalCsarStore; private CsarFormat csarFormat; + private String componentInstanceCounterDelimiter; @SuppressWarnings("unchecked") private Map safeGetCapsInsensitiveMap(Map map) { -- cgit 1.2.3-korg