From f0c3f38fc7d23b7d6fcda939aafe57d429b8f41a Mon Sep 17 00:00:00 2001 From: "katy.rotman" Date: Wed, 23 May 2018 15:50:38 +0300 Subject: new node filter implementation Issue-ID: SDC-1363 Change-Id: I0bd8b482e8e55f92ac3bccf8725d64f1b4929a43 Signed-off-by: katy.rotman --- .../src/test/resources/mock/model/serviceTemplate.yaml | 6 +++--- .../mock/model/serviceTemplateHeatExtend.yaml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model') diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml index a2bc15ea19..c93061996b 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml @@ -85,10 +85,10 @@ topology_template: node: nodeA relationship: relationB node_filter: - properties: - propName1: + properties: + - propName1: - greater_or_equal: 9 - propName2: + - propName2: - min_length: 1 - max_length: 2 occurrences: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml index ac349313c2..d027a4aa5a 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml @@ -91,11 +91,11 @@ topology_template: relationship: relationB node_filter: properties: - propName1: - - greater_or_equal: 9 - propName2: - - min_length: 1 - - max_length: 2 + - propName1: + - greater_or_equal: 9 + - propName2: + - min_length: 1 + - max_length: 2 occurrences: - 1 - 2 @@ -109,10 +109,10 @@ topology_template: num_cpus: '{ get_input: cpus }' attributes: num_cpus: '66' - node_filter: - properties: - test1: - - equal: 1 MB + node_filter: + properties: + -test1: + - equal: 1 MB substitution_mappings: node_type: myNodeType.node capabilities: -- cgit 1.2.3-korg