Code Review / sdc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: c0c2637) | patch
Support TOSCA functions in Node Filters 68/130268/20
authorandre.schmid <andre.schmid@est.tech>
Wed, 10 Aug 2022 13:50:08 +0000 (14:50 +0100)
committerVasyl Razinkov <vasyl.razinkov@est.tech>
Thu, 8 Sep 2022 18:24:44 +0000 (18:24 +0000)
commit92b18f188105d5ba4b2c469cdfaedc7d2953d593
treedf7c7562faa99a76b0e6b5bc079de8d514b35006tree | snapshot
parentc0c2637f201f488a74cb1916f05eece0cc207e9dcommit | diff
Support TOSCA functions in Node Filters

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 <andre.schmid@est.tech>
135 files changed:
catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/main/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImpl.java diff | blob | history
catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogic.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentSubstitutionFilterBusinessLogic.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/NodeFilterUploadCreator.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/FilterConstraintExceptionSupplier.java [new file with mode: 0644] blob
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/CINodeFilterUtils.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyConstraintsUtils.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/FilterConstraintValidatorImpl.java [new file with mode: 0644] blob
catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/NodeFilterValidator.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ConstraintConvertor.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServiceFilterUtils.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentNodeFilterServlet.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentSubstitutionFilterServlet.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaPropertyConstraint.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaPropertyConstraintValidValues.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/NodeFilterConverter.java diff | blob | history
catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/SubstitutionFilterConverter.java diff | blob | history
catalog-be/src/main/resources/config/error-configuration.yaml diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentNodeFilterBusinessLogicTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentSubstitutionFilterBusinessLogicTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/utils/CINodeFilterUtilsTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/components/property/PropertyConstraintsUtilsTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/FilterConstraintValidatorImplTest.java [new file with mode: 0644] blob
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/NodeFilterValidationTest.java [deleted file] blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/components/validation/NodeFilterValidatorTest.java [new file with mode: 0644] blob
catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/UiComponentDataConverterTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/datamodel/utils/ConstraintConvertorTest.java [moved from catalog-be/src/test/java/org/openecomp/sdc/be/tosca/model/ConstraintConvertorTest.java with 74% similarity] diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/nodeFilter/BaseServiceFilterUtilsTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/nodeFilter/ServiceFilterRenameCiTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/nodeFilter/ServiceFilterUtilsCIChangeTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/nodeFilter/ServiceFilterUtilsPropertyRemovedTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/nodeFilter/ServiceFilterUtilsServiceInputTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentNodeFilterServletTest.java diff | blob | history
catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ComponentSubstitutionFilterServletTest.java diff | blob | history
catalog-be/src/test/resources/config/catalog-be/error-configuration.yaml diff | blob | history
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ActionStatus.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/ParsedToscaYamlInfo.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/PropertyConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/ToscaPropertyData.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/dto/FilterConstraintDto.java [new file with mode: 0644] blob
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperation.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/SubstitutionFilterOperation.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/PropertyOperation.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/ToscaPropertyType.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/ConstraintType.java [deleted file] blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/EqualConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterOrEqualConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/GreaterThanConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/InRangeConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/LengthConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/LessOrEqualConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/LessThanConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/MaxLengthConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/MinLengthConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/PatternConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/constraints/ValidValuesConstraint.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/DataTypeValidatorConverter.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/validators/MapValidator.java diff | blob | history
catalog-model/src/main/java/org/openecomp/sdc/be/model/validation/FilterConstraintValidator.java [new file with mode: 0644] blob
catalog-model/src/main/java/org/openecomp/sdc/be/ui/mapper/FilterConstraintMapper.java [new file with mode: 0644] blob
catalog-model/src/test/java/org/openecomp/sdc/be/model/dto/FilterConstraintDtoTest.java [new file with mode: 0644] blob
catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeFilterOperationTest.java diff | blob | history
catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/AbstractPropertyConstraintTest.java diff | blob | history
catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/constraints/AbstractStringPropertyConstraintTest.java diff | blob | history
catalog-model/src/test/java/org/openecomp/sdc/be/ui/mapper/FilterConstraintMapperTest.java [new file with mode: 0644] blob
catalog-ui/src/app/models/capability-filter-constraint.ts [moved from catalog-ui/src/app/ng2/components/logic/capabilities-constraint/capabilities-constraint.component.ts with 94% similarity] diff | blob | history
catalog-ui/src/app/models/filter-constraint.ts [new file with mode: 0644] blob
catalog-ui/src/app/models/properties-inputs/property-fe-model.ts diff | blob | history
catalog-ui/src/app/models/tosca-concat-function.ts diff | blob | history
catalog-ui/src/app/models/tosca-function-parameter.ts diff | blob | history
catalog-ui/src/app/models/tosca-function.ts diff | blob | history
catalog-ui/src/app/models/tosca-get-function.ts diff | blob | history
catalog-ui/src/app/models/tosca-string-parameter.ts diff | blob | history
catalog-ui/src/app/models/ui-models/constraint-object-ui.ts [new file with mode: 0644] blob
catalog-ui/src/app/models/yaml-function.ts diff | blob | history
catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.html diff | blob | history
catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts diff | blob | history
catalog-ui/src/app/ng2/components/logic/substitution-filter/substitution-filter.component.html diff | blob | history
catalog-ui/src/app/ng2/components/logic/substitution-filter/substitution-filter.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/composition/panel/panel-tabs/service-dependencies-tab/service-dependencies-tab.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/composition/panel/panel-tabs/substitution-filter-tab/substitution-filter-tab.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/properties-assignment/services/properties.utils.ts diff | blob | history
catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-concat-function/tosca-concat-function.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-function.component.html diff | blob | history
catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-function.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-function.module.ts diff | blob | history
catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component.html diff | blob | history
catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component.less diff | blob | history
catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component.ts diff | blob | history
catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.module.ts diff | blob | history
catalog-ui/src/app/ng2/services/component-services/component.service.ts diff | blob | history
catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts diff | blob | history
catalog-ui/src/app/utils/filter-constraint-helper.ts [new file with mode: 0644] blob
catalog-ui/src/assets/languages/en_US.json diff | blob | history
common-be/pom.xml diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CINodeFilterDataDefinition.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyFilterConstraintDataDefinition.java [new file with mode: 0644] blob
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyFilterConstraintDataDefinitionJsonDeserializer.java [new file with mode: 0644] blob
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyFilterDataDefinition.java [moved from common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementNodeFilterPropertyDataDefinition.java with 65% similarity] diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementNodeFilterCapabilityDataDefinition.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterCapabilityDataDefinition.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterDataDefinition.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterPropertyDataDefinition.java [moved from common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java with 63% similarity] diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunction.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionType.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaGetFunctionDataDefinition.java diff | blob | history
common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ConstraintType.java [new file with mode: 0644] blob
common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterValueType.java [new file with mode: 0644] blob
common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/PropertyFilterTargetType.java [new file with mode: 0644] blob
common-be/src/main/java/org/openecomp/sdc/be/utils/PropertyFilterConstraintDataDefinitionHelper.java [new file with mode: 0644] blob
common-be/src/test/java/org/openecomp/sdc/be/datatypes/elements/PropertyFilterConstraintDataDefinitionJsonDeserializerTest.java [new file with mode: 0644] blob
common-be/src/test/java/org/openecomp/sdc/be/datatypes/enums/FilterValueTypeTest.java [new file with mode: 0644] blob
common-be/src/test/java/org/openecomp/sdc/be/utils/PropertyFilterConstraintDataDefinitionHelperTest.java [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/concat.yaml [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-instance.yaml [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/legacy-get_attribute-from-self.yaml [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/legacy-get_input-subProperty.yaml [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/legacy-get_input.yaml [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-instance.yaml [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/legacy-get_property-from-self.yaml [new file with mode: 0644] blob
common-be/src/test/resources/nodeFilter/constraints/legacy-static.yaml [new file with mode: 0644] blob
common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-get-input.json [new file with mode: 0644] blob
common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-legacy.txt [new file with mode: 0644] blob
common-be/src/test/resources/propertyFilterConstraintDataDefinitionDeserializer/filter-constraint-static.json [new file with mode: 0644] blob
integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ServiceDependenciesEditor.java diff | blob | history
SDC Parent Project Catalog FE and BE