diff options
author | andre.schmid <andre.schmid@est.tech> | 2020-05-20 14:24:40 +0100 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-05-28 07:57:32 +0000 |
commit | 9e43b160bde937c32151c8ce5a3d07701bd31924 (patch) | |
tree | d5268e69d262c43736d7215af355bc63817a8fef /catalog-be/src/main/resources/import | |
parent | d8f14691952677771e74e688d7a1dc20e14b036b (diff) |
Fix interface types creation
Interface types creation logic was not interpreting some allowed TOSCA
entries, that, when declared, were breaking the interface type
creation. Every entry under the interface type was being considered
as an interface operation, but it is possible to have "derived_from",
"version", "metadata" and "description". Also it is not considering
the Interface Type entries "inputs", "operations" and "notifications".
Another thing is that TOSCA 1.3 changes the way operations should be
declared, deprecating the previous way. Now there should be an entry
"operations" with the operations entries under it, instead of having
the operations entries direct under the interface type. The change
allows both types, following the TOSCA rule: if operations entry is
not present, then the deprecated way is considered.
Change-Id: I13218bda60b29d19b9c5565cbfd63ae3250a78bf
Issue-ID: SDC-3075
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'catalog-be/src/main/resources/import')
-rw-r--r-- | catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml index 35d67bfef4..9cc6c8c3a8 100644 --- a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml @@ -1,4 +1,9 @@ +tosca.interfaces.Root: + derived_from: tosca.entity.Root + description: The TOSCA root Interface Type all other TOSCA Interface Types derive from + tosca.interfaces.nfv.vnf.lifecycle.Nfv: + derived_from: tosca.interfaces.Root instantiate: description: Invoked upon receipt of an Instantiate VNF request instantiate_start: @@ -53,7 +58,9 @@ tosca.interfaces.nfv.vnf.lifecycle.Nfv: description: Invoked before scale_to_level scale_to_level_end: description: Invoked after scale_to_level + tosca.interfaces.node.lifecycle.Standard: + derived_from: tosca.interfaces.Root create: description: Standard lifecycle create operation. configure: @@ -65,10 +72,28 @@ tosca.interfaces.node.lifecycle.Standard: delete: description: Standard lifecycle delete operation. +tosca.interfaces.relationship.Configure: + derived_from: tosca.interfaces.Root + pre_configure_source: + description: Operation to pre-configure the source endpoint. + pre_configure_target: + description: Operation to pre-configure the target endpoint. + post_configure_source: + description: Operation to post-configure the source endpoint. + post_configure_target: + description: Operation to post-configure the target endpoint. + add_target: + description: Operation to notify the source node of a target node being added via a relationship. + add_source: + description: Operation to notify the target node of a source node which is now available via a relationship. + target_changed: + description: Operation to notify source some property or attribute of the target changed + remove_target: + description: Operation to remove a target node. # NFV interface types tosca.interfaces.nfv.Vnflcm: - #derived_from: tosca.interfaces.Root - #description: This interface encompasses a set of TOSCA operations corresponding to the VNF LCM operations defined in ETSI GS NFV-IFA 007 as well as to preamble and postamble procedures to the execution of the VNF LCM operations. + derived_from: tosca.interfaces.Root + description: This interface encompasses a set of TOSCA operations corresponding to the VNF LCM operations defined in ETSI GS NFV-IFA 007 as well as to preamble and postamble procedures to the execution of the VNF LCM operations. instantiate: description: Invoked upon receipt of an Instantiate VNF request # inputs: |