Commit 08cc532f authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '3.7.1-dev' into 'master'

3.7.1 dev

See merge request !6
parents fc28d2d4 144afcd2
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info:
  version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

externalDocs:
  description: ETSI GS NFV-SOL 009 V3.6.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.05.01_60/gs_NFV-SOL009v030501p.pdf
  description: ETSI GS NFV-SOL 009 V3.7.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.07.01_60/gs_NFV-SOL009v030701p.pdf

paths:
  /nfvmanocim/api_versions:
+14 −7
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: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

externalDocs:
  description: ETSI GS NFV-SOL 009 V3.6.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.06.01_60/gs_NFV-SOL009v030601p.pdf
  description: ETSI GS NFV-SOL 009 V3.7.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.07.01_60/gs_NFV-SOL009v030701p.pdf

servers:
  - url: http://127.0.0.1/nfvmanocim/v2
@@ -807,7 +807,10 @@ components:
      name: subscriptionId
      in: path
      description: >-
        Identifier of the subscription
        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 "Individual subscription" resource. It can also be 
        retrieved from the "id" attribute in the message content of that response.
      required: true
      schema:
        $ref: '../components/SOL009_schemas.yaml#/components/schemas/Identifier'
@@ -825,7 +828,11 @@ components:
      name: peerEntityId
      in: path
      description: >
        Identifier of the peer entity
        Identifier of the peer functional entity. This identifier can be retrieved 
        from the resource referenced by the "Location" HTTP header in the response 
        to a POST request creating a new "Individual peer entity" resource. 
        It can also be retrieved from the "id" attribute in the message content of 
        that response.
      required: true
      schema:
        $ref: '../components/SOL009_schemas.yaml#/components/schemas/Identifier'
@@ -1413,10 +1420,10 @@ components:
            maximum: 1
    Subscriptions.Post.422:
      description: >
        422 Unprocessable Entity
        422 Unprocessable Content

        Shall be returned upon the following error: The content type
        of the payload body is supported and the payload body of a request
        of the message content is supported and the message content of a request
        contains syntactically correct data but the data cannot be processed.

        The general cause for this error and its handling is specified in
+4 −2
Original line number Diff line number Diff line
@@ -735,11 +735,11 @@ components:
    PeerEntity:
      description: >
        This type represents an individual peer entity.
        * NOTE:     ETSI GS NFV-IFA 031 defines an additional attribute named "apiDiscoveryEndpoint" in the
                    PeerManoEntity. The modelling of this attribute is not specified in the present document version.
        * NOTE 1:	The value of the "peerEntityId" attribute is the same as the value of the "id" attribute in the
                    "ManoEntity" of the corresponding NFV-MANO functional entity that acts as peer entity, and shall
                    follow the uniqueness requirements set out in clause 5.6.2.2 for the "id" attribute.
        * NOTE 2:	ETSI GS NFV-IFA 031 [1] defines an additional attribute named "apiDiscoveryEndpoint" in the
                    PeerManoEntity. The modelling of this attribute is not specified in the present document version.
      type: object
      required:
        - id
@@ -1477,6 +1477,7 @@ components:

            Permitted values:
              - TLS_TUNNEL: Using TLS tunnel, as defined by TLS 1.2 in IETF RFC 5246.
              - TLS_TUNNEL_13: Using TLS tunnel, as defined by TLS 1.3 in IETF RFC 8446. 
              - OAUTH2: Using access token, as defined by the OAuth 2.0 specification
              in IETF RFC 6749.
          type: array
@@ -1568,6 +1569,7 @@ components:

            Permitted values:
            - TLS_TUNNEL: Using TLS tunnel, as defined by TLS 1.2 in IETF RFC 5246.
            - TLS_TUNNEL_13: Using TLS tunnel, as defined by TLS 1.3 in IETF RFC 8446.
            - OAUTH2: Using access token, as defined by the OAuth 2.0 specification
            in IETF RFC 6749.
          type: array
+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: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

externalDocs:
  description: ETSI GS NFV-SOL 009 V3.6.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.06.01_60/gs_NFV-SOL009v030601p.pdf
  description: ETSI GS NFV-SOL 009 V3.7.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.07.01_60/gs_NFV-SOL009v030701p.pdf

servers:
  - url: http://127.0.0.1/callback/v2
+7 −7
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info:
  version: 1.0.1-impl:etsi.org:ETSI_NFV_OpenAPI:1

externalDocs:
  description: ETSI GS NFV-SOL 009 V3.6.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.06.01_60/gs_NFV-SOL009v030601p.pdf
  description: ETSI GS NFV-SOL 009 V3.7.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.07.01_60/gs_NFV-SOL009v030701p.pdf

servers:
  - url: http://127.0.0.1/nfvmanofm/v1
@@ -162,7 +162,7 @@ paths:
        "406":
          $ref: ../components/SOL009_resp.yaml#/components/responses/406
        "422":
          $ref: ../components/SOL009_resp.yaml#/components/responses/422
          $ref: '#/components/responses/Subscriptions.Post.422'
        "500":
          $ref: ../components/SOL009_resp.yaml#/components/responses/500
        "503":
@@ -304,7 +304,7 @@ components:
        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
        attribute of the applicable array element in the message content of the
        response to a GET request to the "Alarms" resource.
      in: path
      required: true
@@ -316,7 +316,7 @@ components:
        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 "Individual subscription" resource.
        It can also be retrieved from the "id" attribute in the payload body
        It can also be retrieved from the "id" attribute in the message content
        of that response.
      in: path
      required: true
@@ -511,10 +511,10 @@ components:
            maximum: 1
    Subscriptions.Post.422:
      description: >
        422 Unprocessable Entity
        422 Unprocessable Content

        Shall be returned upon the following error: The content type
        of the payload body is supported and the payload body of a request
        of the message content is supported and the message content of a request
        contains syntactically correct data but the data cannot be processed.

        The general cause for this error and its handling is specified in
Loading