correction to SOL3 and SOL5

SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot

@@ -19,7 +19,7 @@ POST Change external VNF connectivity
     ...    Post-Conditions: in response header Location shall not be null         
     POST Change External VNF Connectivity
     Check HTTP Response Status Code Is    202
-    Check Operation Occurrence Id
+    Check Operation Occurrence Id existence
         
 GET Change external VNF connectivity - Method not implemented
     [Documentation]    Test ID: 7.3.1.10.2

SOL003/VNFLifecycleManagement-API/HealVNFTask.robot

@@ -38,7 +38,6 @@ Heal a vnfInstance Conflict (Not-Instantiated)
 
     
 Heal a vnfInstance Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 7.3.1.8.3
     ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed because the VNF instance resource is not found. 

SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot

@@ -68,7 +68,7 @@ PATCH Individual VNFInstance Precondition failed
      [Documentation]    Test ID: 7.3.1.2.5
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions:  A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity
+    ...    Pre-conditions:  ETag mismatch
     ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
@@ -80,7 +80,7 @@ PATCH Individual VNFInstance Precondition failed
 PATCH Individual VNFInstance Conflict
      [Documentation]    Test ID: 7.3.1.2.6
     ...    Test title: PATCH Individual VNFInstance Precondition failed
-    ...    Test objective: The objective is to create a new VNF instance resource
+    ...    Test objective: The objective is to test the conflict while modifying a VNF instance resource
     ...    Pre-conditions: none
     ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -89,7 +89,6 @@ PATCH Individual VNFInstance Conflict
     PATCH individual vnfInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
-    #[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
 
 DELETE Individual VNFInstance
      [Documentation]    Test ID: 7.3.1.2.7
@@ -105,8 +104,8 @@ DELETE Individual VNFInstance
 
 DELETE Individual VNFInstance Conflict
      [Documentation]    Test ID: 7.3.1.2.8
-    ...    Test title: DELETE Individual VNFInstance
-    ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test title: DELETE Individual VNFInstance Conflict
+    ...    Test objective: The objective is to verify that the deletion cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: section 5.4.3.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM

SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot

@@ -14,7 +14,7 @@ Suite Setup    Check resource existance
 Post Retry operation task  
     [Documentation]    Test ID: 7.3.1.13.1
     ...    Test title: Post Retry operation task
-    ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if the operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if the operation is in FAILED_TEMP state
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.14.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -25,9 +25,8 @@ Post Retry operation task
     Check Operation Occurrence Id
 
 Post Retry operation task Conflict (Not-FAILED_TEMP)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.13.2
-    ...    Test title: Post Retry operation task
+    ...    Test title: Post Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.14.3.1 - SOL003 v2.4.1
@@ -40,9 +39,8 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
 
 
 Post Retry operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 7.3.1.13.3
-    ...    Test title: Post Retry operation task
+    ...    Test title: Post Retry operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
     ...    Reference:  section 5.4.14.3.1 - SOL003 v2.4.1

SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot

@@ -13,7 +13,7 @@ Suite Setup    Check resource existance
 Post Rollback operation task  
     [Documentation]    Test ID: 7.3.1.14.1
     ...    Test title: Post Rollback operation task
-    ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test objective: The objective is to test that POST method initiates rollback on a VNF lifecycle operation
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -26,8 +26,8 @@ Post Rollback operation task
 Post Rollback operation task Conflict (Not-FAILED_TEMP)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.14.2
-    ...    Test title: Post Rollback operation task
-    ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
+    ...    Test title: Post Rollback operation task Conflict (Not-FAILED_TEMP)
+    ...    Test objective: The objective is to test that POST method initiates a rollback on a VNF lifecycle operation 
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -39,9 +39,8 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP)
 
 
 Post Rollback operation task Not Found
-    # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
     [Documentation]    Test ID: 7.3.1.14.3
-    ...    Test title: Post Rollback operation task
+    ...    Test title: Post Rollback operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
     ...    Reference:  section 5.4.15.3.1 - SOL003 v2.4.1

SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot

@@ -26,7 +26,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.4.2
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
-    ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (VNF instance resource is in NOT-INSTANTIATED state.) 
+    ...    Test objective: The objective is to verify that the scale operation cannot be executed 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: section 5.4.5.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM

SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot

@@ -24,8 +24,8 @@ POST Scale a vnfInstance to level
 POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.5.2
-    ...    Test title: POST Scale a vnfInstance to level
-    ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
+    ...    Test objective: The objective is to verify that the scale operation cannot be executed 
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: section 5.4.6.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -65,7 +65,7 @@ GET Scale to level VNFInstance - Method not implemented
 
 PUT Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.5.5
-    ...    Test title: GET Scale to level VNFInstance - Method not implemented
+    ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.6.3.3 - SOL003 v2.4.1
@@ -77,7 +77,7 @@ PUT Scale to level VNFInstance - Method not implemented
 
 PATCH Scale to level VNFInstance - Method not implemented
     [Documentation]    Test ID: 7.3.1.5.6
-    ...    Test title: GET Scale to level VNFInstance - Method not implemented
+    ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  
     ...    Reference: section 5.4.6.3.4 - SOL003 v2.4.1

SOL003/VNFLifecycleManagement-API/Subscriptions.robot

@@ -75,7 +75,7 @@ GET Subscription - Filter
     
 GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 7.3.1.17.6
-    ...    Test title: GET Subscriptions - Filter
+    ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is Get the list of active subscriptions using an invalid filter
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.18.3.2 - SOL003 v2.4.1
@@ -94,7 +94,7 @@ PUT subscriptions - Method not implemented
     ...    Reference:  section 5.4.18.3.3 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
-    ...    Post-Conditions: subscription not modified
+    ...    Post-Conditions: none
     PUT subscriptions
 	Check HTTP Response Status Code Is    405
 

SOL003/VNFLifecycleManagement-API/VNFInstances.robot

@@ -13,7 +13,7 @@ POST Create a new vnfInstance
     [Documentation]    Test ID: 7.3.1.1.1
     ...    Test title: Create a VNF instance
     ...    Test objective: The objective is to create a new VNF instance resource
-    ...    Pre-conditions: an onboarded VNFD  
+    ...    Pre-conditions: none
     ...    Reference: section 5.4.2.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

@@ -30,6 +30,10 @@ Check Operation Occurrence Id
     ${vnfLcmOpOccId}=    Get Value From Json    ${response.headers}    $..Location
     Should Not Be Empty    ${vnfLcmOpOccId}
 
+Check Operation Occurrence Id existence
+    ${vnfLcmOpOccId}=    Get Value From Json    ${response.headers}    $..Location
+    Should Not Be Empty    ${vnfLcmOpOccId}
+    
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     ${schema} =    Catenate    ${input}    .schema.json

SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot

@@ -19,7 +19,7 @@ Post Continue operation task
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP 
 	POST Continue operation task
 	Check HTTP Response Status Code Is    202
-	Check resource has not a temporary failure
+	Check operation resource state is not FAILED_TEMP
 	
 Post Continue operation task Not Found
     [Documentation]    Test ID: 5.3.2.12.2

SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot

@@ -23,7 +23,7 @@ Post Individual NSInstance - Method not implemented
 Get Information about an individual NS Instance
     [Documentation]    Test ID: 5.3.2.2.2
     ...    Test title: Get Information about an individual NS Instance
-    ...    Test objective: The objective is to test that GET method return an individual NS instance
+    ...    Test objective: The objective is to test that GET method returns an individual NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -61,7 +61,7 @@ DELETE Individual NSInstance
      [Documentation]    Test ID: 5.3.2.2.5
     ...    Test title: DELETE Individual NSInstance
     ...    Test objective: The objective is to test that DELETE method delete a not INSTANTIATED NS instance
-    ...    Pre-conditions: a not INSTANTIATED NS instance.
+    ...    Pre-conditions: NS instance is not INSTANTIATED .
     ...    Reference:  section 6.4.3.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none

SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot

@@ -22,7 +22,7 @@ Post Individual NS LCM occurences - Method not implemented
 Get status information about Individual NS LCM OCC   
     [Documentation]    Test ID: 5.3.2.9.2
     ...    Test title: Get status information about Individual NS LCM OCC
-    ...    Test objective: The objective is to test that GET method return the LCM occurrence of the NS
+    ...    Test objective: The objective is to test that GET method returns the LCM occurrence of the NS
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO

SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot

@@ -34,6 +34,7 @@ Post Instantiate a nsInstance Conflict
     POST Instatiate nsInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
+    Check resource not_instantiated
     
 GET Instantiate NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.3.3
@@ -55,7 +56,7 @@ PUT Instantiate NSInstance - Method not implemented
     ...    Reference:  section 6.4.4.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified on the NFVO
+    ...    Post-Conditions: none.
     PUT Instantiate NSInstance
     Check HTTP Response Status Code Is    405
     
@@ -67,7 +68,7 @@ PATCH Instantiate NSInstance - Method not implemented
     ...    Reference:  section 6.4.4.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified on the NFVO
+    ...    Post-Conditions: none.
     PATCH Instantiate NSInstance
     Check HTTP Response Status Code Is    405
 
@@ -79,6 +80,6 @@ DELETE Instantiate NSInstance - Method not implemented
     ...    Reference:  section 6.4.4.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not deleted from the NFVO
+    ...    Post-Conditions: none.
     DELETE Instantiate NSInstance
     Check HTTP Response Status Code Is    405
\ No newline at end of file

SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot

@@ -16,16 +16,13 @@ Post NS LCM occurences - Method not implemented
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Terminate NSInstance
-    Check HTTP Response Status Code Is    202
-    Check HTTP Response Header Contains    Location
 	POST NS LCM OP Occurences
 	Check HTTP Response Status Code Is    405
 
 Get status information about multiple NS LCM OCC   
      [Documentation]    Test ID: 5.3.2.8.2
     ...    Test title: Get status information about multiple NS LCM OCC
-    ...    Test objective: The objective is to test that GET method return a list of LCM occurrences of the NS
+    ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM OCC available in the NFVO
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO

SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot

@@ -120,8 +120,8 @@ Check operation resource state is FAILED_TEMP
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
     String    response body instantiationState    FAILED_TEMP 
-
-Check resource has not a temporary failure
+Check operation resource state is not FAILED_TEMP
+    Check operation resource state is FAILED_TEMP    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

SOL005/NSLifecycleManagement-API/RetryOperationTask.robot

@@ -20,7 +20,7 @@ Post Retry operation task
 	POST Retry operation task
 	Check HTTP Response Status Code Is    202
 	Check HTTP Response Header Contains    Location
-	Check resource has not a temporary failure
+	Check operation resource state is not FAILED_TEMP
 	
 Post Retry operation task Not Found
     [Documentation]    Test ID: 5.3.2.10.2

SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot

@@ -11,7 +11,7 @@ Library    JSONSchemaLibrary    schemas/
 Post Rollback operation task
      [Documentation]    Test ID: 5.3.2.11.1
     ...    Test title: Post Rollback operation task
-    ...    Test objective: The objective is to test that POST method trigger a rollback on the NS LCM operation
+    ...    Test objective: The objective is to test that POST method triggers a rollback on the NS LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -19,12 +19,12 @@ Post Rollback operation task
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP    
 	POST Rollback operation task
 	Check HTTP Response Status Code Is    202
-    Check resource has not a temporary failure
+	Check operation resource state is not FAILED_TEMP 
 	
 Post Rollback operation task Not Found
     [Documentation]    Test ID: 5.3.2.11.2
     ...    Test title: Post Rollback operation task Not Found
-    ...    Test objective: The objective is to test that POST method fail if  NS LCM operation is not found
+    ...    Test objective: The objective is to test that POST method fails if  NS LCM operation is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO

SOL005/NSLifecycleManagement-API/ScaleNSTask.robot

@@ -11,12 +11,12 @@ Suite Setup    Check resource existance
 POST Scale a nsInstance
     [Documentation]    Test ID: 5.3.2.4.1
     ...    Test title: POST Scale a nsInstance
-    ...    Test objective: The objective is to test that POST method create a Scale NS instance
+    ...    Test objective: The objective is to test that POST method scales NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
     ...    Reference:  section 6.4.5.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The Scale NS is not triggered on the NFVO
+    ...    Post-Conditions: none
     POST scale nsInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
@@ -25,12 +25,12 @@ POST Scale a nsInstance
 POST Instantiate a nsInstance Conflict
     [Documentation]    Test ID: 5.3.2.4.2
     ...    Test title: POST Instantiate a nsInstance Conflict
-    ...    Test objective: The objective is to test that POST method can't Scale NS instance because of conflict in resource status (i.e. because the resource is in not in NOT_INSTANTIATED state)
+    ...    Test objective: The objective is to test that POST method can't scale NS instance because of conflict in resource status (i.e. because the resource is in not in NOT_INSTANTIATED state)
     ...    Pre-conditions: the resource is in not in NOT_INSTANTIATED state
     ...    Reference:  section 6.4.5.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The Scale NS is not triggered on the NFVO
+    ...    Post-Conditions: The Scale NS operation is not triggered on the NFVO
     POST scale nsInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails

SOL005/NSLifecycleManagement-API/Subscriptions.robot

@@ -65,7 +65,7 @@ GET Subscriptions
 GET Subscription - Filter
     [Documentation]    Test ID: 5.3.2.15.5
     ...    Test title: GET Subscription - Filter
-    ...    Test objective: The objective is to test that GET method  retrive the list of existing subscriptions
+    ...    Test objective: The objective is to test that GET method  retrive the list of existing subscriptions filtered
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -83,7 +83,7 @@ PUT subscriptions - Method not implemented
     ...    Reference:  section 6.4.16.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS lifecycle management subscription is not modified by the operation
+    ...    Post-Conditions: none
     PUT subscriptions
     Check HTTP Response Status Code Is    405
 
@@ -95,18 +95,18 @@ PATCH subscriptions - Method not implemented
     ...    Reference:  section 6.4.16.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO