openstack/tacker
Code Issues Proposed changes

Update TOSCA defs to set required: true/false as appropriate on properties

Browse Source 
Change-Id: Ic9b8206254d8dddc566dcb23fd2cfe588ddb2f69
This commit is contained in:
Bob.Haddleton 2016-05-13 14:15:20 -05:00
parent 3d40c322b5
commit 39f20f1a3b
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tacker/vm/tosca/lib/tacker_defs.yaml
View File

@ -11,21 +11,28 @@ data_types:
type: map
entry_schema:
type: string
required: false
tosca.datatypes.tacker.MonitoringParams:
properties:
monitoring_delay:
type: int
required: false
count:
type: int
required: false
interval:
type: int
required: false
timeout:
type: int
required: false
retry:
type: int
required: false
port:
type: int
required: false
tosca.datatypes.tacker.MonitoringType:
properties:
@ -34,27 +41,36 @@ data_types:
required: true
actions:
type: map
required: true
parameters:
type: tosca.datatypes.tacker.MonitoringParams
required: false
tosca.datatypes.compute_properties:
properties:
num_cpus:
type: integer
required: false
mem_size:
type: string
required: false
disk_size:
type: string
required: false
mem_page_size:
type: string
required: false
numa_node_count:
type: integer
constraints:
- greater_or_equal: 2
required: false
numa_nodes:
type: map
required: false
cpu_allocation:
type: map
required: false
policy_types:
tosca.policies.tacker.Placement:
@ -87,10 +103,12 @@ policy_types:
type: map
entry_schema:
type: string
required: false
actions:
type: map
entry_schema:
type: string
required: true
tosca.policies.tacker.Monitoring.NoOp:
derived_from: tosca.policies.tacker.Monitoring

10
tacker/vm/tosca/lib/tacker_nfv_defs.yaml
View File

@ -8,36 +8,46 @@ node_types:
image:
# type: tosca.artifacts.Deployment.Image.VM
type: string
required: false
flavor:
type: string
required: false
availability_zone:
type: string
required: false
metadata:
type: map
entry_schema:
type: string
required: false
config_drive:
type: boolean
default: false
required: false
placement_policy:
# type: tosca.policies.tacker.Placement
type: string
required: false
monitoring_policy:
# type: tosca.policies.tacker.Monitoring
# type: tosca.datatypes.tacker.MonitoringType
type: map
required: false
config:
type: string
required: false
mgmt_driver:
type: string
default: noop
required: false
service_type:
type: string
required: false
tosca.nodes.nfv.CP.Tacker:
derived_from: tosca.nodes.nfv.CP