From 8f8f9bac98dced478c0cb75b18432beb116030b4 Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-A5SJGL5.localdomain>
Date: Fri, 24 Jan 2020 16:20:10 +0500
Subject: [PATCH] bug-fixes

---
 .../FaultManagement-APIKeyword.robot                 |  6 +++---
 SOL003/VNFFaultManagement-API/Subscriptions.robot    |  6 +++---
 .../VnfLcmMntOperationKeywords.robot                 | 12 ++++++++----
 .../NSLCMOperationKeywords.robot                     |  4 ++--
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 60a4c212..2a035404 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -266,7 +266,7 @@ POST Subscription
     ${outputResponse}=    Output    response
     Set Global Variable    @{response}    ${outputResponse}
     
-Send POST Request for duplicated subscription
+POST Subscription Duplication permitted
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     Pass Execution If    ${VNFM_DUPLICATION} == 0    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -277,7 +277,7 @@ Send POST Request for duplicated subscription
     ${outputResponse}=    Output    response
     Set Global Variable    @{response}    ${outputResponse}
 
-Send POST Request for duplicated subscription not permitted
+POST Subscription Duplication not permitted
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     Pass Execution If    ${VNFM_DUPLICATION} == 1    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -401,4 +401,4 @@ DELETE Individual Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
     ${outputResponse}=    Output    response
-    Set Global Variable    @{response}    ${outputResponse}
\ No newline at end of file
+    Set Global Variable    @{response}    ${outputResponse}
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index e9cd11c1..2755aaf8 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -33,7 +33,7 @@ Create a new alarm subscription - DUPLICATION
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: duplicated subscription is created
-    Send POST Request for duplicated subscription
+    POST Subscription Duplication permitted
     Check HTTP Response Status Code Is    201
     Check Operation Occurrence Id
     Check HTTP Response Body Json Schema Is  FmSubscription
@@ -48,7 +48,7 @@ Create a new alarm subscription - NO DUPLICATION
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
     ...    Post-Conditions: duplicated subscription is not created
-    Send POST Request for duplicated subscription not permitted
+    POST Subscription Duplication not permitted
     Check HTTP Response Status Code Is    303
     Check Operation Occurrence Id
     Check Postcondition Subscription Resource Returned in Location Header Is Available
@@ -178,4 +178,4 @@ DELETE subscriptions - Method not implemented
     ...    Applicability: none
     ...    Post-Conditions: subscription is not deleted
     DELETE Subscriptions
-    Check HTTP Response Status Code Is    405
\ No newline at end of file
+    Check HTTP Response Status Code Is    405
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index c245f0cc..52952aa7 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1148,7 +1148,11 @@ GET test endpoint
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
     Clear Requests  ${callback_endpoint}    	 
-Verify Resources not Deleted  
-    GET multiple vnfInstances
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    vnfInstances 	
+Verify Resources not Deleted  	
+    log    Trying to get information about an individual VNF instance
+    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/${response['body']['id']} 		
+    ${outputResponse}=    Output    response
+    Set Global Variable    @{response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index ee294594..a1968087 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -158,7 +158,7 @@ Check resource existence
     Get    ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId} 
     Integer    response status    200
     
-Check Postcondition NS Instance is not crerated
+Check Postcondition NS Instance is not created
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -1101,4 +1101,4 @@ PUT notification
     Verify Mock Expectation  ${req}
     Log  Cleaning the endpoint
     Clear Requests  ${callback_endpoint}         
-        
\ No newline at end of file
+        
-- 
GitLab