From 5f5861bf47ab3fbdfc3c4833b16bd44be20a9d4f Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Wed, 8 Apr 2020 15:05:29 +0500
Subject: [PATCH] fixed post-condition issues

---
 .../Subscriptions.robot                          |  1 +
 .../VnfLcmOperationKeywords.robot                | 16 +++++++++++++++-
 .../VnfLcmOperationOccurences.robot              |  1 +
 .../DeleteNSInstanceWorkflow.robot               |  2 +-
 .../HealNSTaskWorkflow.robot                     |  2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index a65cd4a6..b9227954 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -171,4 +171,5 @@ DELETE subscriptions - Method not implemented
     ...    Post-Conditions: check that resources are not deleted
     DELETE subscriptions
 	Check HTTP Response Status Code Is    405
+	Check Subscription resource exist
     
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index d0737e0c..2be255d9 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -922,4 +922,18 @@ GET test endpoint
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
-    Clear Requests  ${callback_endpoint}    	
\ No newline at end of file
+    Clear Requests  ${callback_endpoint}    
+    
+Check LCM OP OCC resource exist
+    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_lcm_op_occs
+    Integer    response status    200	
+    
+Check Subscription resource exist
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    Integer    response status    200	
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 2130f165..86df8cac 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -146,3 +146,4 @@ DELETE status information about multiple VNF LCM operation occurrences - Method
     ...    Post-Conditions: Verify that resources are not deleted
     DELETE VNF LCM OP occurences
     Check HTTP Response Status Code Is    405
+    Check LCM OP OCC resource exist
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 6bb18c9c..289debbf 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -15,7 +15,7 @@ NS Instance Deletion
     ...    Reference: clause 6.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: Resource should be deleted
+    ...    Post-Conditions: NS Instance resource is deleted
     Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
index ceb72fb8..af83a9b2 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
@@ -17,7 +17,7 @@ Heal Flow of NS lifecycle management operations
     ...    Reference: clause 6.4.7 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: Resource Instantiated
+    ...    Post-Conditions: NS Instance still in INSTANTIATED state
     Check resource instantiated
     POST Heal NSInstance
     Check HTTP Response Status Code Is    202
-- 
GitLab