From 40f8cf3b1d2746c95a7842fc424343d4c3961244 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Mon, 1 Jul 2019 08:07:56 +0200
Subject: [PATCH] fixes to low level code for subscriptions
---
.../VNFPerformanceManagementKeywords.robot | 4 ++++
SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot | 4 ++++
.../VNFPackageManagementKeywords.robot | 6 +++++-
SOL005/NSDManagement-API/NSDManagementKeywords.robot | 4 ++++
.../NSPerformanceManagementKeywords.robot | 4 ++++
.../VNFPackageManagementKeywords.robot | 6 +++++-
6 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index a48fdb7e..11f17fb7 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -310,6 +310,10 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
${result}= Output response body
Validate Json PmSubscription.schema.json ${result}
Log Validated PmSubscription schema
+ ${body}= Get File jsons/subscriptions.json
+ ${subscription}= evaluate json.loads('''${body}''') json
+ Should Be Equal ${result['callbackUri']} ${subscription['callbackUri']}
+ Log Validated Issued subscription is same as original
Check Postcondition VNF Performance Subscriptions Exists
Log Checking that subscriptions exists
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index caedee1f..426ba2c0 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -214,6 +214,10 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
${result}= Output response body
Validate Json VnfIndicatorSubscription.schema.json ${result}
Log Validated VnfIndicatorSubscription schema
+ ${body}= Get File jsons/subscriptions.json
+ ${subscription}= evaluate json.loads('''${body}''') json
+ Should Be Equal ${result['callbackUri']} ${subscription['callbackUri']}
+ Log Validated Issued subscription is same as original
Check HTTP Response Header Contains
[Arguments] ${CONTENT_TYPE}
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index ed9ef1dd..62bd86a7 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -665,7 +665,11 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
Should Contain ${contentType} application/json
${result}= Output response body
Validate Json PkgmSubscription.schema.json ${result}
- Log Validated PkgmSubscription schema
+ Log Validated PkgmSubscription schema
+ ${body}= Get File jsons/subscriptions.json
+ ${subscription}= evaluate json.loads('''${body}''') json
+ Should Be Equal ${result['callbackUri']} ${subscription['callbackUri']}
+ Log Validated Issued subscription is same as original
Get Individual VNF Package Subscription
Log Trying to get a single subscription identified by subscriptionId
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 0b489eeb..bbdc8f7c 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -924,6 +924,10 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
${result}= Output response body
Validate Json NsdmSubscription.schema.json ${result}
Log Validated NsdmSubscription schema
+ ${body}= Get File jsons/subscriptions.json
+ ${subscription}= evaluate json.loads('''${body}''') json
+ Should Be Equal ${result['callbackUri']} ${subscription['callbackUri']}
+ Log Validated Issued subscription is same as original
Get Individual NSD Management Subscription
Log Trying to get a single subscription identified by subscriptionId
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 6312c1b0..e688ea43 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -685,6 +685,10 @@ Check Postcondition Subscription Resource URI Returned in Location Header Is Ava
${result}= Output response body
Validate Json PmSubscriptions.schema.json ${result}
Log Validated PmSubscriptions schema
+ ${body}= Get File jsons/subscriptions.json
+ ${subscription}= evaluate json.loads('''${body}''') json
+ Should Be Equal ${result['callbackUri']} ${subscription['callbackUri']}
+ Log Validated Issued subscription is same as original
Get Individual NS Performance Subscription
Log Trying to get a single subscription identified by subscriptionId
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 92e35285..618ef76f 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -801,7 +801,11 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
Should Contain ${contentType} application/json
${result}= Output response body
Validate Json PkgmSubscription.schema.json ${result}
- Log Validated PkgmSubscription schema
+ Log Validated PkgmSubscription schema
+ ${body}= Get File jsons/subscriptions.json
+ ${subscription}= evaluate json.loads('''${body}''') json
+ Should Be Equal ${result['callbackUri']} ${subscription['callbackUri']}
+ Log Validated Issued subscription is same as original
Get Individual VNF Package Subscription
Log Trying to get a single subscription identified by subscriptionId
--
GitLab