diff options
author | 2018-08-03 01:26:04 -0700 | |
---|---|---|
committer | 2018-09-27 10:58:14 +0000 | |
commit | 8efb15270421833ffea495c8769b30b998d88577 (patch) | |
tree | 2efbf6f0575b311a5222f9d2fbe4d4fc734d8ce2 /catalog-be/src/main/resources/import/tosca/nfv-types | |
parent | c255bbeb22eed021d9da071c567908e507200bbc (diff) |
DM modification to align with R2 DM clean version
Change-Id: Ifcb5d3e644f46e4c9a4467e28b0dd7616b485497
Issue-ID: SDC-1415
Signed-off-by: liang ding <liang.ding@intel.com>
Diffstat (limited to 'catalog-be/src/main/resources/import/tosca/nfv-types')
3 files changed, 14 insertions, 14 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml index f0800a8de3..5eeedba2a9 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml @@ -40,16 +40,16 @@ node_types: configurable_properties: type: tosca.datatypes.nfv.VnfConfigurableProperties required: false -# modifiable_attributes: -# type: tosca.datatypes.nfv.VnfInfoModifiableAttributes -# required: false # true in IFA011, but all of members are false. Align with the IM, it is false + modifiable_attributes: + type: tosca.datatypes.nfv.VnfInfoModifiableAttributes + required: false # true in IFA011, but all of members are false. Align with the IM, it is false flavour_id: type: string required: true flavour_description: type: string required: true - capabilities: + #capabilities: # monitoring_parameter: # modelled as ad hoc capabilities in the VNF node template requirements: @@ -62,4 +62,4 @@ node_types: - UNBOUNDED interfaces: Nfv: - type: tosca.interfaces.node.lifecycle.Standard + type: tosca.interfaces.nfv.vnf.lifecycle.Nfv diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml index 37e4c5edb1..64bf536a0d 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml @@ -55,11 +55,11 @@ node_types: - virtual_storage: capability: tosca.capabilities.nfv.VirtualStorage relationship: tosca.relationships.nfv.Vdu.AttachedTo - node: tosca.nodes.nfv.VDU.VirtualStorage + node: tosca.nodes.nfv.Vdu.VirtualStorage occurences: - 0 - UNBOUNDED - artifacts: - - sw_image: - file: - type: tosca.artifacts.nfv.SwImage
\ No newline at end of file + #artifacts: artifacts should be defined in template file instead of node type + # - sw_image: + # file: + # type: tosca.artifacts.nfv.SwImage diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml index 12fb306c16..2b3c1dc055 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml @@ -24,7 +24,7 @@ node_types: capabilities: virtual_storage: type: tosca.capabilities.nfv.VirtualStorage - artifacts: - - sw_image: - file: - type: tosca.artifacts.Deployment.Image + # artifacts: artifacts should be defined in template file instead of node type + # - sw_image: + # file: + # type: tosca.artifacts.Deployment.Image |