Commit f45634fb authored by Giacomo Bernini's avatar Giacomo Bernini Committed by admin_forge
Browse files

NFV&MEC Plugtests 2020: fixes of issues found during Plugtests

parent 84c5580f

SOL002/VNFConfiguration-API/ApiVersion.robot

+13 −13
Original line number Original line Diff line number Diff line 
*** Settings ***

*** Settings ***

Resource    environment/variables.txt

Resource    environment/variables.txt

Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 

Library    REST    ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT}     ssl_verify=false

Library    DependencyLibrary

Library    DependencyLibrary

Library    JSONLibrary

Library    JSONLibrary

Library    JSONSchemaLibrary    schemas/

Library    JSONSchemaLibrary    schemas/
@@ -134,78 +134,78 @@ POST API Version 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

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

    Post    ${apiRoot}/${apiName}/api_version

    Post    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

GET API Version

GET API Version

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

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

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

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

    Get    ${apiRoot}/${apiName}/api_version

    Get    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

PUT API Version

PUT API Version

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

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

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

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

    Put    ${apiRoot}/${apiName}/api_version

    Put    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

PATCH API Version

PATCH API Version

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

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

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

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

    Patch    ${apiRoot}/${apiName}/api_version

    Patch    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

DELETE API Version

DELETE API Version

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

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

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

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

    Delete    ${apiRoot}/${apiName}/api_version

    Delete    ${apiRoot}/${apiName}/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

POST API Version with apiMajorVersion

POST API Version with apiMajorVersion

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

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

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

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

    Post    ${apiRoot}/${apiName}/v1/api_version

    Post    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

GET API Version with apiMajorVersion

GET API Version with apiMajorVersion

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

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

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

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

    Get    ${apiRoot}/${apiName}/v1/api_version

    Get    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

PUT API Version with apiMajorVersion

PUT API Version with apiMajorVersion

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

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

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

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

    Put    ${apiRoot}/${apiName}/v1/api_version

    Put    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

PATCH API Version with apiMajorVersion

PATCH API Version with apiMajorVersion

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

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

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

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

    Patch    ${apiRoot}/${apiName}/v1/api_version

    Patch    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

DELETE API Version with apiMajorVersion

DELETE API Version with apiMajorVersion

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

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

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

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

    Delete    ${apiRoot}/${apiName}/v1/api_version

    Delete    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 





Check HTTP Response Status Code Is

Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

    [Arguments]    ${expected_status}    

    Should Be Equal    ${response.status_code}    ${expected_status}

    Should Be Equal As Strings   ${response['status']}    ${expected_status}

    Log    Status code validated 

    Log    Status code validated 





Check HTTP Response Body Json Schema Is

Check HTTP Response Body Json Schema Is

    [Arguments]    ${input}

    [Arguments]    ${input}

    ${schema} =    Catenate    ${input}    .schema.json

    ${schema} =    Catenate    ${input}    .schema.json

    Validate Json    ${schema}    ${response[0]['body']}

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK
 
    Log    Json Schema Validation OK
 
 No newline at end of file

SOL002/VNFConfiguration-API/Configuration.robot

+1 −2
Original line number Original line Diff line number Diff line
@@ -126,8 +126,7 @@ Send VNF configuration 




Check HTTP Response Status Code Is

Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

    [Arguments]    ${expected_status}    

    ${status}=    Convert To Integer    ${expected_status}    

    Should Be Equal As Strings    ${response['status']}    ${expected_status}

    Should Be Equal As Strings    ${response['status']}    ${status}

    Log    Status code validated

    Log    Status code validated





Check HTTP Response Header Contains

Check HTTP Response Header Contains

SOL002/VNFConfiguration-API/SOL002-VNFConfiguration-API.json

deleted100644 → 0
+0 −1398

File deleted.

Preview size limit exceeded, changes collapsed.

SOL002/VNFConfiguration-API/SOL002-VNFConfiguration-API.yaml

deleted100644 → 0
+0 −2202

File deleted.

Preview size limit exceeded, changes collapsed.

SOL002/VNFFaultManagement-API/Alarms.robot

+16 −16
Original line number Original line Diff line number Diff line 
*** Settings ***

*** Settings ***

# Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml

# Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml

Resource    environment/variables.txt 

Resource    environment/variables.txt 

Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 

Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}     ssl_verify=false

Library    JSONLibrary

Library    JSONLibrary

Library    JSONSchemaLibrary    schemas/

Library    JSONSchemaLibrary    schemas/

Library    OperatingSystem

Library    OperatingSystem
@@ -265,28 +265,28 @@ POST Alarms Task 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

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

    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms

    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

PUT Alarms Task

PUT Alarms Task

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

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

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

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

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

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

    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms

    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

PATCH Alarms Task

PATCH Alarms Task

    log    Trying to perform a PATCH. This method should not be implemented

    log    Trying to perform a PATCH. This method should not be implemented

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

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

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

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

    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms

    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

DELETE Alarms Task

DELETE Alarms Task

    log    Trying to perform a DELETE. This method should not be implemented

    log    Trying to perform a DELETE. This method should not be implemented

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

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

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

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

    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms

    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}			

	Set Global Variable    ${response}    ${outputResponse}			

GET Alarms Task	

GET Alarms Task	

	Log    Query VNF The GET method queries information about multiple alarms.

	Log    Query VNF The GET method queries information about multiple alarms.

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -294,7 +294,7 @@ GET Alarms Task 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

GET Alarms Task with filter

GET Alarms Task with filter

	Log    Query VNF The GET method queries information about multiple alarms with filters.

	Log    Query VNF The GET method queries information about multiple alarms with filters.

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -302,7 +302,7 @@ GET Alarms Task with filter 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	   	

	Set Global Variable    ${response}    ${outputResponse}	   	

GET Alarms Task with invalid filter

GET Alarms Task with invalid filter

	Log    Query VNF The GET method queries information about multiple alarms with filters.

	Log    Query VNF The GET method queries information about multiple alarms with filters.

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -310,7 +310,7 @@ GET Alarms Task with invalid filter 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

GET Alarms Task with all_fields attribute selector

GET Alarms Task with all_fields attribute selector

    Log    Query VNF The GET method queries information about multiple alarms, using fields

    Log    Query VNF The GET method queries information about multiple alarms, using fields

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

    Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -342,7 +342,7 @@ GET Alarms Task with exclude_fields attribute selector 
    

    

Check HTTP Response Status Code Is

Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

    [Arguments]    ${expected_status}    

    Should Be Equal    ${response.status_code}    ${expected_status}

    Should Be Equal As Strings    ${response['status']}    ${expected_status}

    Log    Status code validated 

    Log    Status code validated 

    

    

Check HTTP Response Header Contains

Check HTTP Response Header Contains
@@ -359,7 +359,7 @@ Check HTTP Response Body Json Schema Is 
    Log    Json Schema Validation OK

    Log    Json Schema Validation OK

    

    

Check LINK in Header

Check LINK in Header

    ${linkURL}=    Get Value From Json    ${response.headers}    $..Link

    ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link

    Should Not Be Empty    ${linkURL}

    Should Not Be Empty    ${linkURL}

    

    

GET Alarms Task with filter "id"

GET Alarms Task with filter "id"
@@ -369,7 +369,7 @@ GET Alarms Task with filter "id" 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?id=${alarmId}

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?id=${alarmId}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	

	

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "id"

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "id"

    Should Be Equal As Strings    ${response['body']['id']}    ${alarmId}

    Should Be Equal As Strings    ${response['body']['id']}    ${alarmId}
@@ -381,7 +381,7 @@ GET Alarms Task with filter "vnfcInstanceIds" 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?vnfcInstanceIds=${vnfcInstanceIds}

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?vnfcInstanceIds=${vnfcInstanceIds}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	

	

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "vnfcInstanceIds"

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "vnfcInstanceIds"

    :FOR   ${item}   IN  @{response['body']}

    :FOR   ${item}   IN  @{response['body']}
@@ -395,7 +395,7 @@ GET Alarms Task with filter "rootCauseFaultyResource_faultyResourceType" 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?rootCauseFaultyResource.faultyResourceType=${faultyResourceType}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	

	

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "rootCauseFaultyResource_faultyResourceType"

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "rootCauseFaultyResource_faultyResourceType"

    :FOR   ${item}   IN  @{response['body']}

    :FOR   ${item}   IN  @{response['body']}
@@ -409,7 +409,7 @@ GET Alarms Task with filter "eventType" 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?eventType=${eventType}

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?eventType=${eventType}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	

	

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "eventType"

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "eventType"

    :FOR   ${item}   IN  @{response['body']}

    :FOR   ${item}   IN  @{response['body']}
@@ -423,7 +423,7 @@ GET Alarms Task with filter "perceivedSeverity" 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?perceivedSeverity=${perceivedSeverity}

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?perceivedSeverity=${perceivedSeverity}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	

	

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "perceivedSeverity"

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "perceivedSeverity"

    :FOR   ${item}   IN  @{response['body']}

    :FOR   ${item}   IN  @{response['body']}
@@ -437,7 +437,7 @@ GET Alarms Task with filter "probableCause" 
    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?probableCause=${probableCause}

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?probableCause=${probableCause}

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

	

	

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"

Check PostCondition HTTP Response Body alarms Matches the requested attribute-based filter "probableCause"

    :FOR   ${item}   IN  @{response['body']}

    :FOR   ${item}   IN  @{response['body']}