Commit 9c24cbad authored by piscione's avatar piscione
Browse files

From SOL005_41 to SOL005_46 SOL005_v4009

parent 8abcbc6a
Loading
Loading
Loading
Loading
Loading
+39 −8
Original line number Original line Diff line number Diff line
@@ -1295,10 +1295,14 @@ definitions:
    description: >
    description: >
      This type represents information about an external CP of a VNF. It shall comply 
      This type represents information about an external CP of a VNF. It shall comply 
      with the provisions defined in Table 6.5.3.70-1.
      with the provisions defined in Table 6.5.3.70-1.
      NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId" and
      NOTE 1:	The attributes attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and
      "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
      "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
      NOTE 2:	An external CP instance is not associated to a link
      NOTE 2:	An external CP instance is not associated to a link
      port in the cases indicated for the “extLinkPorts” attribute in clause 6.5.3.26.
      port in the cases indicated for the “extLinkPorts” attribute in clause 6.5.3.26.
      NOTE 3: 	Cardinality greater than 1 is only applicable for specific cases where more than one network
      attachment definition resource is needed to fulfil the connectivity requirements of the external CP,
      e.g. to build a link redundant mated pair in SR-IOV cases.
      NOTE 4:  When more than one "netAttDefResourceId" is indicated, all shall belong to the same namespace.


    type: object
    type: object
    required:
    required:
@@ -1343,6 +1347,18 @@ definitions:
          structure. Shall be present if the CP is associated to a link port.
          structure. Shall be present if the CP is associated to a link port.
          See note 2.
          See note 2.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      netAttDefResourceId:
        description: >
            Identifier of the "NetAttDefResourceInfo" structure that provides the 
            specification of the interface to attach the connection point to a secondary
            container cluster network. See notes 3 and 4.

            It shall be present if the external CP is associated to a VNFC realized 
            by one or a set of OS containers and is connected to a secondary container 
            cluster network. It shall not be present otherwise.
        type: array
        items:
          $ref: "#/definitions/IdentifierInVnf"
      metadata:
      metadata:
        description: >
        description: >
          Metadata about this external CP.
          Metadata about this external CP.
@@ -1355,10 +1371,15 @@ definitions:
        $ref: "#/definitions/IdentifierInVnf"
        $ref: "#/definitions/IdentifierInVnf"
      associatedVipCpId:
      associatedVipCpId:
        description: >
        description: >
          Identifier of the VIP CP instance that is exposed as this VnfExtCp instance, either
          Identifier of the "VipCpInfo" structure that represents the VIP CP that is exposed by this external CP 
          directly or via a floating IP address, and the related "VipCpInfo" structure
          instance, either directly or via a floating IP address, and the related "VipCpInfo" structure in "VnfInstance".
          in "VnfInstance". Shall be present if the cpdId of this VnfExtCp has a vipCpd
          Shall be present in case this CP instance maps to a VIP CP. 
          attribute. See note 1.
          See note 1.
        $ref: "#/definitions/IdentifierInVnf"
      associatedVirtualCpId:
        description: >
          Identifier of the "VirtualCpInfo" structure that represents the virtual CP that is exposed by this external CP
          instance. Shall be present in case this CP instance maps to a virtual CP. See note 1.
        $ref: "#/definitions/IdentifierInVnf"
        $ref: "#/definitions/IdentifierInVnf"
      associatedVnfVirtualLinkId:
      associatedVnfVirtualLinkId:
        description: >
        description: >
@@ -1415,7 +1436,8 @@ definitions:
      This type represents describes a pair of ingress and egress CPs or SAPs which 
      This type represents describes a pair of ingress and egress CPs or SAPs which 
      the NFP passes by. It shall comply with the provisions defined in Table 6.5.3.72-1.
      the NFP passes by. It shall comply with the provisions defined in Table 6.5.3.72-1.


      NOTE 1:	The presence of a single vnfExpCpId, pnfExtCpId, or sapId occurrence indicates that the CP or SAP is used both as an ingress and egress port at a particular NFP position.
      NOTE 1:	The presence of a single vnfExpCpId, pnfExtCpId, or sapId occurrence indicates
      that the CP or SAP is used both as an ingress and egress port at a particular NFP position.
      NOTE 2:	Only one of these three attributes shall be present.
      NOTE 2:	Only one of these three attributes shall be present.
    type: object
    type: object
    properties:
    properties:
@@ -1703,6 +1725,7 @@ definitions:


  ExtVirtualLinkInfo:
  ExtVirtualLinkInfo:
    type: object
    type: object
    description: This type represents information about an VNF external VL. 
    required:
    required:
      - id
      - id
      - resourceHandle
      - resourceHandle
@@ -1724,6 +1747,14 @@ definitions:
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/ExtLinkPortInfo"
          $ref: "#/definitions/ExtLinkPortInfo"
      extNetAttDefResource:
        description: >
          Network attachment definition resources that provide the specification
          of the interface to attach connection points to this VL.
        type: array
        items:
          $ref: "#/definitions/NetAttDefResourceInfo"

      currentVnfExtCpData:
      currentVnfExtCpData:
        description: >
        description: >
          Allows the API consumer to read the current CP configuration information
          Allows the API consumer to read the current CP configuration information
@@ -2101,7 +2132,7 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      networkResource:
      networkResource:
        description: >
        description: >
          Reference to the VirtualNetwork resource.
          Reference to the VirtualNetwork resource or reference to a Network MCIO.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
      reservationId:
      reservationId:
        description: >
        description: >
@@ -2148,7 +2179,7 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      storageResource:
      storageResource:
        description: >
        description: >
          Reference to the VirtualStorage resource.
          Reference to the VirtualStorage resource or reference to a Storage MCIO.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
      reservationId:
      reservationId:
        description: >
        description: >