diff options
| author |   MichaelMorris <michael.morris@est.tech> | 2022-07-18 11:56:57 +0100 |
|---|---|---|
| committer |   Andr� Schmid <andre.schmid@est.tech> | 2022-08-04 10:00:38 +0000 |
| commit | ee72d50618075c7dc2a32e6130836affd515923d (patch) | |
| tree | d12c4775390171338f76a647886de4191370f493 /catalog-be/src | |
| parent | 9f60c2a7edc1b04fc1a376e6695d5a0b55c077df (diff) | |
Fix error adding capability to VFC
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4098
Change-Id: Id3c71787b9c11bbf4316a9a23f01199a009f2b49
Diffstat (limited to 'catalog-be/src')
2 files changed, 3 insertions, 3 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java index c070d89fd4..5cbf3a37b0 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogic.java @@ -167,7 +167,7 @@ public class CapabilitiesBusinessLogic extends BaseBusinessLogic { } Map<String, MapPropertiesDataDefinition> propertiesMap = getCapabilitiesPropertiesDataDefinitionMap(capabilityDefinitions); if (MapUtils.isNotEmpty(propertiesMap)) { - StorageOperationStatus storageOperationStatus = capabilitiesOperation.createOrUpdateCapabilityProperties(componentId, propertiesMap); + StorageOperationStatus storageOperationStatus = capabilitiesOperation.createOrUpdateCapabilityProperties(componentId, storedComponent.isTopologyTemplate(), propertiesMap); if (storageOperationStatus != StorageOperationStatus.OK) { janusGraphDao.rollback(); return Either.right(componentsUtils.getResponseFormat(storageOperationStatus)); @@ -251,7 +251,7 @@ public class CapabilitiesBusinessLogic extends BaseBusinessLogic { } Map<String, MapPropertiesDataDefinition> propertiesMap = getCapabilitiesPropertiesDataDefinitionMap(capabilityDefinitions); if (MapUtils.isNotEmpty(propertiesMap)) { - StorageOperationStatus storageOperationStatus = capabilitiesOperation.createOrUpdateCapabilityProperties(componentId, propertiesMap); + StorageOperationStatus storageOperationStatus = capabilitiesOperation.createOrUpdateCapabilityProperties(componentId, storedComponent.isTopologyTemplate(), propertiesMap); if (storageOperationStatus != StorageOperationStatus.OK) { janusGraphDao.rollback(); return Either.right(componentsUtils.getResponseFormat(storageOperationStatus)); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java index e70f3a7144..4cb32658d0 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CapabilitiesBusinessLogicTest.java @@ -389,7 +389,7 @@ public class CapabilitiesBusinessLogicTest extends BaseBusinessLogicMock { validateUserRoles(Role.ADMIN, Role.DESIGNER); when(toscaOperationFacade.getToscaElement(anyString(), any(ComponentParametersView.class))) .thenReturn(Either.left(resource)); - when(capabilitiesOperation.createOrUpdateCapabilityProperties(anyString(), any())).thenReturn(StorageOperationStatus.OK); + when(capabilitiesOperation.createOrUpdateCapabilityProperties(anyString(), anyBoolean(), any())).thenReturn(StorageOperationStatus.OK); Either<List<CapabilityDefinition>, ResponseFormat> capabilities = capabilitiesBusinessLogicMock .createCapabilities(componentId, capabilityDefinitions, user, "createCapabilities", true); |