From 3a5608ffbe297e7a342d0cde2331f6fe508e1b4d Mon Sep 17 00:00:00 2001
From: zhaome <mengxuan.zhao@eglobalmark.com>
Date: Mon, 21 Jan 2019 18:39:55 +0100
Subject: [PATCH] Bugfix Cancel Operation
---
.../CancelOperationTask.robot | 34 +++++++++----------
.../CancelOperationTask.robot | 26 +++++++-------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index dd8e7b71..2ae26999 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -22,17 +22,17 @@ Post Cancel operation task
Should Contain ${headers} Location
Log Validation OK
-Post Fail operation task Conflict (Not-FAILED_TEMP)
+Post Cancel operation task Conflict (Not-FAILED_TEMP)
# 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 not in FAILED_TEMP state,
... or another error handling action is starting, such as retry or rollback.
- ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error.
Depends on test failure Check resource FAILED_TEMP
Log Final Fail an operation
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel
Integer response status 409
Log Status code validated
${problemDetails}= Output response body
@@ -40,17 +40,17 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
Validate Json ProblemDetails.schema.json ${json}
Log Validation OK
-Post Fail operation task Conflict (parallel LCM operation)
+Post Cancel operation task 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 not in FAILED_TEMP state,
... or another error handling action is starting, such as retry or rollback.
- ... The response body shall contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+ ... The response body shall contain a ProblemDetails structure, in which the �detail� attribute should convey more information about the error.
[Setup] Launch another error handling action
log Final Fail an operation
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel
Log Validate Status code
Integer response status 409
${problemDetails}= Output response body
@@ -59,18 +59,18 @@ Post Fail operation task Conflict (parallel LCM operation)
Log Validation OK
[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
-Post Fail operation task Not Found
+Post Cancel operation task 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 be returned
... if the task is not supported for the VNF LCM operation occurrence 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.
+ ... 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 Fail not supported
log Final fail an operation
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel
Log Validate Status code
Integer response status 409
${problemDetails}= Output response body
@@ -78,31 +78,31 @@ Post Fail operation task Not Found
Validate Json ProblemDetails.schema.json ${json}
Log Validation OK
-GET Fail operation task - Method not implemented
+GET Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
-PUT Fail operation task - Method not implemented
+PUT Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Put ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
-PATCH Fail operation task - Method not implemented
+PATCH Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
-DELETE Fail operation task - Method not implemented
+DELETE Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index 888e448f..6203d8f8 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -23,7 +23,7 @@ Post Cancel operation task
Should Contain ${headers} Location
Log Validation OK
-Post Fail operation task Conflict (Not-FAILED_TEMP)
+Post Cancel operation task Conflict (Not-FAILED_TEMP)
# 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.
@@ -41,7 +41,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
Validate Json ProblemDetails.schema.json ${json}
Log Validation OK
-Post Fail operation task Conflict (parallel LCM operation)
+Post Cancel operation task 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.
@@ -51,7 +51,7 @@ Post Fail operation task Conflict (parallel LCM operation)
[Setup] Launch another error handling action
log Final Fail an operation
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel
Log Validate Status code
Integer response status 409
${problemDetails}= Output response body
@@ -60,7 +60,7 @@ Post Fail operation task Conflict (parallel LCM operation)
Log Validation OK
[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
-Post Fail operation task Not Found
+Post Cancel operation task 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.
@@ -71,7 +71,7 @@ Post Fail operation task Not Found
[Setup] Check Fail not supported
log Final fail an operation
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
+ Post ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/cancel
Log Validate Status code
Integer response status 409
${problemDetails}= Output response body
@@ -79,31 +79,31 @@ Post Fail operation task Not Found
Validate Json ProblemDetails.schema.json ${json}
Log Validation OK
-GET Fail operation task - Method not implemented
+GET Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Get ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
-PUT Fail operation task - Method not implemented
+PUT Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Put ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
-PATCH Fail operation task - Method not implemented
+PATCH Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Patch ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
-DELETE Fail operation task - Method not implemented
+DELETE Cancel operation task - 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_lcm_op_occs/${vnfInstanceId}/fail
+ Delete ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/cancel
Log Validate Status code
Integer response status 405
--
GitLab