Commit 487fc057 authored by M. Rehan Abbasi's avatar M. Rehan Abbasi Committed by Giacomo Bernini
Browse files

update json data models

parent 93bd9b13

SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot

+50 −50
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Library MockServerLibrary 
GET all NFV-MANO Performance Monitoring Jobs

    Log    Trying to get all PM Jobs present in the NFV-MANO

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -55,7 +55,7 @@ GET Performance Monitoring Jobs with expired or revoked authorization token 
GET NFV-MANO Performance Monitoring Jobs with attribute-based filter

    Log    Trying to get all PM Jobs present in the NFV-MANO, using filter params

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -63,7 +63,7 @@ GET NFV-MANO Performance Monitoring Jobs with attribute-based filter 
GET NFV-MANO Performance Monitoring Jobs with all_fields attribute selector

    Log    Trying to get all PM Jobs present in the NFV-MANO, using 'all_fields' filter

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -71,7 +71,7 @@ GET NFV-MANO Performance Monitoring Jobs with all_fields attribute selector 
GET NFV-MANO Performance Monitoring Jobs with exclude_default attribute selector

    Log    Trying to get all NFV-MANO Packages present in the NFV-MANO, using filter params

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -80,7 +80,7 @@ GET NFV-MANO Performance Monitoring Jobs with fields attribute selector 
    Log    Trying to get all NFV-MANO Packages present in the NFV-MANO, using filter params

    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFV-MANO is not supporting 'fields'

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -89,7 +89,7 @@ GET NFV-MANO Performance Monitoring Jobs with fields and exclude_default attribu 
    Log    Trying to get all NFV-MANO Packages present in the NFV-MANO, using filter params

    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFV-MANO is not supporting 'fields'

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default&fields=${fields}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -98,7 +98,7 @@ GET NFV-MANO Performance Monitoring Jobs with exclude_fields attribute selector 
    Log    Trying to get all NFV-MANO Packages present in the NFV-MANO, using filter params

    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as NFV-MANO is not supporting 'fields'

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -106,7 +106,7 @@ GET NFV-MANO Performance Monitoring Jobs with exclude_fields attribute selector 
GET NFV-MANO Performance Monitoring Jobs with invalid attribute-based filter

    Log    Trying to get all PM Jobs present in the NFV-MANO, using an erroneous filter param

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -124,9 +124,9 @@ Send Post Request Create new NFV-MANO Performance Monitoring Job 
    Log    Creating a new PM Job

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

    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

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

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

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

    Check GET response from Notification Endpoint

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

    ${output}=    Output    response
@@ -136,9 +136,9 @@ Send Post Request Create new NFV-MANO Performance Monitoring Job for unreachable 
    Log    Creating a new PM Job

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

    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

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

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

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

    Check GET response from Unreachable Notification Endpoint

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

    ${output}=    Output    response
@@ -147,7 +147,7 @@ Send Post Request Create new NFV-MANO Performance Monitoring Job for unreachable 
Send PUT Request for all NFV-MANO Performance Monitoring Jobs 

    Log    Trying to perform a PUT. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -155,7 +155,7 @@ Send PUT Request for all NFV-MANO Performance Monitoring Jobs 
Send PATCH Request for all NFV-MANO Performance Monitoring Jobs 

    Log    Trying to perform a PUT. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -163,7 +163,7 @@ Send PATCH Request for all NFV-MANO Performance Monitoring Jobs 
Send DELETE Request for all NFV-MANO Performance Monitoring Jobs 

    Log    Trying to perform a PUT. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -171,7 +171,7 @@ Send DELETE Request for all NFV-MANO Performance Monitoring Jobs 
Check Postcondition PmJob Exists

    Log    Checking that Pm Job exists

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -222,7 +222,7 @@ Check HTTP Response Header Contains Link 
GET individual NFV-MANO Performance Job

    Log    Trying to get a Pm Job 

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -230,7 +230,7 @@ GET individual NFV-MANO Performance Job 
GET individual NFV-MANO Performance Job with invalid resource identifier  

    Log    Trying to perform a negative get, using erroneous PM Job identifier

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -238,7 +238,7 @@ GET individual NFV-MANO Performance Job with invalid resource identifier 
Send Delete request for individual NFV-MANO Performance Job

    Log    Trying to delete an existing PM Job

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -246,7 +246,7 @@ Send Delete request for individual NFV-MANO Performance Job 
Send Delete request for individual NFV-MANO Performance Job with invalid resource identifier

    Log    Trying to perform a negative delete, using erroneous PM Job identifier

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -254,7 +254,7 @@ Send Delete request for individual NFV-MANO Performance Job with invalid resourc 
Send Post request for individual NFV-MANO Performance Job    

    Log    Trying to perform a POST (method should not be implemented)

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -262,7 +262,7 @@ Send Post request for individual NFV-MANO Performance Job 
Send Put request for individual NFV-MANO Performance Job    

    Log    Trying to perform a POST (method should not be implemented)

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}
@@ -274,7 +274,7 @@ Send Patch request for individual NFV-MANO Performance Job 
    Log    Trying to perform a PATCH on PM Job

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

    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    Check GET response from Notification Endpoint

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

    ${body}=    Format String    ${template}    callbackUri=${callback_uri}
@@ -287,7 +287,7 @@ Send Patch request for individual NFV-MANO Performance Job - Etag mismatch 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Set Headers    {"If-Match": "${invalid_etag}"}

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    Check GET response from Notification Endpoint

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

    ${body}=    Format String    ${template}    callbackUri=${callback_uri}
@@ -345,7 +345,7 @@ Send Post Request Create new Performance Threshold 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

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

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

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -357,7 +357,7 @@ Send Post Request Create new Performance Threshold with unreachable notification 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Check GET response from Unreachable Notification Endpoint

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

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

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

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -390,7 +390,7 @@ Send DELETE Request for all Performance Thresholds 
Check Postcondition Threshold Exists

    Log    Checking that Threshold exists

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${response['body']['id']}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL009/NFVMANOPerformanceManagement-API/Notifications.robot

+1 −1
Original line number Diff line number Diff line
@@ -112,4 +112,4 @@ Configure Notification Forward 
Create Sessions

    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance

    Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue

    Create Mock Session  ${callback_uri}:${callback_port}
 
 No newline at end of file
 
    Create Mock Session  ${callback_uri}
 
 No newline at end of file

SOL009/NFVMANOPerformanceManagement-API/jsons/CreatePmJobRequest.json

+3 −1
Original line number Diff line number Diff line
@@ -8,5 +8,7 @@ 
		"performanceMetricGroup": [],

		"collectionPeriod": 10,

		"reportingPeriod": 30

	}}

		}},

		"callbackUri": "{callbackUri}",

		"authentication": ""

}}
 
 No newline at end of file

SOL009/NFVMANOPerformanceManagement-API/jsons/CreateThresholdRequest.json

+4 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
			"thresholdValue": 10,

			"hysteresis": 50

			}}

		

	}}

			}},

	"callbackUri": "{callbackUri}",

	"authentication": ""

}}
 
 No newline at end of file

SOL009/NFVMANOPerformanceManagement-API/jsons/PmJobModifications.json

+2 −1
Original line number Diff line number Diff line 
{

	"callbackUri": "{callbackUri}"

	"callbackUri": "{callbackUri}",

	"authentication": ""

}
 
 No newline at end of file