summaryrefslogtreecommitdiffstats
path: root/docs/Chapter5/Tosca.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/Chapter5/Tosca.rst')
-rw-r--r--docs/Chapter5/Tosca.rst55
1 files changed, 41 insertions, 14 deletions
diff --git a/docs/Chapter5/Tosca.rst b/docs/Chapter5/Tosca.rst
index 274a48c..88f531e 100644
--- a/docs/Chapter5/Tosca.rst
+++ b/docs/Chapter5/Tosca.rst
@@ -108,17 +108,25 @@ VNF Package Structure and Format
.. req::
:id: R-87234
- :target: VNF
- :keyword: MAY
+ :target: VNF or PNF
+ :keyword: MUST
:introduced: casablanca
+ :updated: dublin
- The VNF package provided by a VNF vendor **MAY** be either with
- TOSCA-Metadata directory (CSAR Option 1) or without TOSCA-Metadata
- directory (CSAR Option 2) as specified in ETSI GS NFV-SOL004. On-boarding
- entity (ONAP SDC) must support both options.
+ The VNF or PNF package provided by a VNF or PNF vendor **MUST** be with
+ TOSCA-Metadata directory (CSAR Option 1) as specified in
+ ETSI GS NFV-SOL004.
+
+ **Note:** SDC supports only the CSAR Option 1 in Dublin. The Option 2
+ will be considered in future ONAP releases.
+
+.. req::
+ :id: R-506221
+ :target: VNF or PNF CSAR PACKAGE
+ :keyword: MUST
+ :introduced: dublin
- **Note:** SDC supports only the CSAR Option 1 in Casablanca. The Option 2
- will be considered in future ONAP releases,
+ The VNF or PNF TOSCA CSAR file **MUST** be a zip file with .csar extension.
VNF Package Contents
@@ -126,14 +134,15 @@ VNF Package Contents
.. req::
:id: R-10087
- :target: VNF
+ :target: VNF or PNF CSAR PACKAGE
:keyword: MUST
:introduced: casablanca
+ :updated: dublin
- The VNF package **MUST** contain all standard artifacts as specified in
- ETSI GS NFV-SOL004 including Manifest file, VNFD (or Main TOSCA/YAML
- based Service Template) and other optional artifacts. CSAR Manifest
- file as per SOL004 - for example ROOT\\ **MainServiceTemplate.mf**
+ The VNF or PNF CSAR package **MUST** include all artifacts required by
+ ETSI GS NFV-SOL004 including Manifest file, VNFD or PNFD (or Main
+ TOSCA/YAML based Service Template) and other optional artifacts. CSAR
+ Manifest file as per SOL004 - for example ROOT\\ **MainServiceTemplate.mf**
.. req::
:id: R-01123
@@ -180,12 +189,30 @@ VNF Package Contents
:keyword: MUST
:introduced: casablanca
- The VNF provider MUST enumerate all of the open source licenses
+ The VNF provider **MUST** enumerate all of the open source licenses
their VNF(s) incorporate. CSAR License directory as per ETSI SOL004.
for example ROOT\\Licenses\\ **License_term.txt**
.. req::
+ :id: R-293901
+ :target: VNF or PNF CSAR PACKAGE
+ :keyword: MUST
+ :introduced: dublin
+
+ The VNF or PNF CSAR PACKAGE with TOSCA-Metadata **MUST** include following
+ additional keywords pointing to TOSCA files:
+
+ - ETSI-Entry-Manifest
+
+ - ETSI-Entry-Change-Log
+
+ Note: For a CSAR containing a TOSCA-Metadata directory, which includes
+ the TOSCA.meta metadata file. The TOSCA.meta metadata file includes block_0
+ with the Entry-Definitions keyword pointing to a TOSCA definitions YAML
+ file used as entry for parsing the contents of the overall CSAR archive.
+
+.. req::
:id: R-146092
:target: VNF or PNF
:keyword: MUST