From 35fedba01e0e4cfd06a61494fa69ca126d1db450 Mon Sep 17 00:00:00 2001 From: Bassi Matteo Date: Mon, 23 May 2016 11:29:32 +0200 Subject: [PATCH] Update INDIGO TOSCA custom and normative types --- src/main/resources/tosca-definitions/custom_types.yaml | 4 ++-- src/main/resources/tosca-definitions/normative-types.yml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/tosca-definitions/custom_types.yaml b/src/main/resources/tosca-definitions/custom_types.yaml index 25e30e897b..a3058d58d2 100644 --- a/src/main/resources/tosca-definitions/custom_types.yaml +++ b/src/main/resources/tosca-definitions/custom_types.yaml @@ -440,12 +440,12 @@ node_types: required: no type: integer capabilities: - job_successor: + parent_job: type: tosca.capabilities.indigo.Container.Application.Docker.Chronos valid_source_types: [tosca.nodes.indigo.Container.Application.Docker.Chronos] occurrences: [0, UNBOUNDED] requirements: - job_predecessor: + parent_job: type: tosca.capabilities.indigo.Container.Application.Docker.Chronos node: tosca.nodes.indigo.Container.Application.Docker.Chronos relationship: tosca.relationships.DependsOn diff --git a/src/main/resources/tosca-definitions/normative-types.yml b/src/main/resources/tosca-definitions/normative-types.yml index 047787026e..d1f8d8939c 100644 --- a/src/main/resources/tosca-definitions/normative-types.yml +++ b/src/main/resources/tosca-definitions/normative-types.yml @@ -11,6 +11,10 @@ description: > data_types: tosca.datatypes.Root: description: The TOSCA root Data Type all other TOSCA base Data Types derive from. + + string: + derived_from: tosca.datatypes.Root + tosca.datatypes.Credential: derived_from: tosca.datatypes.Root description: The Credential type is a complex TOSCA data Type used when describing authorization credentials used to access network accessible resources.