aboutsummaryrefslogtreecommitdiffstats
path: root/osdf
diff options
context:
space:
mode:
authorChayal, Avteet (ac229e) <ac229e@att.com>2018-11-01 07:06:38 +0000
committerChayal, Avteet (ac229e) <ac229e@att.com>2018-11-01 07:07:05 +0000
commit0917c1b86b2ca2c584791a12cc941cd9ff92b78c (patch)
treedc120b792e02280e08e3d47472c60c12a6ab286a /osdf
parent49570621115a7f5c89e607e52decb7aa583af4f6 (diff)
Fixed tosca models and updated policies
Fixed tosca models and updated policies for vFW Issue-ID: OPTFRA-384 Change-Id: If84cd3117f3c7b3d91a22e379b38c567ed3804e2 Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>
Diffstat (limited to 'osdf')
-rw-r--r--osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml2
-rw-r--r--osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml6
-rw-r--r--osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml2
-rw-r--r--osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/vnfPolicy-v20180326.yml)2
4 files changed, 6 insertions, 6 deletions
diff --git a/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml b/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml
index baa654a..bf7380d 100644
--- a/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml
+++ b/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml
@@ -32,7 +32,7 @@ node_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
diff --git a/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml b/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml
index 166799c..2c7e6c7 100644
--- a/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml
+++ b/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml
@@ -32,11 +32,11 @@ node_types:
- valid_values:
- minimize
- maximize
- objectiveParameters:
- type: policy.data.objectiveParameters_properties
+ objectiveParameter:
+ type: policy.data.objectiveParameter_properties
required: true
data_types:
- policy.data.objectiveParameters_properties:
+ policy.data.objectiveParameter_properties:
derived_from: tosca.nodes.Root
properties:
parameterAttributes:
diff --git a/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml b/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml
index 805b5a2..7f2b550 100644
--- a/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml
+++ b/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml
@@ -27,7 +27,7 @@ node_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
diff --git a/osdf/models/policy/placement/tosca/vnfPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml
index 3880cea..02f4051 100644
--- a/osdf/models/policy/placement/tosca/vnfPolicy-v20180326.yml
+++ b/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml
@@ -41,7 +41,7 @@ node_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