Tentative fix on issue #157 and fix on issue #158

SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

@@ -280,13 +280,13 @@ GET Individual VNF Package Content with explicit Range Request
 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
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_length}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
     Log    Check Content-Length HTTP Header
     Should Contain    ${response['headers']}    Content-Length
-    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${length}
+    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${full_length}
     Log    Header Content-Length is present
 
 GET Individual VNF Package Content with invalid Range Request

SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt

@@ -2,9 +2,9 @@
 ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${full_size}        2000        # Full size of the artifact to be downloaded using partial download
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${range}          bytes 0-1023
+${full_length}        2000        # Full size of the artifact to be downloaded using partial download
+${erroneousRange}    bytes 10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
 ${vnfPackageOctetStreamId}    octetStreamPkgId
 ${vnfdOctetStreamId}    octetStreamVnfdId

SOL003/VNFPackageManagement-API/environment/vnfPackageContent.txt

 *** Variables ***
 ${ACCEPT_ZIP}     application/zip
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${length}          1024
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
 ${CONTENT_TYPE_ZIP}    application/zip

SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

@@ -459,13 +459,13 @@ GET Individual VNF Package Content with explicit Range Request
 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
-    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_size}
+    Should Be Equal As Strings    ${response['headers']['Content-Range']}    ${range}/${full_length}
     Log    Header Content-Range is present
     
 Check HTTP Response Header Content-Length Is Present and Matches the requested range length
     Log    Check Content-Length HTTP Header
     Should Contain    ${response['headers']}    Content-Length
-    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${length}
+    Should Be Equal As Integers    ${response['headers']['Content-Length']}    ${full_length}
     Log    Header Content-Length is present
 
 GET Individual VNF Package Content with invalid Range Request

SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt

@@ -2,8 +2,8 @@
 ${artifactPath}    artifactPath
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
-${range}          bytes=0-1023
-${full_size}        2000        # Full size of the artifact to be downloaded using partial download
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${range}          bytes 0-1023
+${full_length}        2000        # Full size of the artifact to be downloaded using partial download
+${erroneousRange}    bytes 10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
 ${vnfPackageOctetStreamId}    octetStreamPkgId
\ No newline at end of file

SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt

@@ -4,9 +4,8 @@ ${CONTENT_TYPE_ZIP}    application/zip
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${erroneousVnfPkgId}    erroneousPkgId
 ${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
-${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
-${range}          bytes=0-1023
-${length}          1024
+${erroneousRange}    bytes 100000-1000000    # Requesting a out of range number of bytes
+${range}          bytes 0-1023
 ${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 ${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d