Merge branch 5.3.1 into Release-5

Bertrand Souvillerequested to merge
5.3.1 into Release-5

Merge request reports

src/SOL005/APIVersion/APIVersion.yaml

+2 −2
Changes for src/SOL005/APIVersion/APIVersion.yaml: 2 added lines, 2 removed lines.
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 V5.2.1

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

  description: ETSI GS NFV-SOL 005 V5.3.1

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



servers:

  - url: http://127.0.0.1/

src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml

+4 −6
Changes for src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml: 4 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V5.2.1

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

  description: ETSI GS NFV-SOL 005 V5.3.1

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

  

servers:

  - url: http://127.0.0.1/nfvici/v1
@@ -152,11 +152,9 @@ paths: 
      - $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.

        The API consumer can use this method for reading an individual CCM's NFVI capacity information.

        See clause 10.4.3a.3.2.



        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

src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml

+2 −2
Changes for src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 005 V5.2.1

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

  description: ETSI GS NFV-SOL 005 V5.3.1

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



servers:

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

src/SOL005/NSDManagement/NSDManagement.yaml

+15 −15
Changes for src/SOL005/NSDManagement/NSDManagement.yaml: 15 added lines, 15 removed lines.
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 V5.2.1

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

  description: ETSI GS NFV-SOL 005 V5.3.1

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



servers:

  - url: http://127.0.0.1/nsd/v2
@@ -37,7 +37,7 @@ paths: 
  # NS Descriptors                                                              #

  ###############################################################################

  /ns_descriptors:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.2

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.2

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Version
@@ -128,7 +128,7 @@ paths: 
  # Individual NS Descriptor                                                    #

  ###############################################################################

  /ns_descriptors/{nsdInfoId}:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.3

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.3

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
@@ -229,7 +229,7 @@ paths: 
  # NSD Archive Content                                                         #

  ###############################################################################

  /ns_descriptors/{nsdInfoId}/nsd_content:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.4

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
@@ -323,7 +323,7 @@ paths: 
  # NSD                                                                         #

  ###############################################################################

  /ns_descriptors/{nsdInfoId}/nsd:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4a

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.4a

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
@@ -363,7 +363,7 @@ paths: 
  # NSD Archive Manifest                                                        #

  ###############################################################################

  /ns_descriptors/{nsdInfoId}/manifest:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.4b

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.4b

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
@@ -371,7 +371,7 @@ paths: 


    get:

      description: |

        The GET method reads the content of the manifest file within an NSD archive. See clasue 5.4.4b.3.2.

        The GET method reads the content of the manifest file within an NSD archive. See clause 5.4.4b.3.2.

      parameters:

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

        - in: query
@@ -413,7 +413,7 @@ paths: 
  # Individual NSD Archive Artifact                                             #

  ###############################################################################

  /ns_descriptors/{nsdInfoId}/artifacts/{artifactPath}:

    #ETSI GS NFV-SOL 005 V3.5.1 location: 5.4.4c

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.4c

    parameters:

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

      - $ref: '#/components/parameters/ArtifactPathInNSD'
@@ -465,7 +465,7 @@ paths: 
  # PNF Descriptors                                                             #

  ###############################################################################

  /pnf_descriptors:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.5

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.5

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Version
@@ -556,7 +556,7 @@ paths: 
  # Individual PNF Descriptor                                                   #

  ###############################################################################

  /pnf_descriptors/{pnfdInfoId}:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.6

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.6

    parameters:

      - $ref: '#/components/parameters/PnfdInfoId'
@@ -653,7 +653,7 @@ paths: 
  # PNFD Archive Content                                                        #

  ###############################################################################

  /pnf_descriptors/{pnfdInfoId}/pnfd_content:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.7

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.7

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
@@ -736,7 +736,7 @@ paths: 
  # PNFD                                                                        #

  ###############################################################################

  /pnf_descriptors/{pnfdInfoId}/pnfd:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.7a

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.7a

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
@@ -777,7 +777,7 @@ paths: 
  # PNFD Archive Manifest                                                       #

  ###############################################################################

  /pnf_descriptors/{pnfdInfoId}/manifest:

    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.7b

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.7b

    parameters:

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

      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
@@ -829,7 +829,7 @@ paths: 
  # Individual PNFD Archive Artifact                                            #

  ###############################################################################

  /pnf_descriptors/{pnfdInfoId}/artifacts/{artifactPath}:

    #ETSI GS NFV-SOL 005 V3.5.1 location: 5.4.7c

    #ETSI GS NFV-SOL 005 V5.2.1 location: 5.4.7c

    parameters:

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

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

src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml

+2 −2
Changes for src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml: 2 added lines, 2 removed lines.
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 V5.2.1

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

  description: ETSI GS NFV-SOL 005 V5.3.1

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



servers:

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