From a41456b942682a5606689ff9223f355cd5d26b95 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
---
SOL002/VNFFaultManagement-API/Subscriptions.robot | 2 +-
.../FaultManagement-APIKeyword.robot | 6 ++++++
SOL003/VNFFaultManagement-API/Subscriptions.robot | 2 ++
.../VnfLcmMntOperationKeywords.robot | 12 ++++++++----
.../DeleteNSInstanceWorkflow.robot | 3 ++-
.../NSLCMOperationKeywords.robot | 7 +++++++
6 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index ea28925c..718ed29b 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -292,6 +292,6 @@ Check HTTP Response Body Json Schema Is
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions//${response['body']['id']}
Integer response status 200
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index fb8d10c4..736d8d77 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -12,6 +12,12 @@ Library Process
${original_etag} 1234
*** Keywords ***
+Check created Subscription existance
+ ${subscriptionId} = ${response['body']['id']}
+ Set Headers {"Accept":"${ACCEPT}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ Integer response status 200
Check Operation Occurrence Id
${opOccId}= Get Value From Json ${response.headers} $..Location
Should Not Be Empty ${opOccId}
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index 8b12d1af..e85bdc4e 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -21,6 +21,7 @@ Create a new Fault Management alarm subscription
Check HTTP Response Status Code Is 201
Check Operation Occurrence Id
Check HTTP Response Body Json Schema Is FmSubscription
+ Check created Subscription existance
Create a new alarm subscription - DUPLICATION
@@ -50,6 +51,7 @@ Create a new alarm subscription - NO DUPLICATION
Check HTTP Response Status Code Is 303
Check Operation Occurrence Id
Check HTTP Response Body Json Schema Is FmSubscription
+ Check created Subscription existance
Retrieve a list of alarm subscriptions
[Documentation] Test ID: 7.3.5.3.4
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index c3f4267a..a1adf8ee 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
\ No newline at end of file
+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}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 157fd663..6bb18c9c 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -19,4 +19,5 @@ NS Instance Deletion
Check resource not_instantiated
DELETE IndividualNSInstance
Check HTTP Response Status Code Is 204
- Check HTTP Response Body Json Schema Is NsIdentifierDeletionNotification
\ No newline at end of file
+ Check HTTP Response Body Json Schema Is NsIdentifierDeletionNotification
+ Check Instance Deleted
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index fee83255..7e9b0b31 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -30,6 +30,13 @@ Check subscription existence
Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
Integer response status 200
+Check Instance Deleted
+ Set Headers {"Accept":"${ACCEPT}"}
+ Set Headers {"Content-Type": "${CONTENT_TYPE}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ Delete ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}
+ Integer response status 400
+
Check Fail not supported
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Get ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
--
GitLab