Merge branch '2.6.1-fix-plu' of https://forge.etsi.org/rep/nfv/api-tests into 2.6.1-fix-plu (519771cb) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json

+4 −23

Original line number	Original line	Diff line number	Diff line
	{		{
	"CreateNsRequest": {		"nsdId": "{nsdId}",
	"type": "object",		"nsName": "{nsInstanceName}",
	"required": [		"nsDescription": "{nsInstanceDescription}"
	"nsdId",
	"nsName",
	"nsDescription"
	],
	"properties": {
	"nsdId": {
	"description": "Identifier of the NSD that defines the NS instance to be created.\n",
	"$ref": "SOL005_def.yaml#/definitions/Identifier"
	},
	"nsName": {
	"description": "Human-readable name of the NS instance to be created.\n",
	"type": "string"
	},
	"nsDescription": {
	"description": "Human-readable description of the NS instance to be created.\n",
	"type": "string"
	}
	}
	}
	}		}

SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json

+2 −31

Original line number	Original line	Diff line number	Diff line
	{		{
	"description": "This type represents a request for the scale NS operation.\n",		"scaleType": "SCALE_NS"
	"type": "object",
	"required": [
	"scaleType"
	],
	"properties": {
	"scaleType": {
	"description": "Indicates the type of scaling to be performed. Possible values: - SCALE_NS - SCALE_VNF\n",
	"type": "string",
	"enum": [
	"SCALE_NS",
	"SCALE_VNF"
	]
	},
	"scaleNsData": {
	"description": "The necessary information to scale the referenced NS instance. It shall be present when scaleType = SCALE_NS.\n",
	"$ref": "#/definitions/ScaleNsData"
	},
	"scaleVnfData": {
	"description": "The necessary information to scale the referenced NS instance. It shall be present when scaleType = SCALE_VNF.\n",
	"type": "array",
	"items": {
	"$ref": "#/definitions/ScaleVnfData"
	}
	},
	"scaleTime": {
	"description": "Timestamp indicating the scale time of the NS, i.e. the NS will be scaled at this timestamp. Cardinality \"0\" indicates the NS scaling takes place immediately\".\n",
	"$ref": "SOL005_def.yaml#/definitions/DateTime"
	}
	}
	}		}

SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -266,7 +266,7 @@ Send PATCH to disable Individual VNF Package
	Log Trying to perform a PATCH. As prerequisite the nsdInfo shall be in enabled operational state		Log Trying to perform a PATCH. As prerequisite the nsdInfo shall be in enabled operational state
	Set Headers {"Accept": "${ACCEPT_JSON}"}		Set Headers {"Accept": "${ACCEPT_JSON}"}
	Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
	${body}= Get File jsons/NsdInfoModificationDisable.json		${body}= Get File jsons/VnfPkgInfoModificationsDisabled.json
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
	PATCH ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId} ${body}		PATCH ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId} ${body}
	${output}= Output response		${output}= Output response
	@@ -281,7 +281,7 @@ Send PATCH to enable Individual VNF Package
	Log Trying to perform a PATCH. As prerequisite the nsdInfo shall be in disabled operational state		Log Trying to perform a PATCH. As prerequisite the nsdInfo shall be in disabled operational state
	Set Headers {"Accept": "${ACCEPT_JSON}"}		Set Headers {"Accept": "${ACCEPT_JSON}"}
	Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}		Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
	${body}= Get File jsons/NsdInfoModificationEnable.json		${body}= Get File jsons/VnfPkgInfoModifications.json
	Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
	PATCH ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId} ${body}		PATCH ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId} ${body}
	${output}= Output response		${output}= Output response

Admin message