From 92b18f188105d5ba4b2c469cdfaedc7d2953d593 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Wed, 10 Aug 2022 14:50:08 +0100 Subject: Support TOSCA functions in Node Filters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds support to use tosca functions as value in the node property filters and substitution filters Change-Id: Id242691cc9ddd233245b58f052b9f0e2c7bbd66b Issue-ID: SDC-4128 Signed-off-by: André Schmid --- .../test/resources/nodeFilter/constraints/concat.yaml | 8 ++++++++ .../constraints/legacy-get_attribute-from-instance.yaml | 6 ++++++ .../constraints/legacy-get_attribute-from-self.yaml | 6 ++++++ .../constraints/legacy-get_input-subProperty.yaml | 6 ++++++ .../nodeFilter/constraints/legacy-get_input.yaml | 4 ++++ .../constraints/legacy-get_property-from-instance.yaml | 6 ++++++ .../constraints/legacy-get_property-from-self.yaml | 6 ++++++ .../resources/nodeFilter/constraints/legacy-static.yaml | 5 +++++ .../filter-constraint-get-input.json | 16 ++++++++++++++++ .../filter-constraint-legacy.txt | 1 + .../filter-constraint-static.json | 8 ++++++++ 11 files changed, 72 insertions(+) create mode 100644 common-be/src/test/resources/nodeFilter/constraints/concat.yaml create mode 100644 common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-instance.yaml create mode 100644 common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-self.yaml create mode 100644 common-be/src/test/resources/nodeFilter/constraints/legacy-get_input-subProperty.yaml create mode 100644 common-be/src/test/resources/nodeFilter/constraints/legacy-get_input.yaml create mode 100644 common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-instance.yaml create mode 100644 common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-self.yaml create mode 100644 common-be/src/test/resources/nodeFilter/constraints/legacy-static.yaml create mode 100644 common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-get-input.json create mode 100644 common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-legacy.txt create mode 100644 common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-static.json (limited to 'common-be/src/test/resources') diff --git a/common-be/src/test/resources/nodeFilter/constraints/concat.yaml b/common-be/src/test/resources/nodeFilter/constraints/concat.yaml new file mode 100644 index 0000000000..28f6aadec7 --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/concat.yaml @@ -0,0 +1,8 @@ +descriptor_id: + equal: + concat: + - aString + - get_input: + - vnfProfileInput + - instantiation_level + - anotherString \ No newline at end of file diff --git a/common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-instance.yaml b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-instance.yaml new file mode 100644 index 0000000000..039c4aeacc --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-instance.yaml @@ -0,0 +1,6 @@ +flavour_id: + equal: + get_attribute: + - Instance Name + - property + - subProperty \ No newline at end of file diff --git a/common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-self.yaml b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-self.yaml new file mode 100644 index 0000000000..3afd65d19f --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-self.yaml @@ -0,0 +1,6 @@ +flavour_id: + equal: + get_attribute: + - SELF + - property + - subProperty \ No newline at end of file diff --git a/common-be/src/test/resources/nodeFilter/constraints/legacy-get_input-subProperty.yaml b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_input-subProperty.yaml new file mode 100644 index 0000000000..ba9bc3ac74 --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_input-subProperty.yaml @@ -0,0 +1,6 @@ +flavour_id: + equal: + get_input: + - inputName + - inputSubProperty + - inputSubSubProperty \ No newline at end of file diff --git a/common-be/src/test/resources/nodeFilter/constraints/legacy-get_input.yaml b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_input.yaml new file mode 100644 index 0000000000..4b17734e86 --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_input.yaml @@ -0,0 +1,4 @@ +flavour_id: + greater_or_equal: + get_input: + - inputName \ No newline at end of file diff --git a/common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-instance.yaml b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-instance.yaml new file mode 100644 index 0000000000..67772d1666 --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-instance.yaml @@ -0,0 +1,6 @@ +flavour_id: + equal: + get_property: + - Instance Name + - property + - subProperty \ No newline at end of file diff --git a/common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-self.yaml b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-self.yaml new file mode 100644 index 0000000000..89c78d1a3b --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-self.yaml @@ -0,0 +1,6 @@ +flavour_id: + equal: + get_property: + - SELF + - property + - subProperty \ No newline at end of file diff --git a/common-be/src/test/resources/nodeFilter/constraints/legacy-static.yaml b/common-be/src/test/resources/nodeFilter/constraints/legacy-static.yaml new file mode 100644 index 0000000000..783316fff7 --- /dev/null +++ b/common-be/src/test/resources/nodeFilter/constraints/legacy-static.yaml @@ -0,0 +1,5 @@ +vnf_profile: + equal: + instantiation_level: '1' + max_number_of_instances: 1 + min_number_of_instances: 1 \ No newline at end of file diff --git a/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-get-input.json b/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-get-input.json new file mode 100644 index 0000000000..3ceee51804 --- /dev/null +++ b/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-get-input.json @@ -0,0 +1,16 @@ +{ + "propertyName": "aProperty", + "targetType": "PROPERTY", + "operator": "GREATER_THAN", + "valueType": "GET_INPUT", + "value": { + "type": "GET_INPUT", + "functionType": "GET_INPUT", + "propertyName": "aProperty", + "propertyUniqueId": "aPropertyId", + "propertySource": "SELF", + "sourceName": "aService", + "sourceUniqueId": "aServiceId", + "propertyPathFromSource": ["input", "subProperty"] + } +} \ No newline at end of file diff --git a/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-legacy.txt b/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-legacy.txt new file mode 100644 index 0000000000..925c878d5f --- /dev/null +++ b/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-legacy.txt @@ -0,0 +1 @@ +"{ \"propertyName\": { \"equal\": \"aValue\" } }" \ No newline at end of file diff --git a/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-static.json b/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-static.json new file mode 100644 index 0000000000..4faee8ab1a --- /dev/null +++ b/common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-static.json @@ -0,0 +1,8 @@ +{ + "propertyName": "aProperty", + "capabilityName": "aCapability", + "targetType": "CAPABILITY", + "operator": "EQUAL", + "valueType": "STATIC", + "value": "aStaticValue" +} \ No newline at end of file -- cgit 1.2.3-korg