move individual PM job keywords to common NFVMANO PM keyword file

SOL009/NFVMANOPerformanceManagement-API/IndividualPmJob.robot

@@ -3,6 +3,7 @@ Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Resource          environment/IndividualPmJob.txt
+Resource          NFVMANOPMKeywords.robot
 Library           REST    ${NFVMANO_SCHEMA}://${NFVMANO_HOST}:${NFVMANO_PORT}    ssl_verify=false
 
 *** Test Cases ***
@@ -93,92 +94,3 @@ DELETE Individual NFV-MANO Performance Job with invalid resource identifier
     ...    Post-Conditions: none
     Send Delete request for individual NFV-MANO Performance Job with invalid resource identifier
     Check HTTP Response Status Code Is    404
-    
-*** Keywords ***
-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}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-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}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-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}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-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}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-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}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-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}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-    
-Send Patch request for individual NFV-MANO Performance Job    
-    Log    Trying to perform a PATCH (method should not be implemented)
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Check Postcondition NFV-MANO Pm Job is Deleted
-    Log    Check Postcondition
-    GET individual NFV-MANO Performance Job
-    Check HTTP Response Status Code Is    404
-
-Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
-    Log    Going to validate Pm Job info retrieved
-    Should Be Equal    ${response['body']['id']}    ${pmJobId} 
-    Log    Pm Job identifier as expected
-    
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}
-    ${status}=    Convert To Integer    ${expected_status}    
-    Should Be Equal    ${response['status']}    ${status} 
-    Log    Status code validated
-
-Check HTTP Response Header Contains
-    [Arguments]    ${CONTENT_TYPE}
-    Should Contain    ${response['headers']}    ${CONTENT_TYPE}
-    Log    Header is present
-    
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
-    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
-    Validate Json    ${schema}    ${response['body']}
-    Log    Json Schema Validation OK

SOL009/NFVMANOPerformanceManagement-API/NFVMANOPMKeywords.robot

@@ -212,3 +212,72 @@ Check HTTP Response Body Json Schema Is
 Check HTTP Response Header Contains Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
+
+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}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+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}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+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}"}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+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}"}
+    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+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}"}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+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}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send Patch request for individual NFV-MANO Performance Job    
+    Log    Trying to perform a PATCH (method should not be implemented)
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Check Postcondition NFV-MANO Pm Job is Deleted
+    Log    Check Postcondition
+    GET individual NFV-MANO Performance Job
+    Check HTTP Response Status Code Is    404
+
+Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
+    Log    Going to validate Pm Job info retrieved
+    Should Be Equal    ${response['body']['id']}    ${pmJobId} 
+    Log    Pm Job identifier as expected