Implement 'Update Service by importing Tosca Template'-story

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / validation / component / ComponentNameValidator.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentNameValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentNameValidator.java
index 3ca768b..4b20c3d 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentNameValidator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/component/ComponentNameValidator.java
@@ -65,7 +65,9 @@ public class ComponentNameValidator implements ComponentFieldValidator {
             log.debug("Component name {} has invalid format", componentName);
             auditErrorAndThrow(user, component, actionEnum, ActionStatus.INVALID_COMPONENT_NAME);
         }
-        if (component.getComponentType().equals(ComponentTypeEnum.SERVICE)) {
+        if (component.getComponentType().equals(ComponentTypeEnum.SERVICE) &&
+            !AuditingActionEnum.UPDATE_SERVICE_TOSCA_TEMPLATE.equals(actionEnum) &&
+            !AuditingActionEnum.UPDATE_SERVICE_TOSCA_MODEL.equals(actionEnum)) {
             validateComponentNameUnique(user, component, actionEnum);
         }
         //TODO remove assignment here