From f935e6277c9c0ef4d9b8d8d8fbbaefd1cad1ddd3 Mon Sep 17 00:00:00 2001
From: hammad zafar <hammad.zafar@xflowresearch.com>
Date: Tue, 23 Feb 2021 20:16:59 +0500
Subject: [PATCH] minor bug fixes
---
.../IndividualThreshold.robot | 7 ++++---
SOL002/VNFPerformanceManagement-API/PMJobs.robot | 2 +-
.../jsons/CreatePmJobRequestInvalidURI.json | 10 ----------
3 files changed, 5 insertions(+), 14 deletions(-)
delete mode 100644 SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequestInvalidURI.json
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 043a73c8..b89cfb10 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -123,6 +123,7 @@ PATCH Individual Threshold - Unprocessible Entity
Send Patch request for individual VNF Performance Threshold with Unreachable Callback URI
Check HTTP Response Status Code Is 422
Check HTTP Response Body Json Schema Is ProblemDetails
+ Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
*** Keywords ***
GET Individual VNF Performance Threshold
@@ -166,9 +167,6 @@ Send Put request for individual VNF Performance Threshold
Log Trying to perform a PUT. This method should not be supported.
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
- ${origOutput}= Output response
- Set Suite Variable ${origResponse} ${origOutput}
PUT ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -190,6 +188,9 @@ Send Patch request for individual VNF Performance Threshold with Unreachable Cal
Set Headers {"Accept":"${ACCEPT_JSON}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+ GET ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+ ${origOutput}= Output response
+ Set Suite Variable ${origResponse} ${origOutput}
${template}= Get File jsons/ThresholdModification.json
${body}= Format String ${template} callback_uri=${unreachable_callback_uri}
PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId} ${body}
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 46b92cb6..6729e776 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -310,7 +310,7 @@ Send Post Request Create new VNF Performance Monitoring Job with Unreachable Cal
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
${template}= Get File jsons/CreatePmJobRequest.json
- ${body}= Format String ${template} objectInstanceIds=${objectInstanceIds} callback_uri=${unreachable_callback_uri}
+ ${body}= Format String ${template} objectInstanceIds=${objectInstanceIds} callback_uri=${unreachable_callback_uri}:${callback_port}
POST ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs ${body}
${output}= Output response
Set Suite Variable ${response} ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequestInvalidURI.json b/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequestInvalidURI.json
deleted file mode 100644
index 5986c37f..00000000
--- a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequestInvalidURI.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{{
- "objectInstanceIds" : ["{objectInstanceIds}"],
- "criteria" : {{
- "performanceMetric": [],
- "performanceMetricGroup": [],
- "collectionPeriod": 10,
- "reportingPeriod": 30
- }},
- "callbackUri": "{callbackUri}"
-}}
\ No newline at end of file
--
GitLab