diff --git a/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..e9d7dd9f11c794eb91a0ace03a60fb65f37a5a3f
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
@@ -0,0 +1,129 @@
+*** Settings ***
+Resource variables.txt
+Library REST http://${VNFM_HOST}:${VNFM_PORT}
+... spec=SOL003-VNFLifecycleManagement-API.yaml
+Library DependencyLibrary
+Suite setup Check resource existance
+
+*** Test Cases ***
+Change deployment flavour of a vnfInstance
+ [Documentation] Changes the deployment flavour of a VNF instance..
+ Log Trying to change the deployment flavour of a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ Integer response status 202
+ Log Status code validated
+
+Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
+ # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
+ [Documentation] Conflict.
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Check resource not instantiated
+ Log Trying to change the deployment flavour of a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ Output response
+ Integer response status 409
+ Log Status code validated
+
+Change deployment flavour of a vnfInstance Conflict (parallel LCM operation)
+ # TODO: Need to set the pre-condition of the test
+ [Documentation] Conflict
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Launch another LCM operation
+ log Trying to change the deployment flavour of a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ Log Validate Status code
+ Output response
+ Integer response status 409
+ [Teardown] #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
+
+Change deployment flavour of a vnfInstance Not Found
+ # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
+ [Documentation] Not Found
+ ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists.
+ ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist.
+ ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error.
+ [Setup] Check change flavour not supported
+ Log Trying to change the deployment flavour of a VNF instance, not exist
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${Change_Vnf_Flavour_REQUEST}
+ Integer response status 404
+ Log Status code validated
+
+
+GET Change deployment flavour VNFInstance - Method not implemented
+ log Trying to perform a GET. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PUT Change deployment flavour VNFInstance - Method not implemented
+ log Trying to perform a PUT. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Put ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PATCH Change deployment flavour VNFInstance - Method not implemented
+ log Trying to perform a PATCH. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+DELETE Change deployment flavour VNFInstance - Method not implemented
+ log Trying to perform a DELETE. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+*** Key words ***
+Check resource existance
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ Integer response status 200
+
+Check resource not instantiated
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ String response body instantiationState NOT_INSTANTIATED
+
+Check change flavour not supported
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ # how to check if change floavour is not supported? "flavourId" doesn't exist?
+
+Launch another LCM operation
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..b672d98cd9e14f43044279f1e3616d19424b89f6
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
@@ -0,0 +1,129 @@
+*** Settings ***
+Resource variables.txt
+Library REST http://${VNFM_HOST}:${VNFM_PORT}
+... spec=SOL003-VNFLifecycleManagement-API.yaml
+Library DependencyLibrary
+Suite setup Check resource existance
+
+*** Test Cases ***
+Heal a vnfInstance
+ [Documentation] Heal a VNF instance
+ Log Trying to heal a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ Integer response status 202
+ Log Status code validated
+
+Heal a vnfInstance Conflict (Not-Instantiated)
+ # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
+ [Documentation] Conflict.
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Check resource not instantiated
+ Log Trying to heal a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ Output response
+ Integer response status 409
+ Log Status code validated
+
+Heal a vnfInstance Conflict (parallel LCM operation)
+ # TODO: Need to set the pre-condition of the test
+ [Documentation] Conflict
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Launch another LCM operation
+ log Trying to heal a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ Log Validate Status code
+ Output response
+ Integer response status 409
+ [Teardown] #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
+
+Heal a vnfInstance Not Found
+ # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
+ [Documentation] Not Found
+ ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists.
+ ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist.
+ ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error.
+ [Setup] Check heal not supported
+ Log Trying to heal a VNF instance, not exist
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal ${Heal_Vnf_REQUEST}
+ Integer response status 404
+ Log Status code validated
+
+
+GET Heal VNFInstance - Method not implemented
+ log Trying to perform a GET. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PUT Heal VNFInstance - Method not implemented
+ log Trying to perform a PUT. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Put ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PATCH Heal VNFInstance - Method not implemented
+ log Trying to perform a PATCH. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+DELETE Heal VNFInstance - Method not implemented
+ log Trying to perform a DELETE. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+*** Key words ***
+Check resource existance
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ Integer response status 200
+
+Check resource not instantiated
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ String response body instantiationState NOT_INSTANTIATED
+
+Check heal not supported
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ # how to check if heal is not supported? "flavourId" doesn't exist?
+
+Launch another LCM operation
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..bb2efcab9f2127806eb063aeae74cc4d82191647
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
@@ -0,0 +1,129 @@
+*** Settings ***
+Resource variables.txt
+Library REST http://${VNFM_HOST}:${VNFM_PORT}
+... spec=SOL003-VNFLifecycleManagement-API.yaml
+Library DependencyLibrary
+Suite setup Check resource existance
+
+*** Test Cases ***
+Operate a vnfInstance
+ [Documentation] Change the operational state of a VNF instance
+ Log Trying to change the operational state of a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ Integer response status 202
+ Log Status code validated
+
+Operate a vnfInstance Conflict (Not-Instantiated)
+ # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
+ [Documentation] Conflict.
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Check resource not instantiated
+ Log Trying to change the operational state of a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ Output response
+ Integer response status 409
+ Log Status code validated
+
+Operate a vnfInstance Conflict (parallel LCM operation)
+ # TODO: Need to set the pre-condition of the test
+ [Documentation] Conflict
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Launch another LCM operation
+ log Trying to change the operational state of a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ Log Validate Status code
+ Output response
+ Integer response status 409
+ [Teardown] #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
+
+Operate a vnfInstance Not Found
+ # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
+ [Documentation] Not Found
+ ... Error: The API producer did not find a current representation for the target resource or is not willing to disclose that one exists.
+ ... Specifically in case of this task resource, the response code 404 shall also returned if the task is not supported for the VNF instance represented by the parent resource, which means that the task resource consequently does not exist.
+ ... In this case, the response body shall be present, and shall contain a ProblemDetails structure, in which the “detail” attribute shall convey more information about the error.
+ [Setup] Check operate not supported
+ Log Trying to change the operational state of a VNF instance, not exist
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate ${Operate_Vnf_REQUEST}
+ Integer response status 404
+ Log Status code validated
+
+
+GET Operate VNFInstance - Method not implemented
+ log Trying to perform a GET. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PUT Operate VNFInstance - Method not implemented
+ log Trying to perform a PUT. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Put ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PATCH Operate VNFInstance - Method not implemented
+ log Trying to perform a PATCH. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+DELETE Operate VNFInstance - Method not implemented
+ log Trying to perform a DELETE. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+*** Key words ***
+Check resource existance
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ Integer response status 200
+
+Check resource not instantiated
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ String response body instantiationState NOT_INSTANTIATED
+
+Check operate not supported
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ # how to check if operate is not supported? "flavourId" doesn't exist?
+
+Launch another LCM operation
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
index 1f3a560e77c19bdd2e79494a21bc4c027298d088..5d33f7b056b7ef9c40e07456973c6478a5a90a4d 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
@@ -41,7 +41,7 @@ Scale a vnfInstance Conflict (parallel LCM operation)
[Setup] Launch another LCM operation
log Trying to Scale a vnf Instance
Set Headers {"Accept":"${ACCEPT}"}
- Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
Log Validate Status code
@@ -65,7 +65,7 @@ Scale a vnfInstance Not Found
Log Status code validated
-GET Instantiate VNFInstance - Method not implemented
+GET Scale VNFInstance - Method not implemented
log Trying to perform a GET. This method should not be implemented
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale
@@ -73,7 +73,7 @@ GET Instantiate VNFInstance - Method not implemented
Output response
Integer response status 405
-PUT Instantiate VNFInstance - Method not implemented
+PUT Scale VNFInstance - Method not implemented
log Trying to perform a PUT. This method should not be implemented
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Put ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale
@@ -81,7 +81,7 @@ PUT Instantiate VNFInstance - Method not implemented
Output response
Integer response status 405
-PATCH Instantiate VNFInstance - Method not implemented
+PATCH Scale VNFInstance - Method not implemented
log Trying to perform a PATCH. This method should not be implemented
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale
@@ -89,7 +89,7 @@ PATCH Instantiate VNFInstance - Method not implemented
Output response
Integer response status 405
-DELETE Instantiate VNFInstance - Method not implemented
+DELETE Scale VNFInstance - Method not implemented
log Trying to perform a DELETE. This method should not be implemented
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale
@@ -123,5 +123,5 @@ Launch another LCM operation
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_REQUEST}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_to_level_REQUEST}
Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
index 3270a45a8c62fb56eb21a7fb0f2718a37f2164d5..609967169ff94da9eb62a33098f94d085db7742c 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
@@ -41,7 +41,7 @@ Scale a vnfInstance to level Conflict (parallel LCM operation)
[Setup] Launch another LCM operation
log Trying to Scale a vnf Instance
Set Headers {"Accept":"${ACCEPT}"}
- Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level ${Scale_Vnf_REQUEST}
Log Validate Status code
diff --git a/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
new file mode 100644
index 0000000000000000000000000000000000000000..a4d7e5dbebb7f983673eaa703139320e73c9300f
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
@@ -0,0 +1,114 @@
+*** Settings ***
+Resource variables.txt
+Library REST http://${VNFM_HOST}:${VNFM_PORT}
+... spec=SOL003-VNFLifecycleManagement-API.yaml
+Library DependencyLibrary
+Suite setup Check resource existance
+
+*** Test Cases ***
+Terminate a vnfInstance
+ [Documentation] Terminates a VNF instance
+ Log Trying to terminate a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${Terminate_Vnf_REQUEST}
+ Integer response status 202
+ Log Status code validated
+
+Terminate a vnfInstance Conflict (Not-Instantiated)
+ # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
+ [Documentation] Conflict.
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Check resource not instantiated
+ Log Trying to terminate a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${Terminate_Vnf_REQUEST}
+ Output response
+ Integer response status 409
+ Log Status code validated
+
+Terminate a vnfInstance Conflict (parallel LCM operation)
+ # TODO: Need to set the pre-condition of the test
+ [Documentation] Conflict
+ ... The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
+ ... Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state,
+ ... or that another lifecycle management operation is ongoing.
+ ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ [Setup] Launch another LCM operation
+ log Trying to change the deployment flavour of a VNF instance.
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate ${Terminate_Vnf_REQUEST}
+ Log Validate Status code
+ Output response
+ Integer response status 409
+ [Teardown] #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
+
+
+GET Terminate VNFInstance - Method not implemented
+ log Trying to perform a GET. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PUT Terminate VNFInstance - Method not implemented
+ log Trying to perform a PUT. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Put ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+PATCH Terminate VNFInstance - Method not implemented
+ log Trying to perform a PATCH. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+DELETE Terminate VNFInstance - Method not implemented
+ log Trying to perform a DELETE. This method should not be implemented
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate
+ Log Validate Status code
+ Output response
+ Integer response status 405
+
+*** Key words ***
+Check resource existance
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ Integer response status 200
+
+Check resource not instantiated
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ String response body instantiationState NOT_INSTANTIATED
+
+Check change flavour not supported
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
+ # how to check if change floavour is not supported? "flavourId" doesn't exist?
+
+Launch another LCM operation
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale ${Scale_Vnf_REQUEST}
+ Integer response status 202
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/variables.txt b/SOL003/VNFLifecycleManagement-API_egm/variables.txt
index aa01df8cb4bc5939c3743b66b67e50b3385a1994..36aacaed0c14aa6c5f3da072cc21893a1c13fbe5 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API_egm/variables.txt
@@ -29,4 +29,8 @@ ${ARTIFACT_TYPE} application/octet-stream
${ARTIFACT_ID} artifactId
${WRONG_ACCEPT} application/json
${Scale_Vnf_REQUEST} {}
-${Scale_Vnf_to_Level_REQUEST} {}
\ No newline at end of file
+${Scale_Vnf_to_Level_REQUEST} {}
+${Change_Vnf_Flavour_REQUEST} {}
+${Terminate_Vnf_REQUEST} {}
+${Heal_Vnf_REQUEST} {}
+${Operate_Vnf_REQUEST} {}
\ No newline at end of file
diff --git a/TrackingStatus.txt b/TrackingStatus.txt
index 140671301d43bca219f02527c23f2a37b035e1c7..2e6fbeba7697c1fced978c6b7fb7279d89b828ec 100644
--- a/TrackingStatus.txt
+++ b/TrackingStatus.txt
@@ -22,10 +22,10 @@ SOL003
* InstantiateVNFTask --------------------------------------> [DONE]
* ScaleVNFTask --------------------------------------> [DONE]
* ScaleVNFToLevelTask --------------------------------------> [DONE]
- * ChangeExternalVNFConnectivityTask ----------------------------> [ONGOING]
- * TerminateVNFTask ----------------------------> [ONGOING]
- * HealVNFTask ----------------------------> [ONGOING]
- * OperateVNFTask ----------------------------> [ONGOING]
+ * ChangeVNFFlavourTask ----------------------------> [DONE]
+ * TerminateVNFTask ----------------------------> [DONE]
+ * HealVNFTask ----------------------------> [DONE]
+ * OperateVNFTask ----------------------------> [DONE]
* ChangeExternalVNFConnectivityTask ----------------------------> [ONGOING]
* VnfLcmOperationOccurences ----------------------------> [ONGOING]
* IndividualVnfLcmOperationOccurence ----------------------------> [ONGOING]