Commit 6e1822b4 authored by Sana Zulfiqar's avatar Sana Zulfiqar
Browse files

added SOL005_30 -> SOL005_35

parent 5a19bba3
Loading
Loading
Loading
Loading
Loading
+76 −7
Original line number Diff line number Diff line
@@ -844,36 +844,61 @@ definitions:
        description: >
          Identifier of the VNF instance associated to the CP instance.
          This attribute shall be present if the CP instance is VNF external CP.
          See note 1 and note 4.
          NOTE 1:	For the VNF external CP instance, both vnfInstanceId and
          vnfExtCpInstanceId shall be present as a pair.
          NOTE 4:	One pair of identifiers (VNF external CP, PNF external CP or SAP)
          shall be present.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      vnfExtCpInstanceId:
        description: >
          Identifier of the VNF external CP instance in the scope
          of the VNF instance. This attribute shall be present if the CP instance is VNF
          external CP. See notes 1 and 4.
          NOTE 1:	For the VNF external CP instance, both vnfInstanceId and
          vnfExtCpInstanceId shall be present as a pair.
          NOTE 4:	One pair of identifiers (VNF external CP, PNF external CP or SAP)
          shall be present.
        $ref: "#/definitions/IdentifierInVnf"
      pnfInfoId:
        description: >
          Identifier of the PNF instance associated to the CP
          instance. This attribute shall be present if the CP instance is PNF
          external CP. See notes 2 and 4.
          NOTE 2:	For the PNF external CP instance, both pnfInfoId and
          PnfExtCpInstanceId shall be present as a pair.
          NOTE 4:	One pair of identifiers (VNF external CP, PNF external CP or SAP)
          shall be present.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      pnfExtCpInstanceId:
        description: >
          Identifier of the PNF external CP instance in the scope
          of the PNF. This attribute shall be present if the CP instance is PNF
          external CP. See notes 2 and 4.
          NOTE 2:	For the PNF external CP instance, both pnfInfoId and
          PnfExtCpInstanceId shall be present as a pair.
          NOTE 4:	One pair of identifiers (VNF external CP, PNF external CP or SAP)
          shall be present.
        $ref: "#/definitions/IdentifierInPnf"
      nsInstanceId:
        description: >
          Identifier of the NS instance associated to the SAP
          instance. This attribute shall be present if the CP instance is NS
          SAP. See notes 3 and 4.
          NOTE 3:	For the SAP instance, both nsInstanceId and nsSapInstanceId
          shall be present as a pair.
          NOTE 4:	One pair of identifiers (VNF external CP, PNF external CP or SAP)
          shall be present.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      nsSapInstanceId:
        description: >
          Identifier of the SAP instance in the scope of the NS
          instance. This attribute shall be present if the CP instance is NS
          SAP. See notes 3 and 4.
          NOTE 3:	For the SAP instance, both nsInstanceId and nsSapInstanceId
          shall be present as a pair.
          NOTE 4:	One pair of identifiers (VNF external CP, PNF external CP or SAP)
          shall be present.
        $ref: "#/definitions/IdentifierInNs"

  SapInfo:
@@ -1435,7 +1460,9 @@ definitions:
        $ref: "#/definitions/IdentifierInVnf"
      vduId:
        description: >
          Reference to the applicable VDU in the VNFD.
          Reference to the applicable VDU in the VNFD. see note 1.
          NOTE 1:	ETSI GS NFV-SOL 001 specifies the structure and format
          of the VNFD based on TOSCA specifications.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      computeResource:
        description: >
@@ -1458,8 +1485,12 @@ definitions:
          CPs of the VNFC instance.
          Shall be present when that particular CP of the VNFC
          instance is exposed as an external CP of the VNF
          instance or is connected to an external CP of the VNF instance.
          instance or is connected to an external CP of the VNF instance. See note 2.
          May be present otherwise.
          NOTE 2:	A VNFC CP is "connected to" an external CP if the VNFC CP
          is connected to an internal VL that exposes an external CP.
          A VNFC CP is "exposed as" an external CP if it is connected
          directly to an external VL.
        type: array
        items:
          type: object
@@ -1474,7 +1505,9 @@ definitions:
              $ref: "#/definitions/IdentifierInVnf"
            cpdId:
              description: >
                Identifier of the VDU CPD, cpdId, in the VNFD.
                Identifier of the VDU CPD, cpdId, in the VNFD. see note 1.
                NOTE 1:	ETSI GS NFV-SOL 001 specifies the structure and format
                of the VNFD based on TOSCA specifications.
              $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
            vnfExtCpId:
              description: >
@@ -1482,11 +1515,18 @@ definitions:
                when the VNFC CP is exposed as an external CP of the
                VNF instance or connected to an external CP of the VNF
                instance (see note 2) and shall be absent otherwise.

                NOTE 2:	A VNFC CP is "connected to" an external CP if the VNFC CP
                is connected to an internal VL that exposes an external CP.
                A VNFC CP is "exposed as" an external CP if it is connected
                directly to an external VL.
              $ref: "#/definitions/IdentifierInVnf"
            cpProtocolInfo:
              description: >
                Network protocol information for this CP. May be omitted
                if the VNFC CP is exposed as an external CP.
                if the VNFC CP is exposed as an external CP. see note 3.
                NOTE 3:	The information can be omitted because it is
                already available as part of the external CP information.
              type: array
              items:
                $ref: "#/definitions/CpProtocolInfo"
@@ -3495,6 +3535,18 @@ definitions:
          instance as part of the scaling operation. If
          needed, the VNF Profile to be used for this VNF
          instance may also be provided.
          See note 1, note 2 and note 3.
          NOTE 1:	No more than two attributes between vnfInstanceToBeAdded,
          vnfInstanceToBeRemoved, scaleNsByStepsData and scaleNsToLevelData
          shall be present. In case of two, the attributes shall be
          vnfInstanceToBeAdded and vnfInstanceToBeRemoved.

          NOTE 2:	The DF of the VNF instance shall match the VNF DF present
          in the associated VNF Profile of the new NS flavour.

          NOTE 3:	This functionality is the same as the one provided
          by the Update NS operation when the AddVnf update type is
          selected (see clause 7.3.5).
        type: array
        items:
          $ref: "#/definitions/VnfInstanceData"
@@ -3502,6 +3554,15 @@ definitions:
        description: >
          The VNF instance to be removed from the NS
          instance as part of the scaling operation.
          See note 1 and note 4.
          NOTE 1:	No more than two attributes between vnfInstanceToBeAdded,
          vnfInstanceToBeRemoved, scaleNsByStepsData and scaleNsToLevelData
          shall be present. In case of two, the attributes shall be
          vnfInstanceToBeAdded and vnfInstanceToBeRemoved.

          NOTE 4:	This functionality is the same as the one provided
          by the Update NS operation when the RemoveVnf update type is
          selected (see clause 7.3.5).
        type: array
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
@@ -3509,10 +3570,18 @@ definitions:
        description: >
          The information used to scale an NS instance by
          one or more scaling steps.
          NOTE 1:	No more than two attributes between vnfInstanceToBeAdded,
          vnfInstanceToBeRemoved, scaleNsByStepsData and scaleNsToLevelData
          shall be present. In case of two, the attributes shall be
          vnfInstanceToBeAdded and vnfInstanceToBeRemoved.
        $ref: "#/definitions/ScaleNsByStepsData"
      scaleNsToLevelData:
        description: >
          The information used to scale an NS instance to a target size.
          NOTE 1:	No more than two attributes between vnfInstanceToBeAdded,
          vnfInstanceToBeRemoved, scaleNsByStepsData and scaleNsToLevelData
          shall be present. In case of two, the attributes shall be
          vnfInstanceToBeAdded and vnfInstanceToBeRemoved.
        $ref: "#/definitions/ScaleNsToLevelData"
      additionalParamsForNs:
        description: >