From c850ccaba6145b0a0a989900a489bdaf5569f5e0 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Mon, 8 Feb 2021 14:36:45 +0100
Subject: [PATCH] Fix issue #151

---
 .../VNFPackageManagement-API/VNFPackageContent.robot   |  2 +-
 .../VNFPackageManagementKeywords.robot                 | 10 ++++++++++
 .../VNFPackageManagement-API/VNFPackageContent.robot   |  2 +-
 .../VNFPackageManagementKeywords.robot                 | 10 ++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
index a7ed3c02..ded06fca 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageContent.robot
@@ -43,7 +43,7 @@ GET Individual VNF Package Content with Range Request and NFVO not supporting Ra
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none    
-    GET Individual VNF Package Content with Range Request
+    GET Individual VNF Package Content with explicit Range Request
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip    
 
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index a3fdc256..162315d2 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -272,6 +272,16 @@ GET Individual VNF Package Content with Range Request
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+GET Individual VNF Package Content with explicit Range Request
+    Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
 
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
index 1b0c58d4..57401ae3 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
@@ -44,7 +44,7 @@ GET Individual VNF Package Content with Range Request and NFVO not supporting Ra
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the VNF package file
     ...    Post-Conditions: none    
-    GET Individual VNF Package Content with Range Request
+    GET Individual VNF Package Content with explicit Range Request
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header Content-Type Is    application/zip    
 
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 2b47c387..aab633fa 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -458,6 +458,16 @@ GET Individual VNF Package Content with Range Request
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+GET Individual VNF Package Content with explicit Range Request
+    Log    Trying to get a VNF Package Content using RANGE using an NFVO that can handle it
+    Set Headers    {"Accept": "${ACCEPT_ZIP}"}
+    Set Headers    {"Range": "${range}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+
 Check HTTP Response Header Content-Range Is Present and Matches the requested range
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range
-- 
GitLab