merge 4.3.1-dev into Release-4 main branch

Giacomo Berninirequested to merge
4.3.1-dev into Release-4

Merge request reports

docker/Dockerfile

+1 −1
Changes for docker/Dockerfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ RUN apk add asciidoctor 
RUN apk add openjdk8

RUN apk add ca-certificates wget && update-ca-certificates 

RUN apk add openssl

RUN gem install rdoc --pre || gem install rdoc --pre

RUN gem install rdoc -v 6.3.3 || gem install rdoc -v 6.3.3

RUN gem install asciidoctor-pdf-cjk

RUN wget https://forge.etsi.org/swagger2markup-cli-1.3.2.jar

RUN npm config set proxy $http_proxy

src/SOL005/APIVersion/APIVersion.yaml

+3 −3
Changes for src/SOL005/APIVersion/APIVersion.yaml: 3 added lines, 3 removed lines.
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.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

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



externalDocs:

  description: ETSI GS NFV-SOL 005 V3.6.1

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

  description: ETSI GS NFV-SOL 005 V4.3.1

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



servers:

  - url: http://127.0.0.1/

src/SOL005/NFVICapacityInformation/definitions/NFVICapacityInformation_def.yaml

+12 −12

File changed.

Contains only whitespace changes.

src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml

+29 −3
Changes for src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml: 29 added lines, 3 removed lines.
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.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

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



externalDocs:

  description: ETSI GS NFV-SOL 005 V3.6.1

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

  description: ETSI GS NFV-SOL 005 V4.3.1

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

  

servers:

  - url: http://127.0.0.1/nfvici/v1
@@ -592,11 +592,37 @@ components: 
          explode: false

          schema:

            type: string

        Etag:

          description: The Etag of the response header.

          style: simple

          explode: false

          schema:

            type: string

        Last-Modified:

          description: The Etag of the response header.

          style: simple

          explode: false

          schema:

            type: string  

        If-Unmodified-Since:

          description: The If-Unmodified-Since of the response header. Available if in the previous response Last-Modified or ETag header was sent.

          style: simple

          explode: false

          schema:

            type: string

        If-Match:

          description: The If-Match of the response header. Available if in the previous response Last-Modified or ETag header was sent.

          style: simple

          explode: false

          schema:

            type: string

          

      content:

        application/json:

          schema:

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





    IndividualCapacityThreshold.Patch.412:

      description: |

        412 PRECONDITION FAILED

src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml

+3 −3
Changes for src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml: 3 added lines, 3 removed lines.
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.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1

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



externalDocs:

  description: ETSI GS NFV-SOL 005 V3.6.1

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

  description: ETSI GS NFV-SOL 005 V4.3.1

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



servers:

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