Merge "Reflect introduction of CP order in documents"

doc/source/devref/vnfd_template_description.rst

@@ -339,7 +339,8 @@ or a physical NIC address. Each connection point has to bind to a VDU. A CP
 always requires a virtual link and a virtual binding associated with it.
 
 A code snippet for virtual NIC (Connection Point) without anti-spoof
-protection and is accessible by the user. It is connected to VDU1 and VL1.
+protection and are accessible by the user. CP1 and CP2 are connected to
+VDU1 in this order. Also CP1/CP2 are connected to VL1/VL2 respectively.
 
 ::
 
@@ -354,13 +355,28 @@ protection and is accessible by the user. It is connected to VDU1 and VL1.
           type: vnic
           anti_spoof_protection: false
           management: true
+          order: 0
         requirements:
           - virtualLink:
               node: VL1
           - virtualBinding:
               node: VDU1
+      CP2:
+        type: tosca.nodes.nfv.CP.Tacker
+        properties:
+          type: vnic
+          anti_spoof_protection: false
+          management: true
+          order: 1
+        requirements:
+          - virtualLink:
+              node: VL2
+          - virtualBinding:
+              node: VDU1
       VL1:
         ..
+      VL2:
+        ..
 
 :type:
     tosca.nodes.nfv.CP.Tacker
@@ -387,6 +403,14 @@ protection and is accessible by the user. It is connected to VDU1 and VL1.
 |                         |        |       |           | CP is accessible by  |
 |                         |        |       |           | the user or not      |
 +-------------------------+--------+-------+-----------+----------------------+
+| order                   | No     |Integer| >= 0      | Uniquely numbered    |
+|                         |        |       |           | order of CP within a |
+|                         |        |       |           | VDU. Must be provided|
+|                         |        |       |           | when binding more    |
+|                         |        |       |           | than one CP to a VDU |
+|                         |        |       |           | and ordering is      |
+|                         |        |       |           | required.            |
++-------------------------+--------+-------+-----------+----------------------+
 
 :requirements:
 
@@ -525,6 +549,7 @@ a template which mentions all node types with all available options.
             management: [true, false]
             anti_spoofing_protection: [true, false]
             type: [ sriov, vnic ]
+            order: order of CP within a VDU
           requirements:
             - virtualLink:
                node: VL to link to

doc/source/install/getting_started.rst

@@ -54,6 +54,7 @@ i). Create a sample-vnfd.yaml file with the following content:
          type: tosca.nodes.nfv.CP.Tacker
          properties:
            management: true
+           order: 0
            anti_spoofing_protection: false
          requirements:
            - virtualLink: