From 798f858d18403a31a4d464b07bb1a9a74666c9c7 Mon Sep 17 00:00:00 2001 From: aribeiro Date: Fri, 28 Aug 2020 11:50:52 +0100 Subject: Update node_filter capabilities Issue-ID: SDC-3265 Signed-off-by: aribeiro Change-Id: Ib2dbd299ff5fc336258bf29a303210eacfd984cf --- .../operations/NodeFilterOperation.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'catalog-model') diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperation.java index 1bad8b097f..050709d6d5 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperation.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperation.java @@ -143,16 +143,29 @@ public class NodeFilterOperation extends BaseOperation { } public Either updateProperties( - final String serviceId, final String componentInstanceId, + final String componentId, final String componentInstanceId, final CINodeFilterDataDefinition nodeFilterDataDefinition, final List requirementNodeFilterPropertyDataDefinition) { - ListDataDefinition properties = + final ListDataDefinition properties = nodeFilterDataDefinition.getProperties(); properties.getListToscaDataDefinition().clear(); properties.getListToscaDataDefinition().addAll(requirementNodeFilterPropertyDataDefinition); nodeFilterDataDefinition.setProperties(properties); - return addOrUpdateNodeFilter(true, serviceId, componentInstanceId, nodeFilterDataDefinition); + return addOrUpdateNodeFilter(true, componentId, componentInstanceId, nodeFilterDataDefinition); + } + + public Either updateCapabilities( + final String componentId, final String componentInstanceId, + final CINodeFilterDataDefinition nodeFilterDataDefinition, + final List requirementNodeFilterCapabilityDataDefinitions) { + + final ListDataDefinition capabilities = + nodeFilterDataDefinition.getCapabilities(); + capabilities.getListToscaDataDefinition().clear(); + capabilities.getListToscaDataDefinition().addAll(requirementNodeFilterCapabilityDataDefinitions); + nodeFilterDataDefinition.setCapabilities(capabilities); + return addOrUpdateNodeFilter(true, componentId, componentInstanceId, nodeFilterDataDefinition); } public Either updateNodeFilter(final String serviceId, @@ -201,7 +214,6 @@ public class NodeFilterOperation extends BaseOperation { VertexTypeEnum.NODE_FILTER_TEMPLATE, toscaDataList, JsonPresentationFields.UNIQUE_ID); } } - } -- cgit 1.2.3-korg