Commit 9a2e5b95 authored by Najam UI Hassan's avatar Najam UI Hassan
Browse files

template fix added

parent e9893c5f

SOL002/VNFPerformanceManagement-API/PMJobs.robot

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ Send Post Request Create new VNF Performance Monitoring Job 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    ${template}=    Get File    jsons/CreatePmJobRequest.json

    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callbackuri=${callback_uri}

    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}

    POST    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot

+5 −2
Original line number Diff line number Diff line 
*** Settings ***

Library    String

Resource    environment/variables.txt

Resource    environment/subscriptions.txt

Resource    environment/individualSubscription.txt
@@ -104,7 +105,8 @@ Send Post Request for VNF Performance Subscription 
    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Set headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    ${body_request}=    Get File    jsons/subscriptions.json

    ${template}=    Get File    jsons/subscriptions.json

    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -135,7 +137,8 @@ Send Post Request for Duplicated VNF Performance Subscription 
    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Set headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    ${body_request}=    Get File    jsons/subscriptions.json

    ${template}=    Get File    jsons/subscriptions.json

    ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    subscribe=${subscribe}

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL002/VNFPerformanceManagement-API/environment/variables.txt

+3 −1
Original line number Diff line number Diff line
@@ -26,3 +26,5 @@ ${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies. 
${response}        http-response



${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a



${subscribe}    /subscribe
 
 No newline at end of file

SOL002/VNFPerformanceManagement-API/jsons/subscriptions.json

+5 −5
Original line number Diff line number Diff line 
{

	"callbackUri": "http://127.0.0.1/subscribe",

	"filter": {

{{

	"callbackUri": "{callback_uri}{subscribe}",

	"filter": {{

		"notificationTypes": ["ThresholdCrossedNotification"]

	}

}
 
 No newline at end of file
 
	}}

}}
 
 No newline at end of file