fix for issue #121 in SOL005-NSD-Performance

SOL005/NSPerformanceManagement-API/IndividualPmJob.robot

@@ -2,7 +2,6 @@
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
-Resource          environment/IndividualPmJob.txt
 Resource          NSPerformanceManagementKeywords.robot
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 

SOL005/NSPerformanceManagement-API/IndividualReport.robot

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

SOL005/NSPerformanceManagement-API/IndividualThreshold.robot

@@ -6,7 +6,6 @@ Resource          NSPerformanceManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library           OperatingSystem
-Resource          environment/individualThresholds.txt
 
 *** Test Cases ***
 GET Individual Threshold

SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot

 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pmJobs.txt
-Resource    environment/IndividualPmJob.txt
-Resource    environment/reports.txt
-Resource    environment/thresholds.txt
-Resource    environment/individualThresholds.txt
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library    MockServerLibrary 
 Library    OperatingSystem

SOL005/NSPerformanceManagement-API/Notifications.robot

 *** Setting ***
-Resource	environment/notifications.txt
 Resource	environment/variables.txt
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true

SOL005/NSPerformanceManagement-API/PMJobs.robot

@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Resource          NSPerformanceManagementKeywords.robot
 Library           JSONLibrary
 Library           OperatingSystem
-Resource          environment/pmJobs.txt
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
 Library           MockServerLibrary
 

SOL005/NSPerformanceManagement-API/Thresholds.robot

@@ -5,7 +5,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Resource          NSPerformanceManagementKeywords.robot
 Library           JSONLibrary
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Resource          environment/thresholds.txt
 Library           OperatingSystem
 
 *** Test Cases ***

SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt

-*** Variables ***
-${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
-${erroneousPmJobId}    erroneousPmJobId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
-${newPmJobId}    newPmJobId

SOL005/NSPerformanceManagement-API/environment/individualThresholds.txt

-*** Variables ***
-${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${erroneousThresholdId}    erroneousThresholdId
-${newThresholdId}    newThresholdId
-${response}=    httpresponse
-${origResponse}=    httpresponse

SOL005/NSPerformanceManagement-API/environment/notifications.txt

-*** Variables ***
-${callback_uri}    http://localhost
-${callback_port}    9091
-${callback_endpoint}    /endpoint
-${callback_endpoint_fwd}    /endpoint/check
-${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
-${total_polling_time}   2 min
-${polling_interval}     10 sec
-
-${notification_request}    []
-${notification_response}    []
\ No newline at end of file

SOL005/NSPerformanceManagement-API/environment/pmJobs.txt

-*** Variables ***
-${POS_FILTER}     objectInstanceIds=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
-${fields}         criteria,objectInstanceIds

SOL005/NSPerformanceManagement-API/environment/reports.txt

-*** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
-${erroneousReportId}    erroneousReportId
-${newReportId}    newReportId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse

SOL005/NSPerformanceManagement-API/environment/thresholds.txt

-*** Variables ***
-${FILTER_OK_Threshold}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${FILTER_KO}      criterias=erroneousFilter
-${SEPERATOR}      =
\ No newline at end of file

SOL005/NSPerformanceManagement-API/environment/variables.txt

@@ -34,4 +34,33 @@ ${collectionPeriod}     10
 ${reportingPeriod}      30
 
 ${response}    {}
-${CONTENT_TYPE_PATCH}    application/merge-patch+json
\ No newline at end of file
+${CONTENT_TYPE_PATCH}    application/merge-patch+json
+
+${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
+${erroneousPmJobId}    erroneousPmJobId
+${newPmJobId}    newPmJobId
+
+${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${erroneousThresholdId}    erroneousThresholdId
+${newThresholdId}    newThresholdId
+${origResponse}=    httpresponse
+
+${callback_endpoint_fwd}    /endpoint/check
+
+${notification_request}    []
+${notification_response}    []
+
+
+${POS_FILTER}     objectInstanceIds=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
+${fields}         criteria,objectInstanceIds
+
+
+${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
+${erroneousReportId}    erroneousReportId
+${newReportId}    newReportId
+
+
+${FILTER_OK_Threshold}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${FILTER_KO}      criterias=erroneousFilter
+${SEPERATOR}      =