From 6d4a5d58415eaa688a06a394ddfaf615c607af00 Mon Sep 17 00:00:00 2001
From: zafar <zafar@etsi.org>
Date: Thu, 24 Dec 2020 17:03:54 +0500
Subject: [PATCH] descriptors added for IndividualVNFPackage &
 NotificationConsumer resources

---
 SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot | 1 +
 SOL005/VNFPackageManagement-API/NotificationConsumer.robot | 7 +++++--
 .../jsons/VnfPackageChangeNotification.json                | 2 +-
 .../jsons/VnfPackageOnboardingNotification.json            | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index 5a1efdce..6e6a4d5d 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -19,6 +19,7 @@ GET Individual VNF Package
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   vnfPkgInfo
     Check HTTP Response Body vnfPkgInfo Identifier matches the requested VNF Package
+    Check HTTP Response Body vnfPkgInfo content against VNF Descriptor
 
 GET Individual VNF Package with invalid resource identifier
     [Documentation]    Test ID: 5.3.5.2.2
diff --git a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
index b32b7f82..d8a5f008 100644
--- a/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
+++ b/SOL005/VNFPackageManagement-API/NotificationConsumer.robot
@@ -1,6 +1,7 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt
+Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary
 Library           String
@@ -52,8 +53,9 @@ Post VNF Package Onboarding Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
     ${template} =    Get File    jsons/VnfPackageOnboardingNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -63,8 +65,9 @@ Post VNF Package Change Notification
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Package
     ${template} =    Get File    jsons/VnfPackageChangeNotification.json
-    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    vnfPkgId=${vnfPkgId}    vnfdId=${descriptor_id}
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json b/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
index 10354520..e6ababfa 100644
--- a/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
+++ b/SOL005/VNFPackageManagement-API/jsons/VnfPackageChangeNotification.json
@@ -4,7 +4,7 @@
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"vnfPkgId":"{vnfPkgId}",
-	"vnfdId":"",
+	"vnfdId":"{vnfdId}",
 	"changeType":"PKG_DELETE",
 	"_links":""
 }}
diff --git a/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json b/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
index 08fdbf7c..f455852d 100644
--- a/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
+++ b/SOL005/VNFPackageManagement-API/jsons/VnfPackageOnboardingNotification.json
@@ -4,7 +4,7 @@
 	"subscriptionId":"{subscriptionId}",
 	"timeStamp":"",
 	"vnfPkgId":"{vnfPkgId}",
-	"vnfdId":"",
+	"vnfdId":"{vnfdId}",
 	"vnfmInfo":"",
 	"_links":""
 }}
-- 
GitLab