Commit bde06d2e authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '5.1.1-dev' into 'Release-5' 

merge 5.1.1-dev into Release-5

See merge request !25
parents 762a6c3b 7370e56f

src/SOL005/APIVersion/APIVersion.yaml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.5.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf

  description: ETSI GS NFV-SOL 005 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf



servers:

  - url: http://127.0.0.1/

src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml

+103 −6
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ info: 
  license:

    name: ETSI Forge copyright notice

    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt

  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

  version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.5.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf

  description: ETSI GS NFV-SOL 005 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf

  

servers:

  - url: http://127.0.0.1/nfvici/v1
@@ -145,6 +145,58 @@ paths: 
        "504":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/504



  /nfvi_capacity_infos/ccm/{ccmId}:

    parameters:

      - $ref: '#/components/parameters/CcmId' 

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Version

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization

    get:

      description: |

        This method shall follow the provisions specified in the tables 10.4.3a.3.2-1 and 10.4.3a.3.2-2 for 

        URI query parameters, request and response data structures, and response codes.



        NOTE: This identifier can be retrieved from the "ccmId" attribute in the CapacityShortageNotification. 

        It can also be retrieved from the "ccmId" attribute in the message content of the response.

      parameters:

        - in: query

          name: filter

          description: >

            Attribute-based filtering expression according to clause 5.2 of ETSI GS NFV-SOL 013. 

            The NFVO shall support receiving this parameter as part of the URI query string. 

            The OSS/BSS may supply this parameter. If the OSS/BSS does not supply a filter value 

            for the timeInterval attribute in the NfviCapacityInfo, a query of the current NFVI 

            capacity information available by the NFVO is requested. The following attribute names 

            in the NfviCapacityInfo shall be supported by the NFVO in the filter expression:

            - cisClusterId

            - timeInterval

            - resourceType

            - capacityMeasurementName

            - capacity values: {totalCapacity, allocatedCapacity, reservedCapacity, availableCapacity}

          schema:

            type: string

        - $ref: ../components/SOL005_params.yaml#/components/parameters/Accept

      responses:

        "200":

          $ref: '#/components/responses/CcmNfviCapacityInfo.Get.200'

        "400":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/400

        "401":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/401

        "403":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/403

        "404":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/404

        "405":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/405

        "406":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/406

        "500":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/500

        "503":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/503

        "504":

          $ref: ../responses/SOL005_resp.yaml#/components/responses/504



  /capacity_thresholds:

    parameters:

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Version
@@ -313,8 +365,8 @@ components: 
      name: vimId

      in: path

      description: |

        Identifier of the VIM with associated NFVI capacity information.

        This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification.

        Identifier of the VIM with associated NFVI capacity information. See note.

        * NOTE: This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification.

                It can also be retrieved from the "vimId" attribute in the message content of the response.

      required: true

      style: simple
@@ -322,6 +374,19 @@ components: 
      schema:

        type: string



    CcmId:

      name: ccmId

      in: path

      description: |

        Identifier of the CCM with associated NFVI capacity information. See note.

        * NOTE: This identifier can be retrieved from the "ccmId" attribute in the CapacityShortageNotification. It can also be

                retrieved from the "ccmId" attribute in the message content of the response. 

      required: true

      style: simple

      explode: false

      schema:

        type: string



    CapacityThresholdId:

      name: capacityThresholdId

      in: path
@@ -425,6 +490,38 @@ components: 
          schema:

            $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/NfviCapacityInfo





    CcmNfviCapacityInfo.Get.200:

      description: |

        Shall be returned when information of an individual CCM's NFVI capacity has been read successfully.

        The response body shall contain a representation of the NFVI capacity information, as defined in clause 10.5.2.4.

      headers:

        Version:

          description: |

            Version of the API used in the response.

          style: simple

          explode: false

          schema:

            type: string

        WWW-Authenticate:

          description: |

            Challenge if the corresponding HTTP request has not provided authorization, or error details if the

            corresponding HTTP request has provided an invalid authorization token.

          style: simple

          explode: false

          schema:

            type: string

        Content-Type:

          description: The MIME type of the body of the response.

          style: simple

          explode: false

          schema:

            type: string

      content:

        application/json:

          schema:

            $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/NfviCapacityInfo



    CapacityThresholds.Get.200:

      description: |

        Shall be returned when information about zero or more capacity thresholds has been queried successfully.

src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ info: 
  license:

    name: ETSI Forge copyright notice

    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt

  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

  version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.5.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf

  description: ETSI GS NFV-SOL 005 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf



servers:

  - url: http://127.0.0.1/callback/v1

src/SOL005/NSDManagement/NSDManagement.yaml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.5.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf

  description: ETSI GS NFV-SOL 005 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf



servers:

  - url: http://127.0.0.1/nsd/v2

src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V4.5.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf

  description: ETSI GS NFV-SOL 005 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf



servers:

  - url: http://127.0.0.1/callback/v2