Commit 43893d11 authored by piscione's avatar piscione
Browse files

SOL005_30, to SOL005_35 and SOL005_63 SOL005_v040009

parent caa09b43
Loading
Loading
Loading
Loading
Loading
+118 −21
Original line number Original line Diff line number Diff line
@@ -3319,6 +3319,15 @@ definitions:
          referenced by the new NSD version, modifying
          referenced by the new NSD version, modifying
          information of VNF instances to the new applicable
          information of VNF instances to the new applicable
          VNFD provided in the new NSD version.
          VNFD provided in the new NSD version.

          NOTE: 	The replacement of VNF instances, nested NS instances or PNF instances
          by instances whose descriptor is referenced by the new NSD is applicable even if 
          the instance with a descriptor not referenced from the new NSD has the same 
          VnfdExtInvariantId, NsdExtInvariantId or PnfdExtInvariantId as the new one, i.e. 
          the synchronization procedure is based on descriptor identities of NSD constituents, 
          and does not consider VnfdExtInvariantId, NsdExtInvariantId or PnfdExtInvariantId 
          values.

          A cardinality of 0 indicates that synchronization shall not be done.
          A cardinality of 0 indicates that synchronization shall not be done.
        type: boolean
        type: boolean


@@ -3499,7 +3508,7 @@ definitions:
          - IPV6
          - IPV6
      vlanTag:
      vlanTag:
        description: >
        description: >
          Indicates a VLAN identifier in an IEEE 802.1Q-2018
          Indicates a VLAN identifier in an IEEE 802.1Q-2018
          tag Multiple tags can be included for QinQ stacking. See note.
          tag Multiple tags can be included for QinQ stacking. See note.
        type: array
        type: array
        items:
        items:
@@ -4655,7 +4664,7 @@ definitions:
      an instantiation level of that DF as defined in the VNFD, or given as a list of scale levels, one per scaling aspect of that
      an instantiation level of that DF as defined in the VNFD, or given as a list of scale levels, one per scaling aspect of that
      DF. Instantiation levels and scaling aspects are declared in the VNFD. The NFVO shall then invoke the
      DF. Instantiation levels and scaling aspects are declared in the VNFD. The NFVO shall then invoke the
      ScaleVnfToLevel operation towards the appropriate VNFM.
      ScaleVnfToLevel operation towards the appropriate VNFM.
      NOTE: Either the instantiationLevelId attribute or the scaleInfo attribute shall be included.
      NOTE: Either the vnfInstantiationLevelId attribute or the vnfScaleInfo attribute shall be included.
    type: object
    type: object
    anyOf:
    anyOf:
      - required:
      - required:
@@ -5426,13 +5435,16 @@ definitions:
          the specification of the interface to attach the connection points to a secondary container cluster network.
          the specification of the interface to attach the connection points to a secondary container cluster network.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"





  ExtManagedVirtualLinkData:
  ExtManagedVirtualLinkData:
    description: >
    description: >
      This type represents an externally-managed internal VL.
      This type represents an externally-managed internal VL.
      It shall comply with the provisions defined in Table 6.5.3.27-1.
      It shall comply with the provisions defined in Table 6.5.3.27-1.
            
      NOTE 1:	It is only applicable if the externally-managed VL is realized by a 
      secondary container cluster network. It shall not be present otherwise.
      NOTE 2: 	An example of the network attachment definition resource when the
      container infrastructure service is a Kubernetes® instance is a network 
      attachment definition (NAD).
    type: object
    type: object
    required:
    required:
      - vnfVirtualLinkDescId
      - vnfVirtualLinkDescId
@@ -5474,6 +5486,22 @@ definitions:
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/VnfLinkPortData"
          $ref: "#/definitions/VnfLinkPortData"
      netAttDefResourceData:
        description: >
          Externally provided network attachment definition resource(s) that provides the specification of the
          interface to attach VNFC connection points to this externally-managed VL. If this attribute is not present,
          the NFVO shall create the network attachment definition resource(s) for the externally-managed VL. 
          See notes 1 and 2.
        type: array
        items:
          $ref: "#/definitions/NetAttDefResourceData"
      intCp:
        description: >
          Internal CPs of the VNF to be connected to this externally-managed VL. See note 1.
          This attribute may only be present if the "netAttDefResourceData" is also present.
        type: array
        items:
          $ref: "#/definitions/IntVnfCpData"
      extManagedMultisiteVirtualLinkId:
      extManagedMultisiteVirtualLinkId:
        description: >
        description: >
          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFV-MANO entity
          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFV-MANO entity
@@ -5483,6 +5511,33 @@ definitions:
          on the same virtualLinkDescId shall refer to the same extManagedMultisiteVirtualLinkId.
          on the same virtualLinkDescId shall refer to the same extManagedMultisiteVirtualLinkId.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"


  IntVnfCpData:
    description: >
      This type represents the input information related to one or more VNF internal CP instances created based on the same CPD. 
    type: object
    required:
      - cpdId
      - netAttDefResourceId
    properties:
      cpdId:
        description: >
          Identifier of the CPD in the VNFD.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      netAttDefResourceId:
        description: >
          Identifier of the "NetAttDefResourceData" structure that provides the
          specification of the interface to attach the VNF internal CP created
          from the CPD identified by cpdId to a secondary container cluster network.
          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 VNF internal CP, e.g. to build a link
          redundant mated pair in SR-IOV cases. When more than one "netAttDefResourceId"
          is indicated, all shall belong to the same namespace as defined by the corresponding
          "netAttDefResourceNamespace" attribute in the "NetAttDefResourceData".

        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnf"


  VnfExtCpData:
  VnfExtCpData:
    description: >
    description: >
      This type represents configuration information for external CPs created
      This type represents configuration information for external CPs created
@@ -5558,13 +5613,20 @@ definitions:


  VnfExtCpConfig:
  VnfExtCpConfig:
    description: >
    description: >
      This type represents an externally provided link port or network address
      This type represents an externally provided link port, or a network attachment definition
      information per instance of an external connection point. In case a link
      resource of secondary container cluster network, or network address information per 
      port is provided, the VNFM shall use that link port when connecting the
      instance of a VNF external connection point. In the case of VM-based deployment of the
      external CP to the external VL. In a link port is not provided, the VNFM
      VNFC exposing the external CP: In case a link port is provided, the NFVO shall use that
      shall create a link port on the external VL, and use that link port to
      link port when connecting the VNF external CP to the external VL. •	In case a link port
      connect the external CP to the external VL.
      is not provided, the NFVO or VNFM shall create a link port on the external VL, and use
      NOTE 1:	The following conditions apply to the attributes "linkPortId" and "cpProtocolData":
      that link port to connect the VNF external CP to the external VL. In the case of 
      container-based deployment of the VNFC exposing the external CP, the NFVO and VNFM
      shall use the network attachment definition resource of secondary container cluster 
      network when connecting the CP to the external VL.

      NOTE 1:		The following conditions apply to the attributes "linkPortId" and "cpProtocolData"
        for an external CP instance connected or to be connected to a virtual network not
        categorized as secondary container cluster network:
        -	At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for
        -	At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for
        an external CP instance representing a subport that is to be created, or an external CP instance
        an external CP instance representing a subport that is to be created, or an external CP instance
        that is to be created by creating the corresponding VNFC or VNF instance during the current or
        that is to be created by creating the corresponding VNFC or VNF instance during the current or
@@ -5577,6 +5639,18 @@ definitions:
      NOTE 2:	In case the NFVO manages its own identifier space, the NFVO may remap this identifier
      NOTE 2:	In case the NFVO manages its own identifier space, the NFVO may remap this identifier
      when communicating with the VNFM. If the NFVO knows that there can be an identifier collision
      when communicating with the VNFM. If the NFVO knows that there can be an identifier collision
      when communicating with the VNFM by using the identifier from the OSS/BSS, the NFVO shall remap it.
      when communicating with the VNFM by using the identifier from the OSS/BSS, the NFVO shall remap it.
      NOTE 3:	The following conditions apply to the attributes “netAttDefResourceId” and “cpProtocolData”
      for an external CP instance connected or to be connected to a secondary container cluster network;
      The "netAttDefResourceId" and "cpProtocolData" attributes shall both be absent for the deletion of
      an existing external CP instance addressed by "cpInstanceId".
      At least one of these attributes shall be present for a to-be-created external CP instance or
      an existing external CP instance.
      NOTE 4:	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. When more than one "netAttDefResourceId"
      is indicated, all shall belong to the same namespace as defined by the corresponding 
      "netAttDefResourceNamespace" attribute in the "NetAttDefResourceData
      NOTE 5:	Either "linkPortId" or "netAttDefResourceId" may be included, but not both.
    type: object
    type: object
    anyOf:
    anyOf:
      - required:
      - required:
@@ -5593,7 +5667,7 @@ definitions:
      linkPortId:
      linkPortId:
        description: >
        description: >
          Identifier of a pre-configured link port to which the external CP
          Identifier of a pre-configured link port to which the external CP
          will be associated.
          will be associated. . See notes 1 and 5.
          See note 1.
          See note 1.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
      createExtLinkPort:
      createExtLinkPort:
@@ -5608,10 +5682,21 @@ definitions:
        description: >
        description: >
          Parameters for configuring the network protocols on the link port
          Parameters for configuring the network protocols on the link port
          that connects the CP to a VL.
          that connects the CP to a VL.
          See note 1.
          See notes 1 and 3.
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/CpProtocolData"
          $ref: "#/definitions/CpProtocolData"
      netAttDefResourceId:
        description: >
          Identifier of the "NetAttDefResourceData" structure that provides the specification
          of the interface to attach the external CP to a secondary container cluster network. 
          It is only applicable if the external CP is connected or to be connected to a secondary
          container cluster network. It shall not be present if the external CP is related to a
          virtual network not categorized as secondary container cluster network. 
          See notes 3, 4 and 5.
        type: array
        items:
          $ref: "#/definitions/IdentifierInVnf"


  IdentifierInNs:
  IdentifierInNs:
    description: >
    description: >
@@ -5921,12 +6006,10 @@ definitions:
        current virtualized resource instances.
        current virtualized resource instances.
      *	Changes related to the VNFD, such as correction of bugs in the VNFD, changes in the naming scheme of VNFD components
      *	Changes related to the VNFD, such as correction of bugs in the VNFD, changes in the naming scheme of VNFD components
        (e.g. name of the VDU, vduId), and adding/removing descriptors of VNF Package changes (VnfPackageChangeInfo).
        (e.g. name of the VDU, vduId), and adding/removing descriptors of VNF Package changes (VnfPackageChangeInfo).
      NOTE:	For software updates that are executed by functional entities outside NFV-MANO and that require synchronization
      
            of the information held by the NFV-MANO entities with a new VNF package that reflects the same changes, an
      NOTE:	A VnfProfile, NsProfile or PnfProfile may contain multiple VersionDependencies as it may describe the version 
            alternative procedure using the PATCH method on the "Individual VNF instance" resource has been defined, as
            dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant
            illustrated in annex B.2 of ETSI GS NFV-IFA 007 [19]. This procedure assumes certain restrictions on the
            identifier.
            characteristics of the new VNF package, as defined in note 1 in table 5.5.2.2-1 of ETSI GS NFV-SOL 003.
      This type shall comply with the provisions defined in Table 6.5.3.54-1.
    type: object
    type: object
    required:
    required:
      - vnfInstanceId
      - vnfInstanceId
@@ -5972,6 +6055,20 @@ definitions:
          operation, and needed passed parameter values in case of conflicts, are defined in clause 5.4.11a.3.1 of ETSI
          operation, and needed passed parameter values in case of conflicts, are defined in clause 5.4.11a.3.1 of ETSI
          GS NFV-SOL 003.
          GS NFV-SOL 003.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
      overridingVersionDependency:
        description: >
          If present, information in each overridingVersionDependency replaces the versionDependency in the VnfProfile,
          NsProfile or PnfProfile indicated in the OverridingVersionDependency.

          Only the versionDependency in the VnfProfile, NsProfile or PnfProfile with the same dependentConstituentId as
          in the overridingVersionDependency is replaced. 
          See note.
          If no versionDependency with the dependentConstituentId indicated in the overridingVersionDependency exists
          in the VnfProfile, NsProfile or PnfProfile, the new versionDependency is added to the runtime information
          that the NFVO keeps about the profile.
        type: array
        items:
          $ref: "#/definitions/OverridingVersionDependency"


  DeleteVnfSnapshotData:
  DeleteVnfSnapshotData:
    description: >
    description: >