Merge "3.3.1 dev" into "release 3" master (!199) · Merge requests · NFV - Network Functions Virtualisation / api-tests

SOL002/VNFConfiguration-API/environment/variables.txt

+3 −2

Changes for SOL002/VNFConfiguration-API/environment/variables.txt: 3 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,13 +10,14 @@ ${EM-VNF_SCHEMA} https

		${ACCEPT} application/json
		${AUTH_USAGE} 1
		${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==
		${AUTHORIZATION_HEADER} Authorization
		${AUTHORIZATION_TOKEN} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42

		${CONTENT_TYPE} application/json

		${apiRoot} /
		${apiName} vnfconfig
		${apiVersion} v1
		${apiMajorVersion} v1

		${WRONG_AUTHORIZATION} Bearer XXXXXWRONGXXXXX

SOL002/VNFConfiguration-API/schemas/vnfConfigModifications.schema.json

+78 −6

Changes for SOL002/VNFConfiguration-API/schemas/vnfConfigModifications.schema.json: 78 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		{
		"description": "This type represents request parameters for the \"Set Configuration\" operation. * NOTE 1: At least one of \"vnfConfigurationData\" and \"vnfcConfigurationData\"\n shall be present.\n * NOTE 2: The VnfcConfiguration data type can only be used to modify the configuration\n of existing VNFC instances.\n",
		"description": "This type represents request parameters for the \"Set Configuration\" operation.\n * NOTE 1: At least one of \"vnfConfigurationData\" and \"vnfcConfigurationData\"\n shall be present.\n * NOTE 2: The VnfcConfiguration data type can only be used to modify the configuration\n of existing VNFC instances.\n",
		"type": "object",
		"anyOf": [
		{
		"required": [
		"vnfConfigurationData"
		]
		},
		{
		"required": [
		"vnfcConfigurationData"
		]
		}
		],
		"properties": {
		"vnfConfigurationData": {
		"description": "This type represents configuration parameters of a VNF instance.\n",
		"type": "object",
		"properties": {
		"extCpConfig": {
		"description": "Configuration parameters for the external CPs of the VNF instance.\n",
		"type": "array",
		"items": {
		"description": "This type represents configuration parameters of a CP instance.\n",
		"type": "object",
		"required": [
		@@ -27,8 +42,32 @@
		"description": "Network address and port assigned to the CP.\n",
		"type": "array",
		"items": {
		"description": "This type represents configuration parameters of a CP instance address. * NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n * NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
		"description": "This type represents configuration parameters of a CP instance address.\n * NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n * NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
		"type": "object",
		"oneOf": [
		{
		"required": [
		"address"
		]
		},
		{
		"required": [
		"useDynamicAddress"
		]
		}
		],
		"anyOf": [
		{
		"required": [
		"macAddress"
		]
		},
		{
		"required": [
		"ipAddress"
		]
		}
		],
		"properties": {
		"address": {
		"description": "Network address that has been configured on the CP. See NOTE 1.\n",
		@@ -58,6 +97,7 @@
		}
		}
		}
		}
		},
		"dhcpServer": {
		"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
		@@ -65,13 +105,13 @@
		"format": "IP"
		},
		"vnfSpecificData": {
		"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
		"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
		"type": "object"
		}
		}
		},
		"vnfcConfigurationData": {
		"description": "Modifications to configuration data for certain VNFC instances. See NOTE 1 and NOTE 2. If present, the modifications of the \"vnfcConfigurationData\" attribute shall follow these provisions: Modifying an attribute that is an array of objects of type \"VnfcConfigurationData\".\n Assumptions:\n 1) \"oldList\" is the \"VnfcConfigurationData\" array to be modified and \"newList\"\n is the \"VnfcConfigurationData\" array that contains the changes.\n 2) \"oldEntry\" is an entry in \"oldList\" and \"newEntry\" is an entry in \"newList\".\n 3) A \"newEntry\" has a \"corresponding entry\" if there exists an \"oldEntry\" that \n has the same content of the \"vnfcInstanceId\" attribute as the \"newEntry\"; \n a \"newEntry\" has no corresponding entry if no such \"oldEntry\" exists.\n 4) In any array of \"VnfcConfigurationData\" structures, the content of \"vnfcInstanceId\"\n is unique (i.e. there shall be no two entries with the same content of \"vnfcInstanceId\").\n Provisions:\n 1) For each \"newEntry\" in \"newList\" that has no corresponding entry in \"oldList\", \n the \"oldList\" array shall be modified by adding that \"newEntry\".\n\n 2) For each \"newEntry\" in \"newList\" that has a corresponding \"oldEntry\" in \"oldList\",\n the value of \"oldEntry\" shall be updated with the value of \"newEntry\" according to\n the rules of JSON Merge PATCH (see IETF RFC 7396 ).\n",
		"description": "Modifications to configuration data for certain VNFC instances. See NOTE 1 and NOTE 2. If present, the modifications of the \"vnfcConfigurationData\" attribute shall follow these provisions:\n Modifying an attribute that is an array of objects of type \"VnfcConfigurationData\".\n Assumptions:\n 1) \"oldList\" is the \"VnfcConfigurationData\" array to be modified and \"newList\"\n is the \"VnfcConfigurationData\" array that contains the changes.\n 2) \"oldEntry\" is an entry in \"oldList\" and \"newEntry\" is an entry in \"newList\".\n 3) A \"newEntry\" has a \"corresponding entry\" if there exists an \"oldEntry\" that\n has the same content of the \"vnfcInstanceId\" attribute as the \"newEntry\";\n a \"newEntry\" has no corresponding entry if no such \"oldEntry\" exists.\n 4) In any array of \"VnfcConfigurationData\" structures, the content of \"vnfcInstanceId\"\n is unique (i.e. there shall be no two entries with the same content of \"vnfcInstanceId\").\n Provisions:\n 1) For each \"newEntry\" in \"newList\" that has no corresponding entry in \"oldList\",\n the \"oldList\" array shall be modified by adding that \"newEntry\".\n\n 2) For each \"newEntry\" in \"newList\" that has a corresponding \"oldEntry\" in \"oldList\",\n the value of \"oldEntry\" shall be updated with the value of \"newEntry\" according to\n the rules of JSON Merge PATCH (see IETF RFC 7396 ).\n",
		"type": "array",
		"items": {
		"description": "This type represents configuration parameters of a VNFC instance.\n",
		@@ -108,8 +148,32 @@
		"description": "Network address and port assigned to the CP.\n",
		"type": "array",
		"items": {
		"description": "This type represents configuration parameters of a CP instance address. * NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n * NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
		"description": "This type represents configuration parameters of a CP instance address.\n * NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n * NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
		"type": "object",
		"oneOf": [
		{
		"required": [
		"address"
		]
		},
		{
		"required": [
		"useDynamicAddress"
		]
		}
		],
		"anyOf": [
		{
		"required": [
		"macAddress"
		]
		},
		{
		"required": [
		"ipAddress"
		]
		}
		],
		"properties": {
		"address": {
		"description": "Network address that has been configured on the CP. See NOTE 1.\n",
		@@ -147,11 +211,19 @@
		"format": "IP"
		},
		"vnfcSpecificData": {
		"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
		"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
		"type": "object"
		}
		}
		}
		},
		"vnfcConfigurationDataDeleteIds": {
		"description": "List of identifiers entries to be deleted from the 'vnfcConfigurationData\" attribute array to be used as \"deleteIdList\" as defined below this table.\n",
		"type": "array",
		"items": {
		"description": "An identifier with the intention of being globally unique.\n",
		"type": "string"
		}
		}
		}
		}
		No newline at end of file

SOL002/VNFConfiguration-API/ApiVersion.robot

+31 −31

Changes for SOL002/VNFConfiguration-API/ApiVersion.robot: 31 added lines, 31 removed lines.
Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ POST API Version - Method not implemented
		... Test title: POST API version - Method not implemented
		... Test objective: The objective is to test that POST method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -23,7 +23,7 @@ GET API Version
		... Test title: GET API Version
		... Test objective: The objective is to test that GET method successfully return ApiVersionInformation
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
		... Test title: PUT API Version - Method not implemented
		... Test objective: The objective is to test that PUT method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
		... Test title: PATCH API Version - Method not implemented
		... Test objective: The objective is to test that PATCH method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
		... Test title: DELETE API Version - Method not implemented
		... Test objective: The objective is to test that DELETE method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
		... Test title: POST API version with apiMajorVerion - Method not implemented
		... Test objective: The objective is to test that POST method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
		... Test title: GET API Version with apiMajorVerion
		... Test objective: The objective is to test that GET method successfully return ApiVersionInformation
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
		... Test title: PUT API Version with apiMajorVerion - Method not implemented
		... Test objective: The objective is to test that PUT method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
		... Test title: PATCH API Version with apiMajorVerion - Method not implemented
		... Test objective: The objective is to test that PATCH method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
		... Test title: DELETE API Version with apiMajorVerion - Method not implemented
		... Test objective: The objective is to test that DELETE method is not implemented
		... Pre-conditions: none
		... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.6.1
		... Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
		... Config ID: Config_prod_VNFM
		... Applicability: none
		... Post-Conditions: none
		@@ -131,71 +131,71 @@ DELETE API Version with apiMajorVerion - Method not implemented
		* Keywords *
		POST API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Post ${apiRoot}/${apiName}/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		GET API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Get ${apiRoot}/${apiName}/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Get ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		PUT API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Put ${apiRoot}/${apiName}/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		PATCH API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Patch ${apiRoot}/${apiName}/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Patch ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		DELETE API Version
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Delete ${apiRoot}/${apiName}/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		POST API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Post ${apiRoot}/${apiName}/v1/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		GET API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Get ${apiRoot}/${apiName}/v1/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Get ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		PUT API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Put ${apiRoot}/${apiName}/v1/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		PATCH API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Patch ${apiRoot}/${apiName}/v1/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Patch ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		DELETE API Version with apiMajorVersion
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Delete ${apiRoot}/${apiName}/v1/api_version
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		@@ -206,6 +206,6 @@ Check HTTP Response Status Code Is

		Check HTTP Response Body Json Schema Is
		[Arguments] ${input}
		${schema} = Catenate ${input} .schema.json
		${schema} = Catenate SEPARATOR= ${input} .schema.json
		Validate Json ${schema} ${response['body']}
		Log Json Schema Validation OK
		No newline at end of file

SOL002/VNFConfiguration-API/Configuration.robot

+25 −29

Changes for SOL002/VNFConfiguration-API/Configuration.robot: 25 added lines, 29 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ Set new VNF Configuration
		... Test title: Set a new VNF Configuration
		... Test objective: The objective is to test the creation of a new VNF configuration and perform a JSON schema validation of the returned configuration data structure
		... Pre-conditions: A VNF instance is instantiated
		... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
		... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
		... Config ID: Config_prod_VE
		... Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
		... Post-Conditions: The configuration is successfully set in the VNF and it matches the issued configuration
		@@ -28,7 +28,7 @@ Get information about a VNF configuration
		... Test title: Get information about a VNF configuration
		... Test objective: The objective is to test the retrieval of an existing VNF instance configuration and perform a JSON schema validation of the collected configuration data structure
		... Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured.
		... Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
		... Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
		... Config ID: Config_prod_VE
		... Applicability: none
		... Post-Conditions: none
		@@ -42,7 +42,7 @@ Get information about a VNF configuration with HTTP Etag
		... Test title: Get information about a VNF configuration with HTTP Etag
		... Test objective: The objective is to test the retrieval of an existing VNF instance configuration, check the generation by the VNF of an HTTP Etag opaque identifier, and perform a JSON schema validation of the collected configuration data structure
		... Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured
		... Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1
		... Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
		... Config ID: Config_prod_VE
		... Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
		... Post-Conditions: none
		@@ -57,7 +57,7 @@ Set new VNF Configuration - HTTP Etag precondition unsuccessful
		... Test title: Set a new VNF Configuration - HTTP Etag precondition unsuccessful
		... Test objective: The objective is to test the unsuccess in setting a duplication of VNF configuration identified by an already used HTTP Etag identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
		... Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured (Test ID 6.3.1.1.1) with a given HTTP Etag identifier.
		... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1
		... Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
		... Config ID: Config_prod_VE
		... Applicability: The VNF supports the generation of HTTP Etag opaque identifiers
		... Post-Conditions: The VNF configuration is not modified by the unsuccessful operation and it matches the configuration issued in Test ID 6.3.1.1.1
		@@ -70,8 +70,8 @@ POST VNF Configuration - Method not implemented
		[Documentation] Test ID: 6.3.1.1.5
		... Test title: POST VNF Configuration - Method not implemented
		... Test objective: The objective is to test that POST method is not allowed to create a new VNF configuration
		... Pre-conditions: A VNF instance is instantiated. The VNF instance is alrseady configured
		... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1
		... Pre-conditions: none
		... Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
		... Config ID: Config_prod_VE
		... Applicability: none
		... Post-Conditions: none
		@@ -82,8 +82,8 @@ PUT VNF Configuration - Method not implemented
		[Documentation] Test ID: 6.3.1.1.6
		... Test title: PUT VNF Configuration - Method not implemented
		... Test objective: The objective is to test that PUT method is not allowed to modify an existing VNF configuration
		... Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured
		... Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1
		... Pre-conditions: none
		... Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
		... Config ID: Config_prod_VE
		... Applicability: none
		... Post-Conditions: none
		@@ -94,23 +94,22 @@ DELETE VNF Configuration - Method not implemented
		[Documentation] Test ID: 6.3.1.1.7
		... Test title: Delete VNF Configuration - Method not implemented
		... Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF configuration
		... Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured
		... Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1
		... Pre-conditions: none
		... Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
		... Config ID: Config_prod_VE
		... Applicability: none
		... Post-Conditions: The VNF configuration is not deleted by the unsuccessful operation
		... Post-Conditions: none
		Send DELETE Request for VNF Configuration
		Check HTTP Response Status Code Is 405
		Check Postcondition VNF Configuration Exists

		* Keywords *
		Get VNF configuration
		Log Query VNF The GET method queries information about a configuration.
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Log Execute Query and validate response
		Get ${apiRoot}/${apiName}/${apiVersion}/configuration
		Get ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
		${output}= Output response
		Set Suite Variable ${response} ${output}

		@@ -118,9 +117,9 @@ Send VNF configuration
		log Trying to perform a PATCH. This method modifies the configuration
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		${body}= Get File jsons/vnfConfigModifications.json
		Patch ${apiRoot}/${apiName}/${apiVersion}/configuration ${body}
		Patch ${apiRoot}/${apiName}/${apiMajorVersion}/configuration ${body}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		@@ -137,7 +136,8 @@ Check HTTP Response Header Contains

		Check HTTP Response Body Json Schema Is
		[Arguments] ${input}
		Should Contain ${response['headers']['Content-Type']} application/problem+json
		Run Keyword If '${input}' == 'ProblemDetails' Should Contain ${response['headers']['Content-Type']} application/problem+json
		... ELSE Should Contain ${response['headers']['Content-Type']} application/json
		${schema}= Catenate SEPARATOR= ${input} .schema.json
		Validate Json ${schema} ${response['body']}
		Log Json Schema Validation OK
		@@ -146,10 +146,6 @@ Check Postcondition VNF Configuration Unmodified (Implicit)
		Log Check Implicit Postcondition
		Check Postcondition VNF Is Configured

		Check Postcondition VNF Configuration Exists
		Log Check Postcondition VNF exists
		Check Postcondition VNF Is Configured

		Check Postcondition VNF Is Configured
		Log Check Postcondition for VNF Configuration
		Get VNF configuration
		@@ -163,32 +159,32 @@ Send Duplicated VNF configuration
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Set Headers {"If-Match": "${etag}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		${body}= Get File jsons/vnfConfigModifications.json
		Patch ${apiRoot}/${apiName}/${apiVersion}/configuration ${body}
		Patch ${apiRoot}/${apiName}/${apiMajorVersion}/configuration ${body}
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send POST Request for VNF Configuration
		log Trying to perform a POST. This method should not be implemented
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Post ${apiRoot}/${apiName}/${apiVersion}/configuration
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send PUT Request for VNF Configuration
		log Trying to perform a POST. This method should not be implemented
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Put ${apiRoot}/${apiName}/${apiVersion}/configuration
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Put ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
		${output}= Output response
		Set Suite Variable ${response} ${output}

		Send DELETE Request for VNF Configuration
		log Trying to perform a POST. This method should not be implemented
		Set Headers {"Accept":"${ACCEPT}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Delete ${apiRoot}/${apiName}/${apiVersion}/configuration
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
		Delete ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
		${output}= Output response
		Set Suite Variable ${response} ${output}
		No newline at end of file

SOL002/VNFFaultManagement-API/environment/variables.txt

+7 −3

Changes for SOL002/VNFFaultManagement-API/environment/variables.txt: 7 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,7 +2,8 @@
		${VNFM_HOST} localhost # Hostname of the VNFM
		${VNFM_PORT} 8080 # Listening port of the VNFM
		${VNFM_SCHEMA} https
		${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==
		${AUTHORIZATION_HEADER} Authorization
		${AUTHORIZATION_TOKEN} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
		${ACCEPT} application/json
		${ACCEPT_JSON} application/json
		${AUTH_USAGE} 1
		@@ -11,9 +12,11 @@ ${managedObjectId} 007c111c-38a1-42c0-a666-7475ecb1567c
		${invalid_alarm_filter} badFilter
		${apiRoot} /
		${apiName} vnffm
		${apiVersion} v1
		${apiMajorVersion} v1
		${CONTENT_TYPE} application/json

		${origResponse}= httpresponse

		${VNFM_ALLOWS_DUPLICATE_SUBS} 0

		${alarmId} 6fc3539c-e602-4afa-8e13-962fb5a7d81d
		@@ -52,7 +55,8 @@ ${response}= httpresponse
		${vnfcInstanceIds} []
		${faultyResourceType} COMPUTE
		${eventType} COMMUNICATIONS_ALARM
		${perceivedSeverity} CRITICAL
		${probableCause}

		${notification_type} AlarmNotification

		${callbackResp} localhost
		No newline at end of file

Merge "3.3.1 dev" into "release 3" master

Merge request reports