From bdeb28f273da2494d7eeabbb5329222dfd168e3b Mon Sep 17 00:00:00 2001 From: aribeiro Date: Wed, 24 Jun 2020 08:34:22 +0100 Subject: Add support for substitution_filter business logic Tosca simple YAML profile allows for substitution_filter to be specified for a topology template to provide processing instructions to the orchestrator. Issue-ID: SDC-3147 Signed-off-by: aribeiro Change-Id: Ia94b8c447d3157e614f9d1524ad4520b3980ba4d --- ...SubstitutionFilterCapabilityDataDefinition.java | 50 +++++++++++++ ...ntSubstitutionFilterPropertyDataDefinition.java | 44 ++++++++++++ .../elements/SubstitutionFilterDataDefinition.java | 84 ++++++++++++++++++++++ .../be/datatypes/enums/ComponentFieldsEnum.java | 1 + 4 files changed, 179 insertions(+) create mode 100644 common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterCapabilityDataDefinition.java create mode 100644 common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java create mode 100644 common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterDataDefinition.java (limited to 'common-be/src') diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterCapabilityDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterCapabilityDataDefinition.java new file mode 100644 index 0000000000..242eb490ef --- /dev/null +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterCapabilityDataDefinition.java @@ -0,0 +1,50 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.be.datatypes.elements; + +import java.io.Serializable; +import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; +import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition; + +public class RequirementSubstitutionFilterCapabilityDataDefinition extends ToscaDataDefinition implements Serializable { + + /** + * Default Constructor + */ + public RequirementSubstitutionFilterCapabilityDataDefinition() { + } + + public String getName() { + return (String) getToscaPresentationValue(JsonPresentationFields.NAME); + } + + public void setName(final String name) { + setToscaPresentationValue(JsonPresentationFields.NAME, name); + } + + public ListDataDefinition getProperties() { + return (ListDataDefinition) getToscaPresentationValue( + JsonPresentationFields.PROPERTIES); + } + + public void setProperties(final ListDataDefinition properties) { + setToscaPresentationValue(JsonPresentationFields.PROPERTIES, properties); + } +} diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java new file mode 100644 index 0000000000..75efd123bc --- /dev/null +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementSubstitutionFilterPropertyDataDefinition.java @@ -0,0 +1,44 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ +package org.openecomp.sdc.be.datatypes.elements; + +import java.io.Serializable; +import java.util.List; +import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; +import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition; + +public class RequirementSubstitutionFilterPropertyDataDefinition extends ToscaDataDefinition implements Serializable { + + + public List getConstraints() { + return (List) getToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_CONSTRAINT); + } + + public void setConstraints(final List constraints) { + setToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_CONSTRAINT, constraints); + } + + public String getName() { + return (String) getToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_NAME); + } + + public void setName(final String name) { + setToscaPresentationValue(JsonPresentationFields.PROPERTY_FILTER_NAME, name); + } +} diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterDataDefinition.java new file mode 100644 index 0000000000..beb5aac1d0 --- /dev/null +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SubstitutionFilterDataDefinition.java @@ -0,0 +1,84 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ +package org.openecomp.sdc.be.datatypes.elements; + +import com.fasterxml.jackson.annotation.JsonCreator; +import java.io.Serializable; +import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; +import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition; + +public class SubstitutionFilterDataDefinition extends ToscaDataDefinition implements Serializable { + + @JsonCreator + public SubstitutionFilterDataDefinition() { + } + + public SubstitutionFilterDataDefinition(final SubstitutionFilterDataDefinition substitutionFilterDataDefinition) { + super(); + this.setID(substitutionFilterDataDefinition.getID()); + this.setName(substitutionFilterDataDefinition.getName()); + this.setTosca_id(substitutionFilterDataDefinition.getTosca_id()); + this.setProperties(substitutionFilterDataDefinition.getProperties()); + this.setCapabilities(substitutionFilterDataDefinition.getCapabilities()); + } + + public void setTosca_id(final Object tosca_id) { + setToscaPresentationValue(JsonPresentationFields.TOSCA_ID, tosca_id); + } + + public Object getTosca_id() { + return getToscaPresentationValue(JsonPresentationFields.TOSCA_ID); + } + + public ListDataDefinition getProperties() { + return (ListDataDefinition) getToscaPresentationValue( + JsonPresentationFields.PROPERTIES); + } + + public void setProperties(final ListDataDefinition properties) { + setToscaPresentationValue(JsonPresentationFields.PROPERTIES, properties); + } + + public ListDataDefinition getCapabilities() { + return (ListDataDefinition) getToscaPresentationValue( + JsonPresentationFields.NODE_FILTER_CAPABILITIES); + } + + public void setCapabilities(ListDataDefinition capabilities) { + setToscaPresentationValue(JsonPresentationFields.NODE_FILTER_CAPABILITIES, capabilities); + } + + public String getName() { + return (String) getToscaPresentationValue(JsonPresentationFields.NAME); + } + + public void setName(final String name) { + setToscaPresentationValue(JsonPresentationFields.NAME, name); + } + + public String getID() { + return (String) getToscaPresentationValue(JsonPresentationFields.UNIQUE_ID); + } + + public void setID(final String name) { + setToscaPresentationValue(JsonPresentationFields.UNIQUE_ID, name); + } + + +} diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java index a92a711a38..42696e4ac1 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ComponentFieldsEnum.java @@ -45,6 +45,7 @@ public enum ComponentFieldsEnum { POLICIES("policies"), NON_EXCLUDED_POLICIES("nonExcludedPolicies"), NODE_FILTER("nodeFilter"), + SUBSTITUTION_FILTER("substitutionFilter"), COMPONENT_INSTANCES_INTERFACES("componentInstancesInterfaces"), DATA_TYPES("dataTypes"); -- cgit 1.2.3-korg