Merge "Convert wiki page to rst file"

4 files changed, 709 insertions, 0 deletions

diff --git a/docs/ONAP release 2 spec/im/vnfd.rst b/docs/ONAP release 2 spec/im/vnfd.rst
new file mode 100644
index 0000000..a901c75
--- /dev/null
+++ b/docs/ONAP release 2 spec/im/vnfd.rst
@@ -0,0 +1,339 @@
+.. contents::
+   :depth: 3
+..
+
+Class: VNFD/VNFDesc
+===================
+
++---------------------+-------------+------------------+-----------------+------------------------+
+| **Attribute  Name** | **Type**    | **Multiplicity** | **Description** | **Applied Stereotypes**|
++=====================+=============+==================+=================+========================+
+| vnfdId              | Identifier  | 1                | Identifier      | support:               |
+|                     |             |                  | of this         | MANDATORY              |
+|                     |             |                  | VNFD            |                        |
+|                     |             |                  | information     |                        |
+|                     |             |                  | element.        |                        |
+|                     |             |                  | This            |                        |
+|                     |             |                  | attribute       |                        |
+|                     |             |                  | shall be        |                        |
+|                     |             |                  | globally        |                        |
+|                     |             |                  | unique.         |                        |
+|                     |             |                  |                 |                        |
+|                     |             |                  | NOTE: The       |                        |
+|                     |             |                  | VNFD            |                        |
+|                     |             |                  | Identifier      |                        |
+|                     |             |                  | shall be        |                        |
+|                     |             |                  | used as the     |                        |
+|                     |             |                  | unique          |                        |
+|                     |             |                  | identifier      |                        |
+|                     |             |                  | of the VNF      |                        |
+|                     |             |                  | Package         |                        |
+|                     |             |                  | that            |                        |
+|                     |             |                  | contains        |                        |
+|                     |             |                  | this VNFD.      |                        |
+|                     |             |                  |                 |                        |
+|                     |             |                  | Any             |                        |
+|                     |             |                  | modificatio     |                        |
+|                     |             |                  | n               |                        |
+|                     |             |                  | of the          |                        |
+|                     |             |                  | content of      |                        |
+|                     |             |                  | the VNFD or     |                        |
+|                     |             |                  | the VNF         |                        |
+|                     |             |                  | Package         |                        |
+|                     |             |                  | shall           |                        |
+|                     |             |                  | result in a     |                        |
+|                     |             |                  | new VNFD        |                        |
+|                     |             |                  | Identifier.     |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfProvider         | String      | 1                | Provider of     | support:               |
+|                     |             |                  | the VNF and     | MANDATORY              |
+|                     |             |                  | of the          |                        |
+|                     |             |                  | VNFD.           |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfProductN         | String      | 1                | Name to         | support:               |
+| ame                 |             |                  | identify        | MANDATORY              |
+|                     |             |                  | the VNF         |                        |
+|                     |             |                  | Product.        |                        |
+|                     |             |                  | Invariant       |                        |
+|                     |             |                  | for the VNF     |                        |
+|                     |             |                  | Product         |                        |
+|                     |             |                  | lifetime.       |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfSoftware         | String      | 1                | Software        | support:               |
+| Version             |             |                  | version of      | MANDATORY              |
+|                     |             |                  | the VNF.        |                        |
+|                     |             |                  | This is         |                        |
+|                     |             |                  | changed         |                        |
+|                     |             |                  | when there      |                        |
+|                     |             |                  | is any          |                        |
+|                     |             |                  | change to       |                        |
+|                     |             |                  | the             |                        |
+|                     |             |                  | software        |                        |
+|                     |             |                  | that is         |                        |
+|                     |             |                  | included in     |                        |
+|                     |             |                  | the VNF         |                        |
+|                     |             |                  | Package.        |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfdVersion         | String      | 1                | Identifies      | support:               |
+|                     |             |                  | the version     | MANDATORY              |
+|                     |             |                  | of the          |                        |
+|                     |             |                  | VNFD.           |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfProductI         | String      | 0..1             | Human           | support:               |
+| nfoName             |             |                  | readable        | MANDATORY              |
+|                     |             |                  | name for        |                        |
+|                     |             |                  | the VNF         |                        |
+|                     |             |                  | Product.        |                        |
+|                     |             |                  | Can change      |                        |
+|                     |             |                  | during the      |                        |
+|                     |             |                  | VNF Product     |                        |
+|                     |             |                  | lifetime.       |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfProductI         | String      | 0..1             | Human           | support:               |
+| nfoDescript         |             |                  | readable        | MANDATORY              |
+| ion                 |             |                  | description     |                        |
+|                     |             |                  | of the VNF      |                        |
+|                     |             |                  | Product.        |                        |
+|                     |             |                  | Can change      |                        |
+|                     |             |                  | during the      |                        |
+|                     |             |                  | VNF Product     |                        |
+|                     |             |                  | lifetime.       |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfmInfo            | String      | 0..N             | Identifies      | support:               |
+|                     |             |                  | VNFM(s)         | MANDATORY              |
+|                     |             |                  | compatible      |                        |
+|                     |             |                  | with the        | valueRange:            |
+|                     |             |                  | VNF             | use the                |
+|                     |             |                  | described       | name of                |
+|                     |             |                  | in this         | micro-servi            |
+|                     |             |                  | version of      | ce                     |
+|                     |             |                  | the VNFD.       | of the vnfm            |
+|                     |             |                  |                 | drive. For             |
+|                     |             |                  |                 | vendor                 |
+|                     |             |                  |                 | specific               |
+|                     |             |                  |                 | VNFM, the              |
+|                     |             |                  |                 | value                  |
+|                     |             |                  |                 | composes of            |
+|                     |             |                  |                 | "vendorname            |
+|                     |             |                  |                 | "                      |
+|                     |             |                  |                 | and                    |
+|                     |             |                  |                 | "vnfmdriver            |
+|                     |             |                  |                 | ",                     |
+|                     |             |                  |                 | e.g.                   |
+|                     |             |                  |                 | "mycompanyv            |
+|                     |             |                  |                 | nfmdriver";            |
+|                     |             |                  |                 | for generic            |
+|                     |             |                  |                 | VNFM, the              |
+|                     |             |                  |                 | value is               |
+|                     |             |                  |                 | "gvnfmdrive            |
+|                     |             |                  |                 | r".                    |
++---------------------+-------------+------------------+-----------------+------------------------+
+| localizatio         | String      | 0..N             | Information     | support:               |
+| nLanguage           |             |                  | about           | MANDATORY              |
+|                     |             |                  | localizatio     |                        |
+|                     |             |                  | n               | valueRange:            |
+|                     |             |                  | languages       | refer to               |
+|                     |             |                  | of the VNF      | ISO936 \ `h            |
+|                     |             |                  | (includes       | ttps://www.            |
+|                     |             |                  | e.g.            | iso.org/iso            |
+|                     |             |                  | strings in      | -639-langua            |
+|                     |             |                  | the VNFD).      | ge-codes.ht            |
+|                     |             |                  |                 | ml <https:/            |
+|                     |             |                  | NOTE: This      | /www.iso.or            |
+|                     |             |                  | allows to       | g/iso-639-l            |
+|                     |             |                  | provide one     | anguage-cod            |
+|                     |             |                  | or more         | es.html>`__            |
+|                     |             |                  | localizatio     |                        |
+|                     |             |                  | n               |                        |
+|                     |             |                  | languages       |                        |
+|                     |             |                  | to support      |                        |
+|                     |             |                  | selecting a     |                        |
+|                     |             |                  | specific        |                        |
+|                     |             |                  | localizatio     |                        |
+|                     |             |                  | n               |                        |
+|                     |             |                  | language at     |                        |
+|                     |             |                  | VNF             |                        |
+|                     |             |                  | instantiati     |                        |
+|                     |             |                  | on              |                        |
+|                     |             |                  | time.           |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| defaultLoca         | String      | 0..1             | Default         | support:               |
+| lizationLan         |             |                  | localizatio     | MANDATORY              |
+| guage               |             |                  | n               |                        |
+|                     |             |                  | language        | valueRange:            |
+|                     |             |                  | that is         | refer to               |
+|                     |             |                  | instantiate     | ISO936 \ `h            |
+|                     |             |                  | d               | ttps://www.            |
+|                     |             |                  | if no           | iso.org/iso            |
+|                     |             |                  | information     | -639-langua            |
+|                     |             |                  | about           | ge-codes.ht            |
+|                     |             |                  | selected        | ml <https:/            |
+|                     |             |                  | localizatio     | /www.iso.or            |
+|                     |             |                  | n               | g/iso-639-l            |
+|                     |             |                  | language is     | anguage-cod            |
+|                     |             |                  | available.      | es.html>`__            |
+|                     |             |                  |                 |                        |
+|                     |             |                  |                 | condition:             |
+|                     |             |                  |                 | Shall be               |
+|                     |             |                  |                 | present if             |
+|                     |             |                  |                 | "localizati            |
+|                     |             |                  |                 | onLanguage"            |
+|                     |             |                  |                 | is present             |
+|                     |             |                  |                 | and shall              |
+|                     |             |                  |                 | be absent              |
+|                     |             |                  |                 | otherwise.             |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vdu                 | VDU/VDUDesc | 1..N             | Virtualisat     | support:               |
+|                     |             |                  | ion             | MANDATORY              |
+|                     |             |                  | Deployment      |                        |
+|                     |             |                  | Unit.           |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| virtualComp         | VirtualComp | 1..N             | Defines         | support:               |
+| uteDesc             | uteDesc     |                  | descriptors     | MANDATORY              |
+|                     |             |                  | of virtual      |                        |
+|                     |             |                  | compute         |                        |
+|                     |             |                  | resources       |                        |
+|                     |             |                  | to be used      |                        |
+|                     |             |                  | by the VNF.     |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| virtualStor         | VirtualStor | 0..N             | Defines         | support:               |
+| ageDesc             | ageDesc     |                  | descriptors     | MANDATORY              |
+|                     |             |                  | of virtual      |                        |
+|                     |             |                  | storage         |                        |
+|                     |             |                  | resources       |                        |
+|                     |             |                  | to be used      |                        |
+|                     |             |                  | by the VNF.     |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| intVirtualL         | VirtualLink | 0..N             | Represents      | support:               |
+| inkDesc             | Desc/VnfVir |                  | the type of     | MANDATORY              |
+|                     | tualLinkDes |                  | network         |                        |
+|                     | c           |                  | connectivit     |                        |
+|                     |             |                  | y               |                        |
+|                     |             |                  | mandated by     |                        |
+|                     |             |                  | the VNF         |                        |
+|                     |             |                  | provider        |                        |
+|                     |             |                  | between two     |                        |
+|                     |             |                  | or more CPs     |                        |
+|                     |             |                  | which           |                        |
+|                     |             |                  | includes at     |                        |
+|                     |             |                  | least one       |                        |
+|                     |             |                  | internal        |                        |
+|                     |             |                  | CP.             |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfReserved         | VduCpd      | 0..N             | Reserved IP     | support:               |
+| Cpd                 |             |                  | Address for     | MANDATORY              |
+|                     |             |                  | VNF which       |                        |
+|                     |             |                  | is not          |                        |
+|                     |             |                  | bounded to      |                        |
+|                     |             |                  | any             |                        |
+|                     |             |                  | specific        |                        |
+|                     |             |                  | VNFC, but       |                        |
+|                     |             |                  | assigned        |                        |
+|                     |             |                  | manually        |                        |
+|                     |             |                  | from            |                        |
+|                     |             |                  | outside and     |                        |
+|                     |             |                  | potentially     |                        |
+|                     |             |                  | shared as a     |                        |
+|                     |             |                  | floating IP     |                        |
+|                     |             |                  | among           |                        |
+|                     |             |                  | VNFCs.          |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfExtCpd           | VnfExtCpd/V | 1..N             | Describes       | support:               |
+|                     | NFExtCPDesc |                  | external        | MANDATORY              |
+|                     |             |                  | interface(s     |                        |
+|                     |             |                  | )               |                        |
+|                     |             |                  | exposed by      |                        |
+|                     |             |                  | this VNF        |                        |
+|                     |             |                  | enabling        |                        |
+|                     |             |                  | connection      |                        |
+|                     |             |                  | with a VL.      |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| deploymentF         | VnfDf/VNFDe | 1..N             | Describes       | support:               |
+| lavour              | ploymentFla |                  | specific        | MANDATORY              |
+|                     | vor         |                  | DF(s) of a      |                        |
+|                     |             |                  | VNF with        |                        |
+|                     |             |                  | specific        |                        |
+|                     |             |                  | requirement     |                        |
+|                     |             |                  | s               |                        |
+|                     |             |                  | for             |                        |
+|                     |             |                  | capacity        |                        |
+|                     |             |                  | and             |                        |
+|                     |             |                  | performance     |                        |
+|                     |             |                  | .               |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| configurabl         | VnfConfigur | 0..1             | Describes       | sup    port:           |
+| eProperties         | ablePropert |                  | the             | MAN    DATORY          |
+|                     | ies         |                  | configurabl     |                        |
+|                     |             |                  | e               |                        |
+|                     |             |                  | properties      |                        |
+|                     |             |                  | of the VNF      |                        |
+|                     |             |                  | (e.g.           |                        |
+|                     |             |                  | related to      |                        |
+|                     |             |                  | auto            |                        |
+|                     |             |                  | scaling and     |                        |
+|                     |             |                  | auto            |                        |
+|                     |             |                  | healing).       |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| modifiableA         | VnfInfoModi | 0..1             | Describes       | sup    port:           |
+| ttributes           | fiableAttri |                  | the             | MAN    DATORY          |
+|                     | butes       |                  | modifiable      |                        |
+|                     |             |                  | attributes      |                        |
+|                     |             |                  | of the VNF.     |                        |
+|                     |             |                  |                 |                        |
+|                     |             |                  | Editor's        |                        |
+|                     |             |                  | note: need      |                        |
+|                     |             |                  | check the       |                        |
+|                     |             |                  | usage of        |                        |
+|                     |             |                  | this            |                        |
+|                     |             |                  | attribute       |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| lifeCycleMa         | LifeCycleMa | 0..N             | Includes a      | sup    port:           |
+| nagementScr         | nagementScr |                  | list of         | MAN    DATORY          |
+| ipt                 | ipt/LifeCyc |                  | events and      |                        |
+|                     | leManagemen |                  | correspondi     |                        |
+|                     | tOperationD |                  | ng              |                        |
+|                     | esc         |                  | management      |                        |
+|                     |             |                  | scripts         |                        |
+|                     |             |                  | performed       |                        |
+|                     |             |                  | for the         |                        |
+|                     |             |                  | VNF.            |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| elementGrou         | VnfdElement | 0..N             | Describes       | sup    port:           |
+| p                   | Group       |                  | the             | MAN    DATORY          |
+|                     |             |                  | associated      |                        |
+|                     |             |                  | elements of     |                        |
+|                     |             |                  | a VNFD for      |                        |
+|                     |             |                  | a certain       |                        |
+|                     |             |                  | purpose         |                        |
+|                     |             |                  | during VNF      |                        |
+|                     |             |                  | lifecycle       |                        |
+|                     |             |                  | management.     |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| vnfIndicato         | VnfIndicato | 0..N             | Declares        | support:               |
+| r                   | r           |                  | the VNF         | MANDATORY              |
+|                     |             |                  | indicators      |                        |
+|                     |             |                  | that are        |                        |
+|                     |             |                  | supported       |                        |
+|                     |             |                  | by this         |                        |
+|                     |             |                  | VNF.            |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| logo                | String      | 0..1             | File path       | support:               |
+|                     |             |                  | of the          | MANDATORY              |
+|                     |             |                  | vendor          |                        |
+|                     |             |                  | specified       |                        |
+|                     |             |                  | logo.           |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+| guide               | String      | 0..1             | UUID of the     | support:               |
+|                     |             |                  | vendor          | MANDATORY              |
+|                     |             |                  | guide/docum     |                        |
+|                     |             |                  | entation        |                        |
+|                     |             |                  | which is        |                        |
+|                     |             |                  | attached to     |                        |
+|                     |             |                  | VNF and can     |                        |
+|                     |             |                  | be              |                        |
+|                     |             |                  | downloaded      |                        |
+|                     |             |                  | from the        |                        |
+|                     |             |                  | model.          |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
+|                     |             |                  |                 |                        |
++---------------------+-------------+------------------+-----------------+------------------------+
diff --git a/docs/ONAP release 2 spec/im/vnfdf.rst b/docs/ONAP release 2 spec/im/vnfdf.rst
new file mode 100644
index 0000000..f3ce578
--- /dev/null
+++ b/docs/ONAP release 2 spec/im/vnfdf.rst
@@ -0,0 +1,232 @@
+.. Copyright 2018 (China Mobile)
+.. This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+.. Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+
+.. contents::
+   :depth: 3
+..
+
+Class: VnfDf
+============
+
++--------------------+-------------+------------------+-------------------+--------------------------+
+| **Attribute Name** | **Type**    | **Multiplicity** | **Description**   | **Applied Stereotypes**  |
++====================+=============+==================+===================+==========================+
+| flavorId           | Identifier  | 1                | Identifier        | support:                 |
+|                    |             |                  | of this DF        | MANDATORY                |
+|                    |             |                  | within the        |                          |
+|                    |             |                  | VNFD.             |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| description        | String      | 1                | Human             | support:                 |
+|                    |             |                  | readable          | MANDATORY                |
+|                    |             |                  | description       |                          |
+|                    |             |                  | of the DF.        |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| vduProfile         | VduProfile  | 1..N             | Describes         | support:                 |
+|                    |             |                  | additional        | MANDATORY                |
+|                    |             |                  | instantiati       |                          |
+|                    |             |                  | on                |                          |
+|                    |             |                  | data for          |                          |
+|                    |             |                  | the VDUs          |                          |
+|                    |             |                  | used in           |                          |
+|                    |             |                  | this              |                          |
+|                    |             |                  | flavor.           |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| virtualLink        | VirtualLink | 0..N             | Defines the       | support:                 |
+| Profile            | Profile     |                  | internal          | MANDATORY                |
+|                    |             |                  | VLD along         |                          |
+|                    |             |                  | with              |                          |
+|                    |             |                  | additional        |                          |
+|                    |             |                  | data which        |                          |
+|                    |             |                  | is used in        |                          |
+|                    |             |                  | this DF.          |                          |
+|                    |             |                  |                   |                          |
+|                    |             |                  | NOTE 1:           |                          |
+|                    |             |                  | This allows       |                          |
+|                    |             |                  | for               |                          |
+|                    |             |                  | different         |                          |
+|                    |             |                  | VNF               |                          |
+|                    |             |                  | internal          |                          |
+|                    |             |                  | topologies        |                          |
+|                    |             |                  | between           |                          |
+|                    |             |                  | DFs.              |                          |
+|                    |             |                  |                   |                          |
+|                    |             |                  | NOTE 2:           |                          |
+|                    |             |                  | virtualLink       |                          |
+|                    |             |                  | Profile           |                          |
+|                    |             |                  | needs to be       |                          |
+|                    |             |                  | provided          |                          |
+|                    |             |                  | for all VLs       |                          |
+|                    |             |                  | that the          |                          |
+|                    |             |                  | CPs of the        |                          |
+|                    |             |                  | VDUs in the       |                          |
+|                    |             |                  | VDU               |                          |
+|                    |             |                  | profiles          |                          |
+|                    |             |                  | connect to.       |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| instantiati        | Instantiati | 1..N             | Describes         | support:                 |
+| onLevel            | onLevel     |                  | the various       | MANDATORY                |
+|                    |             |                  | levels of         |                          |
+|                    |             |                  | resources         |                          |
+|                    |             |                  | that can be       |                          |
+|                    |             |                  | used to           |                          |
+|                    |             |                  | instantiate       |                          |
+|                    |             |                  | the VNF           |                          |
+|                    |             |                  | using this        |                          |
+|                    |             |                  | flavour.          |                          |
+|                    |             |                  |                   |                          |
+|                    |             |                  | Examples:         |                          |
+|                    |             |                  | Small,            |                          |
+|                    |             |                  | Medium,           |                          |
+|                    |             |                  | Large.            |                          |
+|                    |             |                  |                   |                          |
+|                    |             |                  | If there is       |                          |
+|                    |             |                  | only one          |                          |
+|                    |             |                  | "instantiat       |                          |
+|                    |             |                  | ionLevel"         |                          |
+|                    |             |                  | entry, it         |                          |
+|                    |             |                  | shall be          |                          |
+|                    |             |                  | treated as        |                          |
+|                    |             |                  | the default       |                          |
+|                    |             |                  | instantiati       |                          |
+|                    |             |                  | on                |                          |
+|                    |             |                  | level for         |                          |
+|                    |             |                  | this DF.          |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| affinityOrA        | AffinityOrA | 0..N             | Specifies         | support:                 |
+| ntiAffinity        | ntiAffinity |                  | affinity or       |                          |
+| Group              | Group       |                  | anti-affini       | MANDATORY                |
+|                    |             |                  | ty                |                          |
+|                    |             |                  | relationshi       |                          |
+|                    |             |                  | p                 |                          |
+|                    |             |                  | applicable        |                          |
+|                    |             |                  | between the       |                          |
+|                    |             |                  | virtualisat       |                          |
+|                    |             |                  | ion               |                          |
+|                    |             |                  | containers        |                          |
+|                    |             |                  | (e.g.             |                          |
+|                    |             |                  | virtual           |                          |
+|                    |             |                  | machines)         |                          |
+|                    |             |                  | to be             |                          |
+|                    |             |                  | created           |                          |
+|                    |             |                  | using             |                          |
+|                    |             |                  | different         |                          |
+|                    |             |                  | VDUs or           |                          |
+|                    |             |                  | internal          |                          |
+|                    |             |                  | VLs to be         |                          |
+|                    |             |                  | created           |                          |
+|                    |             |                  | using             |                          |
+|                    |             |                  | different         |                          |
+|                    |             |                  | VnfVirtualL       |                          |
+|                    |             |                  | inkDesc(s)        |                          |
+|                    |             |                  | in the same       |                          |
+|                    |             |                  | affinity or       |                          |
+|                    |             |                  | anti-affini       |                          |
+|                    |             |                  | ty                |                          |
+|                    |             |                  | group.            |                          |
+|                    |             |                  |                   |                          |
+|                    |             |                  | NOTE:             |                          |
+|                    |             |                  | In the            |                          |
+|                    |             |                  | present           |                          |
+|                    |             |                  | specificati       |                          |
+|                    |             |                  | on,               |                          |
+|                    |             |                  | including         |                          |
+|                    |             |                  | either            |                          |
+|                    |             |                  | VDU(s) or         |                          |
+|                    |             |                  | VnfVirtualL       |                          |
+|                    |             |                  | inkDesc(s)        |                          |
+|                    |             |                  | into the          |                          |
+|                    |             |                  | same              |                          |
+|                    |             |                  | affinity or       |                          |
+|                    |             |                  | anti-affini       |                          |
+|                    |             |                  | ty                |                          |
+|                    |             |                  | group is          |                          |
+|                    |             |                  | supported.        |                          |
+|                    |             |                  | Extension         |                          |
+|                    |             |                  | to support        |                          |
+|                    |             |                  | including         |                          |
+|                    |             |                  | both VDU(s)       |                          |
+|                    |             |                  | and               |                          |
+|                    |             |                  | VnfVirtualL       |                          |
+|                    |             |                  | inkDesc(s)        |                          |
+|                    |             |                  | into the          |                          |
+|                    |             |                  | same              |                          |
+|                    |             |                  | affinity or       |                          |
+|                    |             |                  | anti-affini       |                          |
+|                    |             |                  | ty                |                          |
+|                    |             |                  | group is          |                          |
+|                    |             |                  | left for          |                          |
+|                    |             |                  | future            |                          |
+|                    |             |                  | specificati       |                          |
+|                    |             |                  | on.               |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| scalingAspe        | ScalingAspe | 0..N             | The scaling       | support:                 |
+| ct                 | ct          |                  | aspects           |                          |
+|                    |             |                  | supported         | MANDATORY                |
+|                    |             |                  | by this DF        |                          |
+|                    |             |                  | of the VNF.       |                          |
+|                    |             |                  | scalingAspe       |                          |
+|                    |             |                  | ct                |                          |
+|                    |             |                  | shall be          |                          |
+|                    |             |                  | present if        |                          |
+|                    |             |                  | the VNF           |                          |
+|                    |             |                  | supports          |                          |
+|                    |             |                  | scaling.          |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| placementGr        | PlacementGr | 0..N             | Determine         | support:                 |
+| oup                | oup         |                  | where             | EXPERIMENTA              |
+|                    |             |                  | VNFC's            | L                        |
+|                    |             |                  | (VDU's) are       |                          |
+|                    |             |                  | placed with       |                          |
+|                    |             |                  | respect to        |                          |
+|                    |             |                  | the VNF           |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| baseConfigG        | BaseConfigG | 0..1             |- BaseConfigGroup  | support:                 |
+| roup               | roup        |                  |  may set          | EXPERIMENTA              |
+|                    |             |                  |  Access           | L                        |
+|                    |             |                  |  Control          |                          |
+|                    |             |                  |  Lists            |                          |
+|                    |             |                  |  (ACL's)          |                          |
+|                    |             |                  |  and              |                          |
+|                    |             |                  |  establish        |                          |
+|                    |             |                  |  security         |                          |
+|                    |             |                  |  groups           |                          |
+|                    |             |                  |  and              |                          |
+|                    |             |                  |  server           |                          |
+|                    |             |                  |  groups.          |                          |
+|                    |             |                  |                   |                          |
+|                    |             |                  |- BaseConfigGroup  |                          |
+|                    |             |                  |  creates/estab    |                          |
+|                    |             |                  |  lishslishs       |                          |
+|                    |             |                  |  storage for the  |                          |
+|                    |             |                  |  VM's (OpenStack  |                          |
+|                    |             |                  |  Cinder).         |                          |
+|                    |             |                  |                   |                          |
+|                    |             |                  |- BaseConfigGroup  |                          |
+|                    |             |                  |  may              |                          |
+|                    |             |                  |  establish        |                          |
+|                    |             |                  |  internal         |                          |
+|                    |             |                  |  networks         |                          |
+|                    |             |                  |  such as          |                          |
+|                    |             |                  |  OAM (VNF         |                          |
+|                    |             |                  |  Mgmt) or         |                          |
+|                    |             |                  |  MNS              |                          |
+|                    |             |                  |  (Maintenance &   |                          |
+|                    |             |                  |  Surveillance)    |                          |
+|                    |             |                  |  established.     |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+| deploymentG        | DeploymentG | 1..N             | DeploymentG       | support:                 |
+| roup               | roup        |                  | roup              | EXPERIMENTA              |
+|                    |             |                  | provides          | L                        |
+|                    |             |                  | the minimum       |                          |
+|                    |             |                  | viable VDU        |                          |
+|                    |             |                  | and               |                          |
+|                    |             |                  | associated        |                          |
+|                    |             |                  | VNFC              |                          |
+|                    |             |                  | configurati       |                          |
+|                    |             |                  | on                |                          |
+|                    |             |                  | for a             |                          |
+|                    |             |                  | useable           |                          |
+|                    |             |                  | VNF.              |                          |
++--------------------+-------------+------------------+-------------------+--------------------------+
+                                                                          
\ No newline at end of file
diff --git a/docs/ONAP release 2 spec/im/vnfextcpd.rst b/docs/ONAP release 2 spec/im/vnfextcpd.rst
new file mode 100644
index 0000000..0892bcf
--- /dev/null
+++ b/docs/ONAP release 2 spec/im/vnfextcpd.rst
@@ -0,0 +1,70 @@
+.. Copyright 2018 (China Mobile)
+.. This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+.. Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+
+.. contents::
+   :depth: 3
+..
+
+Class: VnfExtCpd/VnfExtCpDesc
+=============================
+
++-------------------+-------------+------------------+-----------------+--------------------------+
+| **Attribute Name**| **Type**    | **Multiplicity** | **Description** | **Applied Stereotypes**  |
++===================+=============+==================+=================+==========================+
+| intCpd            | Identifier  | 0..1             | Reference       | support:                 |
+|                   | (Reference  |                  | to the          | MANDATORY                |
+|                   | to VduCpd)  |                  | internal        |                          |
+|                   |             |                  | VDU CPD         |                          |
+|                   |             |                  | which is        |                          |
+|                   |             |                  | used to         |                          |
+|                   |             |                  | instantiate     |                          |
+|                   |             |                  | internal        |                          |
+|                   |             |                  | CPs. These      |                          |
+|                   |             |                  | internal        |                          |
+|                   |             |                  | CPs are, in     |                          |
+|                   |             |                  | turn,           |                          |
+|                   |             |                  | exposed as      |                          |
+|                   |             |                  | external        |                          |
+|                   |             |                  | CPs defined     |                          |
+|                   |             |                  | by this         |                          |
+|                   |             |                  | external        |                          |
+|                   |             |                  | CPD.            |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+| virtualNetw       | VirtualNetw | 0..N             | Specifies       | support:                 |
+| orkInterfac       | orkInterfac |                  | requirement     | MANDATORY                |
+| eRequiremen       | eRequiremen |                  | s               |                          |
+| ts                | ts          |                  | on a            |                          |
+|                   |             |                  | virtual         |                          |
+|                   |             |                  | network         |                          |
+|                   |             |                  | interface       |                          |
+|                   |             |                  | realising       |                          |
+|                   |             |                  | the CPs         |                          |
+|                   |             |                  | instantiate     |                          |
+|                   |             |                  | d               |                          |
+|                   |             |                  | from this       |                          |
+|                   |             |                  | CPD.            |                          |
+|                   |             |                  |                 |                          |
+|                   |             |                  | NOTE: In        |                          |
+|                   |             |                  | case of         |                          |
+|                   |             |                  | referencing     |                          |
+|                   |             |                  | an intCpd       |                          |
+|                   |             |                  | via its         |                          |
+|                   |             |                  | identifier,     |                          |
+|                   |             |                  | the             |                          |
+|                   |             |                  | virtualNetw     |                          |
+|                   |             |                  | orkInterfac     |                          |
+|                   |             |                  | eRequiremen     |                          |
+|                   |             |                  | ts              |                          |
+|                   |             |                  | attribute       |                          |
+|                   |             |                  | of the          |                          |
+|                   |             |                  | referenced      |                          |
+|                   |             |                  | intCpd          |                          |
+|                   |             |                  | applies.        |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+| (inherited        |             |                  | All             |                          |
+| attributes)       |             |                  | attributes      |                          |
+|                   |             |                  | inherited       |                          |
+|                   |             |                  | from Cpd.       |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+                                                                       
\ No newline at end of file
diff --git a/docs/ONAP release 2 spec/im/vnfvirtuallinkdesc.rst b/docs/ONAP release 2 spec/im/vnfvirtuallinkdesc.rst
new file mode 100644
index 0000000..72d8b51
--- /dev/null
+++ b/docs/ONAP release 2 spec/im/vnfvirtuallinkdesc.rst
@@ -0,0 +1,68 @@
+.. Copyright 2018 (China Mobile)
+.. This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+.. Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+
+.. contents::
+   :depth: 3
+..
+
+Class: VnfVirtualLinkDesc
+=========================
+
++-------------------+-------------+------------------+-----------------+--------------------------+
+| **Attribute Name**| **Type**    | **Multiplicity** | **Description** | **Applied Stereotypes**  |
++===================+=============+==================+=================+==========================+
+| virtualLink       | Identifier  | 1                | Unique          | support:                 |
+| DescId            |             |                  | identifier      | MANDATORY                |
+|                   |             |                  | of this         |                          |
+|                   |             |                  | internal        |                          |
+|                   |             |                  | VLD in          |                          |
+|                   |             |                  | VNFD.           |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+| virtualLink       | VirtualLink | 1..N             | Describes a     | support:                 |
+| DescFlavour       | DescFlavour |                  | specific        | MANDATORY                |
+|                   |             |                  | flavour of      |                          |
+|                   |             |                  | the VL with     |                          |
+|                   |             |                  | specific        |                          |
+|                   |             |                  | bitrate         |                          |
+|                   |             |                  | requirement     |                          |
+|                   |             |                  | s.              |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+| connectivit       | Connectivit | 1                |                 | support:                 |
+| yType             | yType       |                  |                 | MANDATORY                |
++-------------------+-------------+------------------+-----------------+--------------------------+
+| testAccess        | String      | 0..N             | Specifies       | support:                 |
+|                   |             |                  | test access     | MANDATORY                |
+|                   |             |                  | facilities      |                          |
+|                   |             |                  | expected on     |                          |
+|                   |             |                  | the VL          |                          |
+|                   |             |                  | (e.g. none,     |                          |
+|                   |             |                  | passive         |                          |
+|                   |             |                  | monitoring,     |                          |
+|                   |             |                  | or active       |                          |
+|                   |             |                  | (intrusive)     |                          |
+|                   |             |                  | loopbacks       |                          |
+|                   |             |                  | at              |                          |
+|                   |             |                  | endpoints).     |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+| description       | String      | 0..1             | Provides        | support:                 |
+|                   |             |                  | human-reada     | MANDATORY                |
+|                   |             |                  | ble             |                          |
+|                   |             |                  | information     |                          |
+|                   |             |                  | on the          |                          |
+|                   |             |                  | purpose of      |                          |
+|                   |             |                  | the VL          |                          |
+|                   |             |                  | (e.g.           |                          |
+|                   |             |                  | control         |                          |
+|                   |             |                  | plane           |                          |
+|                   |             |                  | traffic).       |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+| monitoringP       | MonitoringP | 0..N             | Defines the     | support:                 |
+| arameter          | arameter    |                  | virtualised     | MANDATORY                |
+|                   |             |                  | resources       |                          |
+|                   |             |                  | monitoring      |                          |
+|                   |             |                  | parameters      |                          |
+|                   |             |                  | on VLD          |                          |
+|                   |             |                  | level.          |                          |
++-------------------+-------------+------------------+-----------------+--------------------------+
+                                                                                                  
\ No newline at end of file