Commit 9a41ff58 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '4.3.1-dev' into 'Release-4'

merge 4.3.1-dev into Release-4 main branch

See merge request !21
parents a5199283 86c3df33
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ and the results will be stored in a `build/` directory in the project folder.


## How to raise issues
## How to raise issues


Change requests can be filed at [ETSI Forge Bugzilla](forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=62&product=NFV). Please report errors, bugs or other issues [here](https://forge.etsi.org/bugzilla/enter_bug.cgi?product=NFV).
Please report errors, bugs or other issues [here](https://forge.etsi.org/rep/nfv/SOL005/-/issues).


## How to contribute
## How to contribute


+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ RUN apk add asciidoctor
RUN apk add openjdk8
RUN apk add openjdk8
RUN apk add ca-certificates wget && update-ca-certificates 
RUN apk add ca-certificates wget && update-ca-certificates 
RUN apk add openssl
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 gem install asciidoctor-pdf-cjk
RUN wget https://forge.etsi.org/swagger2markup-cli-1.3.2.jar
RUN wget https://forge.etsi.org/swagger2markup-cli-1.3.2.jar
RUN npm config set proxy $http_proxy
RUN npm config set proxy $http_proxy
+3 −3
Original line number Original line Diff line number Diff line
@@ -16,11 +16,11 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    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:
externalDocs:
  description: ETSI GS NFV-SOL 005 V3.6.1
  description: ETSI GS NFV-SOL 005 V4.3.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.03.01_60/gs_NFV-SOL005v040301p.pdf


servers:
servers:
  - url: http://127.0.0.1/
  - url: http://127.0.0.1/
+43 −17
Original line number Original line Diff line number Diff line
@@ -16,11 +16,11 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    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:
externalDocs:
  description: ETSI GS NFV-SOL 005 V3.6.1
  description: ETSI GS NFV-SOL 005 V4.3.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.03.01_60/gs_NFV-SOL005v040301p.pdf
  
  
servers:
servers:
  - url: http://127.0.0.1/nfvici/v1
  - url: http://127.0.0.1/nfvici/v1
@@ -592,11 +592,37 @@ components:
          explode: false
          explode: false
          schema:
          schema:
            type: string
            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:
      content:
        application/json:
        application/json:
          schema:
          schema:
            $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/CapacityThresholdModifications
            $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/CapacityThresholdModifications



    IndividualCapacityThreshold.Patch.412:
    IndividualCapacityThreshold.Patch.412:
      description: |
      description: |
        412 PRECONDITION FAILED
        412 PRECONDITION FAILED
+3 −3
Original line number Original line Diff line number Diff line
@@ -16,11 +16,11 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    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:
externalDocs:
  description: ETSI GS NFV-SOL 005 V3.6.1
  description: ETSI GS NFV-SOL 005 V4.3.1
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/03.06.01_60/gs_nfv-sol005v030601p.pdf
  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.03.01_60/gs_NFV-SOL005v040301p.pdf


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