diff options
Diffstat (limited to 'catalog-be/src/main')
3 files changed, 27 insertions, 24 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json index c2e5aee81d..a572ed7013 100644 --- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json +++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json @@ -3,10 +3,6 @@ "displayName": "Root", "icon": "group-root" }, - "tosca.groups.nfv.PlacementGroup": { - "displayName": "NFV PlacementGroup", - "icon": "group-nfv-placementgroup" - }, "org.openecomp.groups.heat.HeatStack": { "displayName": "Heat Stack", "icon": "group-heat-stack" @@ -22,5 +18,9 @@ "org.openecomp.groups.VfcInstanceGroup": { "displayName": "Vfc Instance", "icon": "group-vfc-instance" + }, + "tosca.groups.nfv.PlacementGroup": { + "displayName": "NFV PlacementGroup", + "icon": "group-nfv-placementgroup" } } diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml index b8d5954fde..b878241ebd 100644 --- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml @@ -3,15 +3,6 @@ tosca.groups.Root: interfaces: Standard: type: tosca.interfaces.node.lifecycle.Standard -tosca.groups.nfv.PlacementGroup: - derived_from: tosca.groups.Root - description: PlacementGroup is used for describing the affinity or anti-affinity relationship applicable between the virtualization containers to be created based on different VDUs, or between internal VLs to be created based on different VnfVirtualLinkDesc(s) - properties: - description: - type: string - description: Human readable description of the group - required: true - members: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink ] org.openecomp.groups.heat.HeatStack: derived_from: tosca.groups.Root description: Grouped all heat resources which are in the same heat stack @@ -129,3 +120,13 @@ org.openecomp.groups.VfcInstanceGroup: properties: vfc_instance_group_reference: type: string +# NFV group types +tosca.groups.nfv.PlacementGroup: + derived_from: tosca.groups.Root + description: PlacementGroup is used for describing the affinity or anti-affinity relationship applicable between the virtualization containers to be created based on different VDUs, or between internal VLs to be created based on different VnfVirtualLinkDesc(s) + properties: + description: + type: string + description: Human readable description of the group + required: true + members: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink ] 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 4e9993f84b..35d67bfef4 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 @@ -53,6 +53,19 @@ 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: + create: + description: Standard lifecycle create operation. + configure: + description: Standard lifecycle configure operation. + start: + description: Standard lifecycle start operation. + stop: + description: Standard lifecycle stop operation. + delete: + description: Standard lifecycle delete operation. + +# 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. @@ -166,14 +179,3 @@ tosca.interfaces.nfv.Vnflcm: description: Invoked before scale_to_level scale_to_level_end: description: Invoked after scale_to_level -tosca.interfaces.node.lifecycle.Standard: - create: - description: Standard lifecycle create operation. - configure: - description: Standard lifecycle configure operation. - start: - description: Standard lifecycle start operation. - stop: - description: Standard lifecycle stop operation. - delete: - description: Standard lifecycle delete operation. |