diff options
Diffstat (limited to 'osdf/models/policy/placement/tosca')
| -rw-r--r-- | osdf/models/policy/placement/tosca/affinityPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/affinityPolicy-v20180326.yml) | 2 | ||||
| -rw-r--r-- | osdf/models/policy/placement/tosca/distancePolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/distancePolicy-v20180326.yml) | 2 | ||||
| -rw-r--r-- | osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml) | 14 | ||||
| -rw-r--r-- | osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/optimizationPolicy-v20180326.yml) | 10 | ||||
| -rw-r--r-- | osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml) | 4 | ||||
| -rw-r--r-- | osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/vnfPolicy-v20180326.yml) | 19 |
6 files changed, 35 insertions, 16 deletions
diff --git a/osdf/models/policy/placement/tosca/affinityPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/affinityPolicy-v20181031.yml index 4db64db..89a3e9d 100644 --- a/osdf/models/policy/placement/tosca/affinityPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/affinityPolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - affinityPolicy + - zone identity: type: string required: true diff --git a/osdf/models/policy/placement/tosca/distancePolicy-v20180326.yml b/osdf/models/policy/placement/tosca/distancePolicy-v20181031.yml index 53d15dd..9c3bd29 100644 --- a/osdf/models/policy/placement/tosca/distancePolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/distancePolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - distancePolicy + - distance_to_location identity: type: string required: true diff --git a/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml index 293cb63..374f752 100644 --- a/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml @@ -19,10 +19,12 @@ node_types: type: string consraints: - valid_values: - - hpaPolicy - resource: - type: string + - hpa + resources: + type: list required: true + entry_schema: + type: string identity: type: string required: true @@ -30,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 @@ -78,7 +80,7 @@ data_types: required: true score: type: string - required: true + required: false architecture: type: string required: true @@ -122,4 +124,4 @@ data_types: - subset unit: type: string - required: true + required: false diff --git a/osdf/models/policy/placement/tosca/optimizationPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml index 0a3b94f..40678c3 100644 --- a/osdf/models/policy/placement/tosca/optimizationPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - optimizationPolicy + - placement_optimization identity: type: string required: true @@ -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: @@ -62,7 +62,7 @@ data_types: resources: type: string required: true - customerLocation: + customerLocationInfo: type: string required: true parameter: diff --git a/osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml index 2488769..09824db 100644 --- a/osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - queryPolicy + - request_param_query identity: type: string required: true @@ -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..8eaf178 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 @@ -66,3 +66,20 @@ data_types: customerId: type: string required: true + unique: + type: string + required: false + attributes: + type: list + required: false + entry_schema: + type:policy.data.vnfProperties_filteringAttributes + passthroughAttributes: + type: list + required: false + entry_schema: + type:policy.data.vnfProperties_passthroughAttributes + policy.data.vnfProperties_filteringAttributes: + derived_from: tosca.nodes.Root + policy.data.vnfProperties_passthroughAttributes: + derived_from: tosca.nodes.Root |