From eaf4dbc36b721f9a7562541037e6fc2d6e476b08 Mon Sep 17 00:00:00 2001
From: uihassan <uihassan@etsi.org>
Date: Mon, 21 Dec 2020 07:21:23 +0500
Subject: [PATCH] Descriptors for 6.3.5.2.4 added

---
 .../VnfLcmOperationKeywords.robot                         | 8 +++++---
 .../jsons/createVnfRequest.json                           | 6 +-----
 .../jsons/patchBodyRequest.json                           | 3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 421a8d71..4105f361 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -80,7 +80,7 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance Post
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
     ${template} =    Get File    jsons/createVnfRequest.json
     ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfProvider=${provider}    vnfProductName=${product_name}    vnfSoftwareVersion=${software_version}    vnfdVersion= ${descriptor_version}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
@@ -204,7 +204,9 @@ PATCH individual vnfInstance
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Set Headers    {"If-Match": "${original_etag}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/patchBodyRequest.json
+    Run Keyword If    ${check_descriptors} == 1    Add VNF Descriptor Content to VNF Instance
+    ${template}=    Get File    jsons/patchBodyRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
@@ -1063,7 +1065,7 @@ Parse SOL006
     Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}
     Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}
 
-Add VNF Descriptor Content to VNF Instance Post
+Add VNF Descriptor Content to VNF Instance
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance
     
 Parse SOL001 VNF Instance
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
index 6d606643..08fe8a18 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/createVnfRequest.json
@@ -5,9 +5,5 @@
   "vnfProvider":"{vnfProvider}",
   "vnfProductName":"{vnfProductName}",
   "vnfSoftwareVersion":"{vnfSoftwareVersion}",
-  "vnfdVersion":"{vnfdVersion}",
-  "instantiatedVnfInfo":{{
-  	"flavourId":"{flavourId}",
-  	"vnfState":"STARTED"
-  }}
+  "vnfdVersion":"{vnfdVersion}"
 }}
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
index 0c8845c2..a9f1c9da 100644
--- a/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
+++ b/SOL002/VNFLifecycleManagement-API/jsons/patchBodyRequest.json
@@ -1,4 +1,5 @@
 {
   "vnfInstanceName": "vnf new name",
-  "vnfInstanceDescription": "new description"
+  "vnfInstanceDescription": "new description",
+  "vnfdId": "{vnfdId}"
 }
\ No newline at end of file
-- 
GitLab