diff options
3 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java index e3dbbd7..34aed18 100644 --- a/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java +++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java @@ -77,7 +77,6 @@ public class ToscaInfosProcessor { LinkedHashMap toscaInfosFromResourceId = getToscaInfosFromResourceUUID(nodeTemplate, id); if (toscaInfosFromResourceId != null) { resourceSpecification.put("modelCustomizationId", toscaInfosFromResourceId.get("customizationUUID")); - resourceSpecification.put("modelCustomizationName", toscaInfosFromResourceId.get("name")); } } diff --git a/src/main/resources/jolt/getServiceCatalog.json b/src/main/resources/jolt/getServiceCatalog.json index cac223e..f0b3787 100644 --- a/src/main/resources/jolt/getServiceCatalog.json +++ b/src/main/resources/jolt/getServiceCatalog.json @@ -8,6 +8,7 @@ "invariantUUID": "invariantUUID", "toscaModelURL": "toscaModelURL", "toscaResourceName": "toscaResourceName", + "resourceInstanceName" : "modelCustomizationName", "category ": "category", "subcategory": "subcategory", "distributionStatus": "distributionStatus", diff --git a/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java b/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java index 648241d..f67dda5 100644 --- a/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java +++ b/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java @@ -37,6 +37,7 @@ public class ServiceCatalogAssertions { .isEqualTo("/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439/toscaModel"); assertThat(service.get("distributionStatus")).isEqualTo("DISTRIBUTED"); assertThat(service.get("version")).isEqualTo("2.0"); + assertThat(service.get("modelCustomizationName")).isEqualTo("vFW-vSINK 0"); assertThat(service.get("lifecycleStatus")).isEqualTo("CERTIFIED"); assertThat(service.get("@type")).isEqualTo("ONAPservice"); assertThat(((ArrayList) service.get("attachment")).size()).isEqualTo(5); |