Support TOSCA functions in sub properties

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / impl / CategoriesImportManager.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
index 35502aa..39ff001 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
@@ -228,6 +228,7 @@ public class CategoriesImportManager {
             Map<String, Object> category = (Map<String, Object>) entry.getValue();
             catName = (String) category.get("name");
             catDef.setName(catName);
+            catDef.setDisplayName((String) category.get("displayName"));
             icons = (List<String>) category.get("icons");
             catDef.setIcons(icons);
             String normalizedName = ValidationUtils.normalizeCategoryName4Uniqueness(catName);
@@ -252,6 +253,7 @@ public class CategoriesImportManager {
             MetadataKeyDataDefinition metadataKeyDef = new MetadataKeyDataDefinition();
             String metadataKeyName = (String) metadataKeyInfo.get(MetadataKeyEnum.NAME.getName());
             metadataKeyDef.setName(metadataKeyName);
+            metadataKeyDef.setDisplayName((String) metadataKeyInfo.get(MetadataKeyEnum.DISPLAY_NAME.getName()));
             final Object mandatoryProperty = metadataKeyInfo.get(MetadataKeyEnum.MANDATORY.getName());
             final boolean mandatory = mandatoryProperty == null ? false : (Boolean) mandatoryProperty;
             metadataKeyDef.setMandatory(mandatory);