From 69bc7db0edc751d3936b92c4bdf1ee74dfa4da57 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 5 Apr 2019 15:40:15 +0000 Subject: Complete filters for Database Fetches This review completes the implementaiton of the filters for fetching policy types, policies, and PDP groups from the database. It also fixes bugs in Policy type creation. Yaml in some of the policy type examples modified so that it is syntatically correct. Proeprties now stored as a blob in DB as they can be big. Issue-ID: POLICY-1095 Change-Id: I6aef88ee2905afa58d778d82832f2b55d794fe9c Signed-off-by: liamfallon --- .../policytypes/onap.policies.optimization.AffinityPolicy.yaml | 1 + .../policytypes/onap.policies.optimization.DistancePolicy.yaml | 1 + .../policytypes/onap.policies.optimization.HpaPolicy.yaml | 7 ++++++- .../policytypes/onap.policies.optimization.OptimizationPolicy.yaml | 1 + .../policytypes/onap.policies.optimization.PciPolicy.yaml | 3 ++- .../policytypes/onap.policies.optimization.QueryPolicy.yaml | 3 ++- .../policytypes/onap.policies.optimization.SubscriberPolicy.yaml | 1 + .../resources/policytypes/onap.policies.optimization.Vim_fit.yaml | 1 + .../policytypes/onap.policies.optimization.VnfPolicy.yaml | 3 ++- 9 files changed, 17 insertions(+), 4 deletions(-) (limited to 'models-examples') diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.AffinityPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.AffinityPolicy.yaml index c2fd504e9..1dcc5af86 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.AffinityPolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.AffinityPolicy.yaml @@ -45,6 +45,7 @@ policy_types: entry_schema: type: string data_types: + - policy.data.affinityProperties_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.DistancePolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.DistancePolicy.yaml index 93ddd631a..458d152e0 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.DistancePolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.DistancePolicy.yaml @@ -45,6 +45,7 @@ policy_types: type: policy.data.distanceProperties_properties required: true data_types: + - policy.data.distanceProperties_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.HpaPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.HpaPolicy.yaml index 63f0d8ada..be4110517 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.HpaPolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.HpaPolicy.yaml @@ -36,8 +36,9 @@ policy_types: type: list required: true entry_schema: - type:policy.data.flavorFeatures_properties + type: policy.data.flavorFeatures_properties data_types: + - policy.data.flavorFeatures_properties: derived_from: tosca.nodes.Root properties: @@ -57,6 +58,7 @@ data_types: required: true entry_schema: type: policy.data.flavorProperties_properties + - policy.data.directives_properties: derived_from: tosca.nodes.Root properties: @@ -66,6 +68,7 @@ data_types: type: list entry_schema: type: policy.data.directives_attributes_properties + - policy.data.directives_attributes_properties: derived_from: tosca.nodes.Root properties: @@ -73,6 +76,7 @@ data_types: type: string attribute_value: type: string + - policy.data.flavorProperties_properties: derived_from: tosca.nodes.Root properties: @@ -101,6 +105,7 @@ data_types: required: true entry_schema: type: policy.data.hpa-feature-attributes_properties + - policy.data.hpa-feature-attributes_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.OptimizationPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.OptimizationPolicy.yaml index edfac1496..267109861 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.OptimizationPolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.OptimizationPolicy.yaml @@ -40,6 +40,7 @@ policy_types: type: policy.data.objectiveParameter_properties required: true data_types: + - policy.data.objectiveParameter_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.PciPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.PciPolicy.yaml index 1355eb031..ba4dbec37 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.PciPolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.PciPolicy.yaml @@ -36,8 +36,9 @@ policy_types: type: list required: false entry_schema: - - type:policy.data.pciProperties_properties + type: policy.data.pciProperties_properties data_types: + - policy.data.pciProperties_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.QueryPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.QueryPolicy.yaml index f7036dc80..82cd60a46 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.QueryPolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.QueryPolicy.yaml @@ -31,8 +31,9 @@ policy_types: type: list required: true entry_schema: - type:policy.data.queryProperties_properties + type: policy.data.queryProperties_properties data_types: + - policy.data.queryProperties_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.SubscriberPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.SubscriberPolicy.yaml index 3c2c2b2c3..ab006fa57 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.SubscriberPolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.SubscriberPolicy.yaml @@ -31,6 +31,7 @@ policy_types: type: policy.data.properties_properties required: true data_types: + - policy.data.properties_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.Vim_fit.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.Vim_fit.yaml index 860c37fa0..9c12f7d63 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.Vim_fit.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.Vim_fit.yaml @@ -45,6 +45,7 @@ policy_types: type: policy.data.capacityProperties_properties required: true data_types: + - policy.data.capacityProperties_properties: derived_from: tosca.nodes.Root properties: diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.VnfPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.VnfPolicy.yaml index 13d4f137c..4bfc24216 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.VnfPolicy.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.VnfPolicy.yaml @@ -45,8 +45,9 @@ policy_types: type: list required: true entry_schema: - type:policy.data.vnfProperties_properties + type: policy.data.vnfProperties_properties data_types: + - policy.data.vnfProperties_properties: derived_from: tosca.nodes.Root properties: -- cgit 1.2.3-korg