Fix ability to add property to data type of different model

Issue-ID: SDC-4339
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: Ibc5b57a042ffc4e7f914d46ad264a0e16081b863

1 files changed, 16 insertions, 0 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DataTypeOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DataTypeOperation.java
index d75302fc5d..36dcaf44ba 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DataTypeOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DataTypeOperation.java
@@ -189,6 +189,22 @@ public class DataTypeOperation extends AbstractOperation {
         return Optional.of(dataTypeEither.left().value().getDataTypeDataDefinition());
     }
 
+    public Optional<DataTypeDataDefinition> getDataTypeByNameAndModel(final String name, String model) {
+        final Either<DataTypeData, JanusGraphOperationStatus> dataTypeEither = janusGraphGenericDao
+            .getNode("name", name, DataTypeData.class, model);
+        if (dataTypeEither.isRight()) {
+            if (JanusGraphOperationStatus.NOT_FOUND.equals(dataTypeEither.right().value())) {
+                return Optional.empty();
+            }
+            final StorageOperationStatus storageOperationStatus
+                = DaoStatusConverter.convertJanusGraphStatusToStorageStatus(dataTypeEither.right().value());
+            LOGGER.warn("Failed to fetch data type '{}' from JanusGraph. Status is: {}", name, storageOperationStatus);
+            throw new OperationException(ActionStatus.GENERAL_ERROR,
+                String.format("Failed to fetch data type '%s' from JanusGraph. Status is: %s", name, storageOperationStatus));
+        }
+        return Optional.of(dataTypeEither.left().value().getDataTypeDataDefinition());
+    }
+
     public List<PropertyDefinition> findAllProperties(final String uniqueId) {
         final Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> propertiesEither =
             propertyOperation.findPropertiesOfNode(NodeTypeEnum.DataType, uniqueId);