fix for issue #121 in SOL003-VNFPckMgmt-API

SOL003/VNFPackageManagement-API/IndividualSubscription.robot

 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualSubscription.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary

SOL003/VNFPackageManagement-API/IndividualVNFPackage.robot

 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/individualVnfPackage.txt
 Resource          VNFPackageManagementKeywords.robot  
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false

SOL003/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot

 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageArtifacts.txt
 Resource          VNFPackageManagementKeywords.robot 
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false

SOL003/VNFPackageManagement-API/Subscriptions.robot

 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/subscriptions.txt
 Resource          VNFPackageManagementKeywords.robot
 Library           OperatingSystem
 Library           JSONLibrary

SOL003/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot

 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfdInIndividualVnfPackage.txt
 Resource          VNFPackageManagementKeywords.robot 
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false

SOL003/VNFPackageManagement-API/VNFPackageContent.robot

 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/vnfPackageContent.txt
 Resource          VNFPackageManagementKeywords.robot  
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false

SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/subscriptions.txt
-Resource    environment/individualSubscription.txt
-Resource    environment/vnfPackages.txt
-Resource    environment/individualVnfPackage.txt
-Resource    environment/vnfPackageContent.txt
-Resource    environment/vnfPackageArtifacts.txt
-Resource    environment/vnfdInIndividualVnfPackage.txt
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem

SOL003/VNFPackageManagement-API/VNFPackages.robot

 *** Settings ***
-Resource          environment/vnfPackages.txt    # VNF Packages specific parameters
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Resource          VNFPackageManagementKeywords.robot    

SOL003/VNFPackageManagement-API/environment/individualSubscription.txt

-*** Variables ***
-${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
-${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
-${newSubscriptionId}    newSubsciptionId
-${response}    httpresponse
-${origResponse}    httpresponse

SOL003/VNFPackageManagement-API/environment/individualVnfPackage.txt

-*** Variables ***
-${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${erroneousVnfdId}    erroneousVnfdId 
\ No newline at end of file

SOL003/VNFPackageManagement-API/environment/subscriptions.txt

-*** Variables ***
-${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
-${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
-${callbackUri}    http://172.22.1.7:9091/vnfpkgm/subscriptions
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-${SEPERATOR}      =
\ No newline at end of file

SOL003/VNFPackageManagement-API/environment/variables.txt

@@ -22,7 +22,7 @@ ${NFVO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the F
 
 ${NFVO_ALLOWS_DUPLICATE_SUBS}    1
 
-${response}
+${response}    httpresponse
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
@@ -41,3 +41,47 @@ ${notification_response}    []
 
 ${NFVO_non-MANO_OK}    1    # If 1 means that non-MANO artifacts are supported by the NFVO
 ${non_mano_artifact_sets}    
+
+
+${subscriptionId}    f3ae6df7-07e1-47c9-8924-9ebe10343586
+${erroneousSubscriptionId}    442e3ee5-0499-4849-9b31-eb91ce1638f1    # Not existing ID on the subscriptions
+${newSubscriptionId}    newSubsciptionId
+
+${origResponse}    httpresponse
+
+
+${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
+${erroneousVnfdId}    erroneousVnfdId 
+
+
+${filter_ok}      callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
+${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based
+${SEPERATOR}      =
+
+
+${ACCEPT_PLAIN}    text/plain
+${CONTENT_TYPE_PLAIN}    text/plain
+${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
+${ACCEPT_ZIP}     application/zip
+${CONTENT_TYPE_ZIP}    application/zip
+${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
+${erroneousVnfPkgId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
+${vndIdZipVnfd}       f5b220d4-6177-4ebb-a554-a43311e16075 
+
+
+${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
+${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
+${vnfPackageOctetStreamId}    octetStreamPkgId
+${vnfdOctetStreamId}    octetStreamVnfdId
+${vndEncryptedArtifactID}    encryptedId
+
+
+${length}          1024
+
+${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
+${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
+${fields}         softwareImages,additionalArtifacts
+${VAR_SEPERATOR}    &

SOL003/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt

-*** Variables ***
-${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
-${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
-${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    octetStreamPkgId
-${vnfdOctetStreamId}    octetStreamVnfdId
-${vndEncryptedArtifactID}    encryptedId
\ No newline at end of file

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
\ No newline at end of file

SOL003/VNFPackageManagement-API/environment/vnfPackages.txt

-*** Variables ***
-${POS_FILTER}     vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW    # Positive case, suing compiant fields name for filtering get request
-${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
-${fields}         softwareImages,additionalArtifacts
-${response}       httpresponse   
-${SEPERATOR}      =
-${VAR_SEPERATOR}    &
\ No newline at end of file

SOL003/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt

-*** Variables ***
-${ACCEPT_PLAIN}    text/plain
-${CONTENT_TYPE_PLAIN}    text/plain
-${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
-${ACCEPT_ZIP}     application/zip
-${CONTENT_TYPE_ZIP}    application/zip
-${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
-${erroneousVnfPkgId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${vndIdZipVnfd}       f5b220d4-6177-4ebb-a554-a43311e16075