Commit c43d91f5 authored by Samir Medjiah's avatar Samir Medjiah
Browse files

SOL003: v308 updates : SupportedIndicatorsChangeNotification added and minor fixes

parent f02f557c
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ components:
      description: |
        200 OK

        The list of subscriptions has been queried successfully.
        Shall be returned when the list of subscriptions has been queried successfully.
        The response body shall contain in an array the representations of all active subscriptions
        of the functional block that invokes the method, i.e. zero or more representations of
        FM subscriptions as defined in clause 7.5.2.3.
+3 −1
Original line number Diff line number Diff line
@@ -105,7 +105,9 @@ components:
      content:
        application/json:
          schema:
            $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorValueChangeNotification
            oneOf:
              - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorValueChangeNotification
              - $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/SupportedIndicatorsChangeNotification
      required: true
  
  responses:
+42 −15
Original line number Diff line number Diff line
@@ -189,13 +189,17 @@ definitions:
      vnfInstanceId:
        description: >
          Identifier of the related VNF instance.
          The NFVO shall set the value of the attribute by copying the value 
          from the associated GrantRequest.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      vnfLcmOpOccId:
        description: >
          Identifier of the related VNF lifecycle management operation
          occurrence.
          The NFVO shall set the value of the attribute by copying the value 
          from the associated GrantRequest.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      vimConnections:
      vimConnectionInfo:
        description: >
          Provides information regarding VIM connections that are approved to
          be used by the VNFM to allocate resources, and provides parameters
@@ -203,7 +207,7 @@ definitions:
          The VNFM shall update the " vimConnectionInfo" attribute of the
          "VnfInstance" structure by adding unknown entries received in this
          attribute.
          This attribute is not intended for the modification of VimConnection
          This attribute is not intended for the modification of vimConnectionInfo
          entries passed earlier; for that, the VnfInfoModificationRequest
          structure shall be used.
          This attribute shall only be supported when VNF-related Resource
@@ -239,7 +243,7 @@ definitions:
      addResources:
        description: >
          List of resources that are approved to be added, with one entry per
          resource.
          resource. Shall be set when resources are approved to be added.
        type: array
        items:
          $ref: "#/definitions/GrantInfo"
@@ -247,21 +251,22 @@ definitions:
        description: >
          List of resources that are approved to be temporarily instantiated
          during the runtime of the lifecycle operation, with one entry per
          resource.
          resource. Shall be set when resources are approved to be temporarily 
          instantiated.
        type: array
        items:
          $ref: "#/definitions/GrantInfo"
      removeResources:
        description: >
          List of resources that are approved to be removed, with one entry
          per resource.
          per resource. Shall be set when resources are approved to be removed.
        type: array
        items:
          $ref: "#/definitions/GrantInfo"
      updateResources:
        description: >
          List of resources that are approved to be modified, with one entry
          per resource.
          per resource. Shall be set when resources are approved to be updated.
        type: array
        items:
          $ref: "#/definitions/GrantInfo"
@@ -319,15 +324,29 @@ definitions:
          externally-managed VL instances that have been passed previously in the 
          associated VNF lifecycle management request, if the lifecycle management request
          has originated from the NFVO itself.
          In case of granting an InstantiateVnf request that has originated from the NFVO 
          and that did not contain the "extVirtualLinks" attribute, this attribute shall be 
          set by the NFVO. Further in case of granting an InstantiateVnf request that has 
          originated from the NFVO and that did not contain the "extManagedVirtualLinks" 
          attribute, this attribute shall be set by the NFVO if there is the need to provide 
          information about externally-managed virtual links.

          If this attribute is present , it need not contain
          those entries that are unchanged compared to the entries that were passed
          in the LCM operation which is related to this granting exchange.
          External and/or externally-managed internal VLs can be passed in
          VNF lifecycle management operation requests such as InstantiateVnf
          or ChangeVnfFlavour, and/or in the grant response. The NFVO may choose
          to override in the grant response external and/or externally-managed VL
          instances that have been passed previously in the associated VNF lifecycle
          management request, if the lifecycle management request has originated from the NFVO itself.
          External and/or externally-managed internal VLs can be passed in VNF
          lifecycle management operation requests such as InstantiateVnf, ChangeVnfFlavor, 
          ChangeExtVnfConnectivity or ChangeCurrentVnfPackage and/or in the grant response. 
          The NFVO may choose to override in the grant response external and/or 
          externally-managed VL instances that have been passed previously in the 
          associated VNF lifecycle management request, if the lifecycle management request
          has originated from the NFVO itself.
          In case of granting an InstantiateVnf request that has originated from the NFVO 
          and that did not contain the "extVirtualLinks" attribute, this attribute shall be 
          set by the NFVO. Further in case of granting an InstantiateVnf request that has 
          originated from the NFVO and that did not contain the "extManagedVirtualLinks" 
          attribute, this attribute shall be set by the NFVO if there is the need to provide 
          information about externally-managed virtual links.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData"
@@ -349,6 +368,12 @@ definitions:
          externally-managed VL instances that have been passed previously in the 
          associated VNF lifecycle management request, if the lifecycle management request
          has originated from the NFVO itself.
          In case of granting an InstantiateVnf request that has originated from the NFVO 
          and that did not contain the "extVirtualLinks" attribute, this attribute shall be 
          set by the NFVO. Further in case of granting an InstantiateVnf request that has 
          originated from the NFVO and that did not contain the "extManagedVirtualLinks" 
          attribute, this attribute shall be set by the NFVO if there is the need to provide 
          information about externally-managed virtual links.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtManagedVirtualLinkData"
@@ -421,9 +446,11 @@ definitions:
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      resourceTemplateId:
        description: >
          Reference to a resource template (VnfVirtualLinkDesc,
          VirtualComputeDesc, VnfExtCpd, VirtualStorageDesc) in the
          VNFD.
          Reference to the applicable resource template in the VNFD as follows:
            - if type="VL" : VnfVirtualLinkDesc
            - if type="COMPUTE": VirtualComputeDesc
            - if type="LINKPORT" : VnfExtCpd
            - if type="STORAGE" : VirtualStorageDesc
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
      resource:
        description: >
+37 −14
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ definitions:

  VnfPackageSoftwareImageInfo:
    description: >
      This type represents an artifact contained in a VNF package which
      This type represents an artifact contained in or external to a VNF package which
      represents a software image.
    type: object
    required:
@@ -244,7 +244,6 @@ definitions:
      - minDisk
      - minRam
      - size
      - imagePath
    properties:
      id:
        description: >
@@ -346,14 +345,38 @@ definitions:
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      imagePath:
        description: >
          Path in the VNF package, which identifies the image artifact and also
          Path which identifies the image artifact and also
          allows to access a copy of the image artifact.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
          For a software image contained as a file in the VNF
          package, this attribute shall be present, and the value of
          this attribute shall start with the name of the first segment
          in the path in the package, i.e., it shall not be prefixed by
          path separator characters such as "." and "/".
          EXAMPLE: foo/bar/m%40ster.vhd
          For an external software image represented as a URI in
          the VNF descriptor, this attribute shall be present if the 
          image artifact has been downloaded by the NFVO and
          shall be absent otherwise. If present, it shall contain the
          artifactPath under which the image artifact can be
          obtained using the "Individual artifact in a VNF package"
          resource defined in clause 9.4.7. It is the responsibility of
          the NFVO to synthesize this path in a manner that avoids
          any collision of the synthesized artifact path with the
          paths and names of image artifacts included in the
          package.
        type: string
      imageUri:
        description: >
          URI of the image artifact as defined in the VNF package
          manifest. Shall be present if the image artifact is external
          to the VNF package and shall be absent otherwise.
          EXAMPLE: https://example.com/m%40ster.vhd
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"

  VnfPackageArtifactInfo:
    description: >
      This type represents an artifact other than a software image which is
      contained in a VNF package.
      contained in or external to a VNF package.
    type: object
    required:
      - artifactPath
@@ -384,15 +407,6 @@ definitions:
          collision of the synthesized artifact path with the paths
          and names of artifacts included in the package.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
      checksum:
        description: >
          Checksum of the artifact file.
          Permitted hash algorithms are defined in ETSI GS NFV-SOL 004.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum"
      isEncrypted:
        description: >
          Reflects whether the artifact is encrypted (true) or not (false).
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean"
      artifactURI:
        description: >
          URI of the artifact as defined in the VNF package manifest.
@@ -403,6 +417,15 @@ definitions:
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
      checksum:
        description: >
          Checksum of the artifact file.
          Permitted hash algorithms are defined in ETSI GS NFV-SOL 004.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum"
      isEncrypted:
        description: >
          Reflects whether the artifact is encrypted (true) or not (false).
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean"
      nonManoArtifactSetId:
        description: >
          Non-MANO artifact set identifier of the non-MANO artifact set to
+6 −6
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ components:

        EXAMPLE: foo/bar/m%40ster.sh

        For an external artefact represented as a URI in the VNF snapshot package manifest, this variable shall 
        For an external artifact represented as a URI in the VNF snapshot package manifest, this variable shall 
        contain a sequence of one or more path segments as synthesized by the NFVO (see clause 12.5.3.3) representing 
        this artifact.

@@ -334,7 +334,7 @@ components:
        The response body shall include a copy of the VNF snapshot package file. 
        
        The "Content-Type" HTTP header shall be set according to the type of the file, i.e. to "application/zip" 
        for a VNF snapshot package as defined in ETSI GS NFV-SOL 010.
        for a VNF snapshot package. The VNF snapshot package format is defined in ETSI GS NFV-SOL 010.
      headers:
        Version:
          description: The used API version.
@@ -412,8 +412,8 @@ components:

        Shall be returned when the whole content of the artifact file has been read successfully.

        The response body shall include a copy of the artifact file from the VNF snapshot package, 
        as defined by ETSI GS NFV-SOL 010.
        The response body shall include a copy of the artifact file from the VNF snapshot package. 
        The VNF snapshot package format is defined in ETSI GS NFV-SOL 010.

        The "Content-Type" HTTP header shall be set according to the content type of the artifact file. 
        If the content type cannot be determined, the header shall be set to the value "application/octet-stream".        
@@ -451,8 +451,8 @@ components:
        If the NFVO supports range requests, this response shall be returned when a single consecutive byte range 
        from the content of the artifact file has been read successfully according to the request.

        The response body shall contain the requested part of the artifact file from the VNF snapshot package, 
        as defined by ETSI GS NFV-SOL 010.
        The response body shall contain the requested part of the artifact file from the VNF snapshot package.
        The VNF snapshot package is defined in ETSI GS NFV-SOL 010.

        The "Content-Type" HTTP header shall be set according to the content type of the artifact file. If the 
        content type cannot be determined, the header shall be set to the value "application/octet-stream".
Loading