summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuoyu Ying <ruoyu.ying@intel.com>2018-09-13 19:16:03 +0800
committerRuoyu Ying <ruoyu.ying@intel.com>2018-09-13 19:24:36 +0800
commit66f2f109d975641b61f93c0f920034d3ac35a251 (patch)
tree94e58a8e85fb002fd50fcae530a835666a62d813
parentb92510795fb7b15c3e046d0bf96b8c57b32d8565 (diff)
Update policy model for HPA policies
Remove 'flavorLabel' attribute inside policy model. Add 'id', 'type' and 'directives' inside the structure. Also add 'directives' structure under flavorProperties Change-Id: I9c947481b2307553fadc716811d4ed9756a46182 Issue-ID: OPTFRA-340 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
-rw-r--r--osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml31
1 files changed, 30 insertions, 1 deletions
diff --git a/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml
index 24906a6..293cb63 100644
--- a/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml
+++ b/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml
@@ -35,14 +35,38 @@ data_types:
policy.data.flavorFeatures_properties:
derived_from: tosca.nodes.Root
properties:
- flavorLabel:
+ id:
type: string
required: true
+ type:
+ type: string
+ required: true
+ directives:
+ type: list
+ required: true
+ entry_schema:
+ type: policy.data.directives_properties
flavorProperties:
type: list
required: true
entry_schema:
type: policy.data.flavorProperties_properties
+ policy.data.directives_properties:
+ derived_from: tosca.nodes.Root
+ properties:
+ type:
+ type: string
+ attributes:
+ type: list
+ entry_schema:
+ type: policy.data.directives_attributes_properties
+ policy.data.directives_attributes_properties:
+ derived_from: tosca.nodes.Root
+ properties:
+ attribute_name:
+ type: string
+ attribute_value:
+ type: string
policy.data.flavorProperties_properties:
derived_from: tosca.nodes.Root
properties:
@@ -61,6 +85,11 @@ data_types:
hpa-version:
type: string
required: true
+ directives:
+ type: list
+ required: true
+ entry_schema:
+ type: policy.data.directives_properties
hpa-feature-attributes:
type: list
required: true