Commit 728e0e06 authored by Ayesha Ayub's avatar Ayesha Ayub
Browse files

resolve issues raised by Vlademir in SOL002 and SOL003 v3.7.1

parent 20e183cc
Loading
Loading
Loading
Loading
Loading
+0 −85
Original line number Diff line number Diff line
@@ -185,91 +185,6 @@ definitions:
        items:
          type: string

  VimConnectionInfo:
    description: >
      This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing
      the resources of a VNF instance.

      This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate 
      dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP
      repository may be configured into the VNFM by means outside the scope of the present document and
      bound to the identifier of that VIM.

      * NOTE 1:	If applicable, this attribute also provides information about the resourceGroupIds
                that are accessible using a particular set of credentials. See definition of
                "resourceGroupId" in clause 9.5.3.3.
      * NOTE 2:	Once the connectivity between VNFM and VIM, CISM, CIR or MCIOP repository is provided
                through a secure connection over HTTP Secure (HTTP over SSL/TLS), and the connection might also be
                established through a VPN (for example TLS-based VPN tunnelling) for site-to-site connection, the
                "accessInfo" JSON data structure, and the sensitive data related information ("username"/"password" as
                required properties for authentication purpose), will be transmitted as plain text through a TLS tunnel
                without additional encoding/encryption before transmitting it, making the sensitive data visible to the
                endpoint. The base64 encoded certificates are only used by the VNFM to verify the authenticity of the
                interface endpoint of the VIM., CISM, CIR or MCIOP repository.
    type: object
    required:
      - vimType
    properties:
      vimId:
        description: >
          The identifier of the VIM, CISM, CIR or MCIOP repository
          instance. This identifier is managed by the NFVO.
          Shall be present to address additional information about
          the VIM, CISM, CIR or MCIOP repository if such
          information has been configured into the VNFM by
          means outside the scope of the present document and
          should be absent otherwise.
        $ref: "#/definitions/Identifier"
      vimType:
        description: >
          Discriminator for the different types of the VIM
          information.
          The value of this attribute determines the structure of the
          "interfaceInfo" and "accessInfo" attributes, based on the
          type of the VIM., CISM, CIR or MCIOP repository.
          The set of permitted values is expected to change over
          time as new types or versions of VIMs become available.
          The ETSI NFV registry of VIM-related information [i.3]
          provides access to information about VimConnectionInfo
          definitions for various VIM, CISM, CIR or MCIOP
          repository types. The structure of the registry is defined in
          annex C.
        type: string
      interfaceInfo:
        description: >
          Information about the interface or interfaces to the VIM,
          CISM, CIR or MCIOP repository, if applicable, such as
          the URI of an interface endpoint to communicate with the
          VIM, CISM, CIR or MCIOP repository. The applicable
          keys are dependent on the content of vimType.
          Alternatively, such information may have been configured
          into the VNFM and bound to the vimId.
        $ref: "#/definitions/KeyValuePairs"
      accessInfo:
        description: >
          Authentication credentials for accessing the VIM, CISM,
          CIR or MCIOP repository and other access-related
          information such as tenants or infrastructure resource
          groups (see note 1). The applicable keys are dependent
          on the content of vimType.
          If the VimConnectionInfo structure is part of an HTTP
          response payload body, sensitive attributes that are
          children of this attributes (such as passwords) shall not
          be included.
          If the VimConnectionInfo structure is part of an HTTP
          request payload body, sensitive attributes that are
          children of this attribute (such as passwords) shall be
          present if they have not been provisioned out of band.
          See note 2.
        $ref: "#/definitions/KeyValuePairs"
      extra:
        description: >
          VIM, CISM, CIR or MCIOP repository type specific
          additional information. The applicable structure, and
          whether or not this attribute is available, is dependent on
          the content of vimType.
        $ref: "#/definitions/KeyValuePairs"

  ResourceHandle:
    required:
      - resourceId
+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ components:
      description: |
        Identifier of the alarm. This identifier can be retrieved from the "id" attribute of the "alarm" attribute
        in the AlarmNotification or AlarmClearedNotification. It can also be retrieved from the "id" attribute of
        the applicable array element in the payload body of the response to a GET request to the "Alarms" resource.
        the applicable array element in the message content of the response to a GET request to the "Alarms" resource.
      required: true
      style: simple
      explode: false
@@ -393,7 +393,7 @@ components:
      description: |
        Identifier of this subscription. This identifier can be retrieved from the resource referenced by the "Location"
        HTTP header in the response to a POST request creating a new subscription resource. It can also be retrieved
        from the "id" attribute in the payload body of that response.
        from the "id" attribute in the message content of that response.
      required: true
      style: simple
      explode: false
+4 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ components:
        Identifier of the VNF instance to which the VNF indicators applies.
        NOTE: This identifier can be retrieved from the resource referenced by the "Location" HTTP header in the
        response to a POST request creating a new VNF instance resource. It can also be retrieved from the "id"
        attribute in the payload body of that response.
        attribute in the message content of that response.
      required: true
      style: simple
      explode: false
@@ -354,6 +354,8 @@ components:
      in: path
      description: |
        Identifier of the VNF indicator.
        This identifier can be retrieved from the resource referenced by the message content in the response to a 
        POST request creating a new "Individual VNF instance" resource.
      required: true
      style: simple
      explode: false
@@ -367,7 +369,7 @@ components:
        Identifier of this subscription. NOTE:
        This identifier can be retrieved from the resource referenced by the "Location" HTTP header
        in the response to a POST request creating a new subscription resource. It can also be retrieved
        from the "id" attribute in the payload body of that response.
        from the "id" attribute in the message content of that response.
      required: true
      style: simple
      explode: false
+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ components:
      content:
        application/json:
          schema:
            $ref: ./definitions/SOL002VNFLifecycleCoordination_def.yaml#/definitions/LcmCoordRequest
            $ref: ./definitions/SOL002VNFLCMCoordination_def.yaml#/definitions/LcmCoordRequest
      required: true

  responses:
@@ -221,7 +221,7 @@ components:
      content:
        application/json:
          schema:
            $ref: ./definitions/SOL002VNFLifecycleCoordination_def.yaml#/definitions/LcmCoord
            $ref: ./definitions/SOL002VNFLCMCoordination_def.yaml#/definitions/LcmCoord

    Coordination_async.Post.202:
      description: |
@@ -418,7 +418,7 @@ components:
      content:
        application/json:
          schema:
            $ref: ./definitions/SOL002VNFLifecycleCoordination_def.yaml#/definitions/LcmCoord
            $ref: ./definitions/SOL002VNFLCMCoordination_def.yaml#/definitions/LcmCoord

    LcmCoord.Get.202:
      description: |
Loading