fix minor issues in SOL002 VNFConfAPI and def.yaml (8e7b61f3) · Commits · NFV - Network Functions Virtualisation / SOL002-SOL003

src/SOL002/General_Definitions/SOL002_def.yaml

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -46,23 +46,23 @@ definitions:
	type: object		type: object
	properties:		properties:
	overridingCertificateProfile:		overridingCertificateProfile:
	type: array
	items:
	$ref: '#/definitions/CertificateBaseProfile'
	description: >		description: >
	Overriding certificate profile. This overrides the certificateBaseProfile provided		Overriding certificate profile. This overrides the certificateBaseProfile provided
	in the VNFD, and the CA and CMF can additionally override aspects of this certificateBaseProfile		in the VNFD, and the CA and CMF can additionally override aspects of this certificateBaseProfile
	at later point in the VNF lifecycle if necessary to meet operator security policy.		at later point in the VNF lifecycle if necessary to meet operator security policy.
	securityPolicy:
	type: array		type: array
	items:		items:
	$ref: '#/definitions/SecurityPolicy'		$ref: '#/definitions/CertificateBaseProfile'
			securityPolicy:
	description: >		description: >
	Security policy to be satisfied for certificate.		Security policy to be satisfied for certificate.
			type: array
			items:
			$ref: '#/definitions/SecurityPolicy'
	cmfData:		cmfData:
	$ref: '#/definitions/CmfData'
	description: >		description: >
	Information for CMF.		Information for CMF.
			$ref: '#/definitions/CmfData'

	CmfData:		CmfData:
	description: >		description: >
	@@ -168,11 +168,11 @@ definitions:
	description: >		description: >
	Supported protocol by CMF instance.		Supported protocol by CMF instance.
	certificateChain:		certificateChain:
			description: >
			Certificate chain that this CMF provides.
	type: array		type: array
	items:		items:
	$ref: '#/definitions/KeyValuePairs'		$ref: '#/definitions/KeyValuePairs'
	description: >
	Certificate chain that this CMF provides.

	ApiVersionInformation:		ApiVersionInformation:
	description: >		description: >
	@@ -933,9 +933,9 @@ definitions:
	Identifier of this certificate information.		Identifier of this certificate information.
	$ref: "#/definitions/Identifier"		$ref: "#/definitions/Identifier"
	certificateConfigurationInfo:		certificateConfigurationInfo:
	$ref: '#/definitions/CertificateConfigurationInfo'
	description: >		description: >
	Configuration for certificate management such as certificate profile, information of CMF, and security policy.		Configuration for certificate management such as certificate profile, information of CMF, and security policy.
			$ref: '#/definitions/CertificateConfigurationInfo'
	certificateContents:		certificateContents:
	description: >		description: >
	Information for contents of issued certificates. The information contained in this attribute may be updated over time during the VNF		Information for contents of issued certificates. The information contained in this attribute may be updated over time during the VNF

src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -95,8 +95,8 @@ definitions:
	VnfcConfigurationData:		VnfcConfigurationData:
	description: >		description: >
	This type represents configuration parameters of a VNFC instance.		This type represents configuration parameters of a VNFC instance.
	* NOTE: ETSI GS NFV-SOL 001 specifies the structure and format
	of the VNFD based on TOSCA specifications.		NOTE: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
	type: object		type: object
	required:		required:
	- vnfcInstanceId		- vnfcInstanceId
	@@ -128,14 +128,15 @@ definitions:
	CertificateData:		CertificateData:
	description: >		description: >
	This type provides input information related to subject of certificate.		This type provides input information related to subject of certificate.
	* NOTE: NOTE : Either set of “privatekey” and “certificateFile” or “keystoreFile” but not both shall be present.
	tyoe: object		NOTE : Either set of “privatekey” and “certificateFile” or “keystoreFile” but not both shall be present.
			type: object
	properties:		properties:
	privateKey:		privateKey:
	type: string		type: string
	description: >		description: >
	Private key paired with the signed public key. VNFM shall generate both the private key and public key and set		Private key paired with the signed public key. VNFM shall generate both the private key and
	this attribute. See note.		public key and set this attribute. See note.
	certificateFile:		certificateFile:
	type: string		type: string
	description: >		description: >
	@@ -146,9 +147,9 @@ definitions:
	Keystore which includes the private key, signed certificate, and certificate chain (e.g., pkcs#12, pfx).		Keystore which includes the private key, signed certificate, and certificate chain (e.g., pkcs#12, pfx).
	Credentials to read this file shall be provided to the VNF instance by outbound. See note.		Credentials to read this file shall be provided to the VNF instance by outbound. See note.
	certSubjectData:		certSubjectData:
	$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/CertSubjectData'
	description: >		description: >
	Subject to be signed.		Subject to be signed.
			$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/CertSubjectData'
	certifiateProfileName:		certifiateProfileName:
	type: string		type: string
	description: >		description: >

Admin message