From 0917c1b86b2ca2c584791a12cc941cd9ff92b78c Mon Sep 17 00:00:00 2001 From: "Chayal, Avteet (ac229e)" Date: Thu, 1 Nov 2018 07:06:38 +0000 Subject: 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) --- .../policy/placement/tosca/hpaPolicy-v20181031.yml | 2 +- .../tosca/optimizationPolicy-v20181031.yml | 6 +- .../placement/tosca/queryPolicy-v20181031.yml | 2 +- .../policy/placement/tosca/vnfPolicy-v20180326.yml | 68 ---------------------- .../policy/placement/tosca/vnfPolicy-v20181031.yml | 68 ++++++++++++++++++++++ 5 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 osdf/models/policy/placement/tosca/vnfPolicy-v20180326.yml create mode 100644 osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml (limited to 'osdf/models') 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-v20180326.yml deleted file mode 100644 index 3880cea..0000000 --- a/osdf/models/policy/placement/tosca/vnfPolicy-v20180326.yml +++ /dev/null @@ -1,68 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - policy.nodes.vnfPolicy: - derived_from: policy.nodes.Root - properties: - policyScope: - type: list - description: scope where the policy is applicable - required: true - matchable: true - entry_schema: - type: string - policyType: - type: list - description: type of a policy - required: true - matchable: true - entry_schema: - type: string - consraints: - - valid_values: - - vnfPolicy - identity: - type: string - required: true - resources: - type: list - required: true - entry_schema: - type: string - applicableResources: - type: list - required: true - entry_schema: - type: string - constraints: - - valid_values: - - any - - all - vnfProperties: - type: list - required: true - entry_schema: - - type: policy.data.vnfProperties_properties -data_types: - policy.data.vnfProperties_properties: - derived_from: tosca.nodes.Root - properties: - inventoryProvider: - type: string - required: true - serviceType: - type: string - required: true - inventoryType: - type: list - required: true - entry_schema: - type: string - constraints: - - valid_values: - - serviceInstanceId - - vnfName - - cloudRegionId - - vimId - customerId: - type: string - required: true diff --git a/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml b/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml new file mode 100644 index 0000000..02f4051 --- /dev/null +++ b/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml @@ -0,0 +1,68 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + policy.nodes.vnfPolicy: + derived_from: policy.nodes.Root + properties: + policyScope: + type: list + description: scope where the policy is applicable + required: true + matchable: true + entry_schema: + type: string + policyType: + type: list + description: type of a policy + required: true + matchable: true + entry_schema: + type: string + consraints: + - valid_values: + - vnfPolicy + identity: + type: string + required: true + resources: + type: list + required: true + entry_schema: + type: string + applicableResources: + type: list + required: true + entry_schema: + type: string + constraints: + - valid_values: + - any + - all + vnfProperties: + type: list + required: true + entry_schema: + type:policy.data.vnfProperties_properties +data_types: + policy.data.vnfProperties_properties: + derived_from: tosca.nodes.Root + properties: + inventoryProvider: + type: string + required: true + serviceType: + type: string + required: true + inventoryType: + type: list + required: true + entry_schema: + type: string + constraints: + - valid_values: + - serviceInstanceId + - vnfName + - cloudRegionId + - vimId + customerId: + type: string + required: true -- cgit 1.2.3-korg