Commit c7d00ccb 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 !23
parents df8667a7 c17fad47

docker/Dockerfile

+2 −0
Changes for docker/Dockerfile: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ RUN apk add openjdk8 
RUN apk add ca-certificates wget && update-ca-certificates 

RUN apk add openssl

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

RUN gem install public_suffix -v 4.0.7

RUN gem install css_parser -v 1.12.00

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/SOL002/APIVersion/APIVersion.yaml

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



externalDocs:

  description: ETSI GS NFV-SOL 002 V4.5.1

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

  description: ETSI GS NFV-SOL 002 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf



paths:

  /vnfconfig/api_versions:

src/SOL002/General_Definitions/SOL002_def.yaml

+369 −31

File changed.

Preview size limit exceeded, changes collapsed.

src/SOL002/VNFConfiguration/VNFConfiguration.yaml

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



externalDocs:

  description: ETSI GS NFV-SOL 002 V4.5.1

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

  description: ETSI GS NFV-SOL 002 V5.1.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf



servers:

  - url: http://127.0.0.1/vnfconfig/v1

src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml

+1 −1
Changes for src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
# Copyright (c) ETSI 2017.

# Copyright (c) ETSI 2024.

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



definitions: