Commit 099b2c68 authored by Pietro Piscione's avatar Pietro Piscione
Browse files

SOL005_10 to SOL005_16 both included

parent af35b61d
Loading
Loading
Loading
Loading
+100 −10
Original line number Original line Diff line number Diff line
@@ -3060,6 +3060,13 @@ definitions:
              instantiating scalable constituents of the VNF (e.g. VDUs/VLs). For scaling aspects not specified in
              instantiating scalable constituents of the VNF (e.g. VDUs/VLs). For scaling aspects not specified in
              "targetScaleLevelInfo" or for the VNF constituents (e.g. VDUs/VLs) that are not scalable, the default
              "targetScaleLevelInfo" or for the VNF constituents (e.g. VDUs/VLs) that are not scalable, the default
              instantiation level as declared in the VNFD shall be used for instantiation.
              instantiation level as declared in the VNFD shall be used for instantiation.
      NOTE 5: If the referenced targetScaleLevelInfo attribute contain information related to VNFCs
              that will not be instantiated due to the selection of deployable modules, when passed
              to the VNFM, the information is stored in the VNFM for later use and included in the
              instantiatedVnfInfo, as described in clause 5.5.2.4 of ETSI GS NFV-SOL 003.
      NOTE 6: When the ParamsForVnf information element is used in as part of AssocNewNsdVersionData it can be 
              applied to already existing VNF instances.

    type: object
    type: object
    required:
    required:
      - vnfProfileId
      - vnfProfileId
@@ -3103,12 +3110,11 @@ definitions:
          level instantiation.
          level instantiation.
          For each scaling aspect of the current deployment
          For each scaling aspect of the current deployment
          flavour, the attribute specifies the scale level of VNF
          flavour, the attribute specifies the scale level of VNF
          constituents (e.g. VDU level) to be instantiated. See note 4
          constituents (e.g. VDU level) to be instantiated. 
          See notes 4 and 5.
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/VnfScaleInfo"
          $ref: "#/definitions/VnfScaleInfo"
      
      
      vnfInstanceName:
      vnfInstanceName:
        description: >
        description: >
          Human-readable name of the VNF instance to be created.
          Human-readable name of the VNF instance to be created.
@@ -3151,8 +3157,18 @@ definitions:
          Additional input parameters for the instantiation process,
          Additional input parameters for the instantiation process,
          specific to the VNF being instantiated, as declared in the
          specific to the VNF being instantiated, as declared in the
          VNFD as part of "InstantiateVnfOpConfig" defined in ETSI GS 
          VNFD as part of "InstantiateVnfOpConfig" defined in ETSI GS 
          NFV-IFA 011 [29].
          NFV-IFA 011.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
      selectedDeployableModule:
        description: >
          References a selected deployable module, as defined in
          the VNFD. Only VNFCs based on VDUs that belong to
          deployable modules listed in this attribute are requested
          to be instantiated or preserved if they were already
          instantiated. See note 6
        type: array
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"


  LocationConstraints:
  LocationConstraints:
    description: >
    description: >
@@ -4088,6 +4104,15 @@ definitions:
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/OverridingVersionDependency"
          $ref: "#/definitions/OverridingVersionDependency"
      selectedDeployableModule:
        description: >
          References a selected deployable module, as
          defined in the VNFD. Only VNFCs based on
          VDUs that belong to deployable modules listed in
          this attribute are requested to be instantiated.
        type: array
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"






@@ -4182,6 +4207,25 @@ definitions:
          operation defined in ETSI GS NFV-SOL 003.
          operation defined in ETSI GS NFV-SOL 003.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"


      selectedDeployableModule:
        description: >
          References a selected deployable module, as defined in
          the VNFD. Only VNFCs based on VDUs that belong to
          deployable modules listed in this attribute are requested
          to be instantiated or preserved if they were already
          instantiated.
        type: array
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      certificateConfigurationData:
        description: >
          Configuration for certificate management such as
          certificate profile and security policy in this VNF. Can be
          present when setting a new certificate to the VNF
          instance in delegation mode. Otherwise shall not be
          present.
        $ref: "#/definitions/CertificateConfigurationData"

  OperateVnfData:
  OperateVnfData:
    description: >
    description: >
      This type represents a VNF instance for which the operational state 
      This type represents a VNF instance for which the operational state 
@@ -4337,6 +4381,14 @@ definitions:
          the external connectivity change process, specific to the
          the external connectivity change process, specific to the
          VNF instance being changed.
          VNF instance being changed.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
      certificateConfigurationData:
        description: >
          Configuration for certificate management such as
          certificate profile and security policy in this VNF. Can be
          present when setting a new certificate to the VNF
          instance in delegation mode. Otherwise shall not be
          present.
        $ref: "#/definitions/CertificateConfigurationData"


  AssocNewNsdVersionData:
  AssocNewNsdVersionData:
    description: >
    description: >
@@ -4699,6 +4751,14 @@ definitions:
          Identifier of the instantiation level of the deployment flavour to be instantiated.
          Identifier of the instantiation level of the deployment flavour to be instantiated.
          If not present, the default instantiation level as declared in the NSD is instantiated.
          If not present, the default instantiation level as declared in the NSD is instantiated.
        $ref: "#/definitions/IdentifierInNsd"
        $ref: "#/definitions/IdentifierInNsd"
      deployableModulesInConstituentVnf:
        description: >
          Indicates the selected deployable modules of a VNF instance which is a constituent
          of the NS instance. If this attribute is not present, the deployable modules
          that were selected in the VNF instance prior to the NS LCM operation remain valid.
        type: array
        items:
          $ref: "#/definitions/DeployableModulesInConstituentVnf"


  AddPnfData:
  AddPnfData:
    description: >
    description: >
@@ -5898,7 +5958,12 @@ 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 vnfInstantiationLevelId attribute or the vnfScaleInfo attribute shall be included.
      
      NOTE 1: Either the vnfInstantiationLevelId attribute or the vnfScaleInfo attribute shall be included.
      NOTE 2: If the referenced instantiationLevel or the scaleInfo attribute contain information related to VNFCs that are not
              going to be instantiated due to the selection of deployable modules, when passed to the VNFM, the information
              is stored in the VNFM for later use and included in the instantiatedVnfInfo, as described in clause 5.5.2.6 of
              ETSI GS NFV-SOL 003.
    type: object
    type: object
    anyOf:
    anyOf:
      - required:
      - required:
@@ -5909,13 +5974,13 @@ definitions:
      vnfInstantiationLevelId:
      vnfInstantiationLevelId:
        description: >
        description: >
          Identifier of the target instantiation level of the current
          Identifier of the target instantiation level of the current
          deployment flavor to which the VNF is requested to be scaled. See note.
          deployment flavor to which the VNF is requested to be scaled. See notes 1 and 2.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      vnfScaleInfo:
      vnfScaleInfo:
        description: >
        description: >
          For each scaling aspect of the current deployment
          For each scaling aspect of the current deployment
          flavor, indicates the target scale level to which the VNF
          flavor, indicates the target scale level to which the VNF
          is to be scaled. See note.
          is to be scaled. See notes 1 and 2.
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/VnfScaleInfo"
          $ref: "#/definitions/VnfScaleInfo"
@@ -7273,9 +7338,12 @@ definitions:
      * 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: A VnfProfile, NsProfile or PnfProfile may contain multiple VersionDependencies as it may describe the version 
      NOTE 1: A VnfProfile, NsProfile or PnfProfile may contain multiple VersionDependencies as it may describe the version 
              dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant
              dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant
              identifier.
              identifier.
      NOTE 2: Component mappings are defined in the VNFD in the source or destination package for the relevant change
              path. See clause 7.1.15.2 in ETSI GS NFV-IFA 011.
          
    type: object
    type: object
    required:
    required:
      - vnfInstanceId
      - vnfInstanceId
@@ -7335,6 +7403,28 @@ definitions:
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/OverridingVersionDependency"
          $ref: "#/definitions/OverridingVersionDependency"
      selectedDeployableModule:
        description: >
          References a selected deployable module, as defined in the VNFD.
          If this attribute is present only VNFCs based on VDUs that belong to deployable 
          modules listed in this attribute are requested to be instantiated or preserved 
          if they were already instantiated.
          If this attribute is not present the deployable modules that were selected before
          the operation, and that still are defined in the VNFD in the destination package,
          or the corresponding ones according to the component
          mappings, remain valid. See note 2.
        type: array
        items:
         $ref: "#/definitions/IdentifierInVnf"
      certificateConfigurationData: 
          description: >
            Configuration for certificate management such as
            certificate profile and security policy in this VNF. Can be
            present when setting a new certificate to the VNF
            instance in delegation mode. Otherwise shall not be
            present
          $ref: "#/definitions/CertificateConfigurationData"



  DeleteVnfSnapshotData:
  DeleteVnfSnapshotData:
    description: >
    description: >