Merge branch '3.3.1-dev' into 'master' (87d16118) · Commits · NFV - Network Functions Virtualisation / SOL002-SOL003

.gitignore

+1 −1

Original line number	Original line	Diff line number	Diff line
	build/		build/
	*.pyc		*.pyc
			.idea/

Readme.md

+1 −1

Original line number	Original line	Diff line number	Diff line
	# NFV SOL002 and SOL003 APIs		# NFV SOL002 and SOL003 APIs

	This repository hosts the [OpenAPI](https://www.openapis.org/) specificatons and other documentation		This repository hosts the [OpenAPI](https://www.openapis.org/) specificatons and other documentation
	for the APIs defined in ETSI NFV GSs [SOL002](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_NFV-SOL002v020701p.pdf) and [SOL003](https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.07.01_60/gs_nfv-sol003v020701p.pdf).		for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v3.3.1.

	The APIs described in this repository are defined for the following reference points:		The APIs described in this repository are defined for the following reference points:

docker/Dockerfile

+4 −4

Original line number	Original line	Diff line number	Diff line
	# Copyright ETSI 2017		# Copyright ETSI 2017
	# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt		# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt

	FROM alpine:3.6		FROM alpine:3.10.0

	RUN env		RUN env
	RUN apk update		RUN apk update
	@@ -16,9 +16,9 @@ RUN gem install rdoc --pre \|\| gem install rdoc --pre
	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
	RUN npm install -g swagger-tools@0.10.3		RUN npm install -g swagger-cli
	RUN npm install -g json-refs@3.0.4		RUN npm install -g json-refs
	RUN npm install -g yamljs@0.3.0		RUN npm install -g yamljs

	ADD validate-in-docker.sh /validate-in-docker.sh		ADD validate-in-docker.sh /validate-in-docker.sh
	RUN chmod +x /validate-in-docker.sh		RUN chmod +x /validate-in-docker.sh

docker/validate-in-docker.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ function validate_api () {
	mv "${deliverable}-${api}-API.pdf" "../build/"		mv "${deliverable}-${api}-API.pdf" "../build/"

	echo "--- Validating ${merged_file}"		echo "--- Validating ${merged_file}"
	swagger-tools validate "${merged_file}"		swagger-cli validate "${merged_file}"
	vres=$?		vres=$?
	echo "--- Validation done ($vres)."		echo "--- Validation done ($vres)."

src/SOL002/APIVersion/APIVersion.yaml

+21 −40

Original line number	Original line	Diff line number	Diff line
	swagger: "2.0"		openapi: 3.0.2

	info:		info:
	version: "1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
	title: SOL002 - API version interface		title: SOL002 - API version interface
	description: >		description: \|
	SOL002 - API version Interface		SOL002 - API version Interface IMPORTANT: Please note that this file might be not aligned to the current version of
	IMPORTANT: Please note that this file might be not aligned to the current		the ETSI Group Specification it refers to and has not been approved by the ETSI NFV ISG. In case of discrepancies
	version of the ETSI Group Specification it refers to and has not been		the published ETSI Group Specification takes precedence.
	approved by the ETSI NFV ISG. In case of discrepancies the published ETSI		Please report bugs to https://forge.etsi.org/rep/nfv/SOL002-SOL003/issues
	Group Specification takes precedence.		contact:
	Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis		name: NFV-SOL WG
	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
	contact:		version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
	name: NFV-SOL WG

	externalDocs:		externalDocs:
	description: ETSI GS NFV-SOL 002 V2.7.1		description: ETSI GS NFV-SOL 002 V3.3.1
	url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.07.01_60/gs_nfv-sol002v020701p.pdf		url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.03.01_60/gs_NFV-SOL002v030301p.pdf

	schemes:
	- http
	- https

	consumes:
	- application/json

	produces:
	- application/json

	paths:		paths:
	###############################################################################		/vnfconfig/api_versions:
	# API Versions #		$ref: ../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions
	###############################################################################		/vnffm/api_versions:
	'/vnfconfig/api_versions':		$ref: ../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions
	$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'		/vnfind/api_versions:
			$ref: ../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions
	'/vnffm/api_versions':		/vnflcm/api_versions:
	$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'		$ref: ../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions
			/vnfpm/api_versions:
	'/vnfind/api_versions':		$ref: ../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions
	$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'		No newline at end of file

	'/vnflcm/api_versions':
	$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'

	'/vnfpm/api_versions':
	$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
	No newline at end of file

Admin message