From 5b3489351cb237ea8b095025882263457180a6df Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Wed, 14 Oct 2020 17:20:25 +0200
Subject: [PATCH] fix for issue #121 in SOL002-VNFPerformance-API

---
 SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot | 1 -
 .../VNFPerformanceManagement-API/IndividualReport.robot   | 1 -
 .../IndividualThreshold.robot                             | 1 -
 SOL002/VNFPerformanceManagement-API/PMJobs.robot          | 1 -
 SOL002/VNFPerformanceManagement-API/Thresholds.robot      | 1 -
 .../environment/IndividualPmJob.txt                       | 6 ------
 .../environment/individualThresholds.txt                  | 6 ------
 .../VNFPerformanceManagement-API/environment/pmJobs.txt   | 8 --------
 .../VNFPerformanceManagement-API/environment/reports.txt  | 7 -------
 .../environment/thresholds.txt                            | 5 -----
 10 files changed, 37 deletions(-)
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/reports.txt
 delete mode 100644 SOL002/VNFPerformanceManagement-API/environment/thresholds.txt

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index eeced512..b95e714b 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -2,7 +2,6 @@
 Library     JSONSchemaLibrary    schemas/
 Resource    environment/variables.txt    # Generic Parameters
 Library     JSONLibrary
-Resource    environment/IndividualPmJob.txt
 Library     REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library     OperatingSystem
 Library     DependencyLibrary
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 7570068d..b3205fa8 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
-Resource          environment/reports.txt
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 003817da..d5bed32b 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library           OperatingSystem
-Resource          environment/individualThresholds.txt
 
 *** Test Cases ***
 GET Individual Threshold
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 62747fa3..160d1264 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           OperatingSystem
 Library           String
-Resource          environment/pmJobs.txt
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
 *** Test Cases ***
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 6dead1e5..98db5849 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -4,7 +4,6 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           String
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
-Resource          environment/thresholds.txt
 Library           OperatingSystem
 
 *** Test Cases ***
diff --git a/SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt b/SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
deleted file mode 100644
index 3fc3b0a0..00000000
--- a/SOL002/VNFPerformanceManagement-API/environment/IndividualPmJob.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
-${erroneousPmJobId}    erroneousPmJobId
-${newPmJobId}    newPmJobId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
diff --git a/SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt b/SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
deleted file mode 100644
index 1efba79c..00000000
--- a/SOL002/VNFPerformanceManagement-API/environment/individualThresholds.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-*** Variables ***
-${thresholdId}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${erroneousThresholdId}    erroneousThresholdId
-${newThresholdId}    newThresholdId
-${response}=    httpresponse
-${origResponse}=    httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt b/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
deleted file mode 100644
index 7d16002b..00000000
--- a/SOL002/VNFPerformanceManagement-API/environment/pmJobs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Settings ***
-Resource          variables.txt    # Generic Parameters
-*** Variables ***
-${POS_FILTER}     objectInstanceIds=${objectInstanceIds}
-${NEG_FILTER}     criteriaPmJob=erroneousAttributeName
-${fields}         criteria,reports
-${response}=    httpresponse
-${SEPERATOR}      =
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/environment/reports.txt b/SOL002/VNFPerformanceManagement-API/environment/reports.txt
deleted file mode 100644
index 6ac5f7c0..00000000
--- a/SOL002/VNFPerformanceManagement-API/environment/reports.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
-${erroneousReportId}    erroneousReportId
-${newReportId}    newReportId
-${response}=    httpresponse
-${OrigResponse}=    httpresponse
diff --git a/SOL002/VNFPerformanceManagement-API/environment/thresholds.txt b/SOL002/VNFPerformanceManagement-API/environment/thresholds.txt
deleted file mode 100644
index b044c053..00000000
--- a/SOL002/VNFPerformanceManagement-API/environment/thresholds.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-*** Variables ***
-${FILTER_OK}      objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${FILTER_KO}      criterias=erroneousFilter
-${response}=    httpresponse
-${SEPERATOR}      =
\ No newline at end of file
-- 
GitLab