From 06b72689ad69107c35692f4b49577868e751f559 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 29 Apr 2020 14:13:18 +0100 Subject: Fix VFs and Service not visible in SDC Dashboard Change-Id: Ia42775388c3ad9539b7d0020476f0f7a91ce8bb9 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-2938 --- .../sdc/be/components/lifecycle/LifecycleBusinessLogic.java | 2 +- .../sdc/be/tosca/utils/InterfacesOperationsConverterTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'catalog-be/src') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java index d29f23eef8..ebd3e21d9d 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java @@ -469,7 +469,7 @@ public class LifecycleBusinessLogic { throw new ByResponseFormatComponentException(componentUtils.getResponseFormatByResource(componentUtils.convertFromStorageResponse(status), resource)); } result = ModelConverter.convertFromToscaElement(certifyResourceRes.left().value()); - resource.setMetadataDefinition(result.getComponentMetadataDefinition()); + resource.setComponentMetadataDefinition(result.getComponentMetadataDefinition()); } finally { log.info("unlock component {}", resource.getUniqueId()); if (!inTransaction) { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/InterfacesOperationsConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/InterfacesOperationsConverterTest.java index 13bc009d32..f54b85f492 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/InterfacesOperationsConverterTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/InterfacesOperationsConverterTest.java @@ -92,7 +92,7 @@ public class InterfacesOperationsConverterTest { public void addInterfaceTypeElementToResource() { Component component = new Resource(); component.setNormalizedName("normalizedComponentName"); - component.setMetadataDefinition(new ServiceMetadataDefinition()); + component.setComponentMetadataDefinition(new ServiceMetadataDefinition()); component.getComponentMetadataDefinition().getMetadataDataDefinition().setName("NodeTypeName"); component.getComponentMetadataDefinition().getMetadataDataDefinition().setSystemName("NodeTypeName"); InterfaceDefinition addedInterface = new InterfaceDefinition(); @@ -118,7 +118,7 @@ public class InterfacesOperationsConverterTest { public void addInterfaceTypeElementToService() { Component component = new Service(); component.setNormalizedName("normalizedServiceComponentName"); - component.setMetadataDefinition(new ServiceMetadataDefinition()); + component.setComponentMetadataDefinition(new ServiceMetadataDefinition()); component.getComponentMetadataDefinition().getMetadataDataDefinition().setName("NodeTypeName"); component.getComponentMetadataDefinition().getMetadataDataDefinition().setSystemName("NodeTypeName"); InterfaceDefinition addedInterface = new InterfaceDefinition(); @@ -523,7 +523,7 @@ public class InterfacesOperationsConverterTest { @Test public void testAddInterfaceTypeElementGetCorrectLocalInterfaceName() { Service service = new Service(); - service.setMetadataDefinition(new ServiceMetadataDefinition()); + service.setComponentMetadataDefinition(new ServiceMetadataDefinition()); service.getComponentMetadataDefinition().getMetadataDataDefinition().setName("LocalInterface"); service.getComponentMetadataDefinition().getMetadataDataDefinition().setSystemName("LocalInterface"); service.setInterfaces(Collections.singletonMap("Local", new InterfaceDefinition("Local", null, new HashMap<>()))); @@ -538,7 +538,7 @@ public class InterfacesOperationsConverterTest { @Test public void testAddInterfaceTypeElementNoTypeChangeIfNotLocal() { Service service = new Service(); - service.setMetadataDefinition(new ServiceMetadataDefinition()); + service.setComponentMetadataDefinition(new ServiceMetadataDefinition()); service.getComponentMetadataDefinition().getMetadataDataDefinition().setName("LocalInterface"); service.setInterfaces(Collections.singletonMap("NotLocal", new InterfaceDefinition("NotLocal", null, new HashMap<>()))); -- cgit 1.2.3-korg