Commit 05f54e24 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixes

parent 433833ce
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ GET all Pm Jobs - exclude_default


GET all Pm Jobs - fields
GET all Pm Jobs - fields
    Log    Trying to get all VNF Packages present in the VNFM, using filter params
    Log    Trying to get all VNF Packages present in the VNFM, using filter params
    Pass Execution If    ${FIELDS_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
    Set Headers    {"Accept": "${ACCEPT_JSON}"}
    Set Headers    {"Accept": "${ACCEPT_JSON}"}
    Run Keyword If    ${VNFM_AUTH_USAGE} == 1    Set Headers    {"Authorization": "${VNFM_AUTHENTICATION}"}
    Run Keyword If    ${VNFM_AUTH_USAGE} == 1    Set Headers    {"Authorization": "${VNFM_AUTHENTICATION}"}
    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
@@ -108,7 +108,7 @@ GET all Pm Jobs - fields


GET all Pm Jobs - exclude_fields
GET all Pm Jobs - exclude_fields
    Log    Trying to get all VNF Packages present in the VNFM, using filter params
    Log    Trying to get all VNF Packages present in the VNFM, using filter params
    Pass Execution If    ${FIELDS_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'
    Set Headers    {"Accept": "${ACCEPT_JSON}"}
    Set Headers    {"Accept": "${ACCEPT_JSON}"}
    Run Keyword If    ${VNFM_AUTH_USAGE} == 1    Set Headers    {"Authorization": "${VNFM_AUTHENTICATION}"}
    Run Keyword If    ${VNFM_AUTH_USAGE} == 1    Set Headers    {"Authorization": "${VNFM_AUTHENTICATION}"}
    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs?fields=${fields}
+1 −1
Original line number Original line Diff line number Diff line
*** Settings ***
*** Settings ***
Resource    variables.txt 
Resource    environment/variables.txt 
Suite Setup    Create Sessions
Suite Setup    Create Sessions
Suite Teardown    Terminate All Processes    kill=true
Suite Teardown    Terminate All Processes    kill=true
Library    MockServerLibrary
Library    MockServerLibrary
+5 −5
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ Check HTTP Response Body Json Schema Is
    [Arguments]    ${schema}
    [Arguments]    ${schema}
    ${json}=    evaluate    json.loads('''${response.body}''')    json
    ${json}=    evaluate    json.loads('''${response.body}''')    json
    Validate Json    ${schema}    ${json}
    Validate Json    ${schema}    ${json}
    ${vnfInstanceId}=    ${response.body.id}
    ${vnfInstanceId}=    evaluate   ${response.body.id}
    Log    Json Schema Validation OK
    Log    Json Schema Validation OK
    
    
Check VNF Status
Check VNF Status
@@ -104,7 +104,7 @@ Check Operation Notification
    Should Be Equal    ${body.operationState}   ${status}
    Should Be Equal    ${body.operationState}   ${status}
    Clear Requests  ${callback_endpoint}
    Clear Requests  ${callback_endpoint}


Verify Notification COMPLETED
Verify Notification
    [Arguments]    ${status}
    [Arguments]    ${status}
    Verify Mock Expectation     ${notification_request} 
    Verify Mock Expectation     ${notification_request} 


@@ -122,15 +122,15 @@ Initialize System
    Create VNF Resource
    Create VNF Resource
    Check HTTP Response Status Code Is    201
    Check HTTP Response Status Code Is    201
    Check HTTP Response Header Contains    Location
    Check HTTP Response Header Contains    Location
    Check HTTP Response Header Contains    ${response.headers}    Content-Type
    Check HTTP Response Header Contains    Content-Type
    Check HTTP Response Body Json Schema Is    vnfInstance.schema.json
    Check HTTP Response Body Json Schema Is    vnfInstance.schema.json


Check Postcondition
Check Postcondition
    Log    Retrieve VNF Instance
    Log    Retrieve VNF Instance
    Check VNF Instance    ${vnfInstanceId}
    Check VNF Instance    ${vnfInstanceId}
    Should Not Be Empty    ${response}
    Should Not Be Empty    ${response}
    Check HTTP Status Code Is    200
    Check HTTP Response Status Code Is    200
    Should Be Equal    ${response.body.id}    ${vnfInstanceId}    
    Should Be Equal    ${response.body.id}    ${vnfInstanceId}    
    Check HTTP Response Header Contains    Content-Type
    Check HTTP Response Header Contains    Content-Type
    Check HTTP Response Json Schema    ${response.body}    vnfInstance.schema.json
    Check HTTP Response Body Json Schema Is    vnfInstance.schema.json
    Check VNF Status    ${response.body.instantiationState}    INSTANTIATED
    Check VNF Status    ${response.body.instantiationState}    INSTANTIATED
 No newline at end of file
+6 −1
Original line number Original line Diff line number Diff line
@@ -42,3 +42,8 @@ ${GRANT_POLLING_TOT} 2
${GRANT_POLLING_INTERVAL}    5s
${GRANT_POLLING_INTERVAL}    5s
${SCALE_POLLING_TOT}    10
${SCALE_POLLING_TOT}    10
${SCALE_POLLING_INTERVAL}    15s
${SCALE_POLLING_INTERVAL}    15s
${callback_uri}    http://localhost
${callback_port}    9091
${callback_endpoint}    /endpoint
${callback_endpoint_error}    /endpoint_404
${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar
 No newline at end of file
+1 −1
Original line number Original line Diff line number Diff line
*** Settings ***
*** Settings ***
Resource   environmentvariables.txt 
Resource   environment/variables.txt 
Library    REST    http://${NFVO_HOST}:${NFVO_PORT} 
Library    REST    http://${NFVO_HOST}:${NFVO_PORT} 
...        spec=SOL003-VNFLifecycleOperationGranting-API.yaml
...        spec=SOL003-VNFLifecycleOperationGranting-API.yaml
Library    OperatingSystem
Library    OperatingSystem
Loading