Commit 51b7cf3d authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'TTF_T027' into 'master'

Merge of TT027 branch into master

See merge request !3
parents 710a4b2a d4eae990
Loading
Loading
Loading
Loading
Loading
+12 −3
Original line number Original line Diff line number Diff line
@@ -24,9 +24,10 @@ Check HTTP Response Body Json Schema Is
Should Be Present In Json List
Should Be Present In Json List
    [Arguments]     ${expr}   ${json_field}   ${json_value}
    [Arguments]     ${expr}   ${json_field}   ${json_value}
    Log    Check if ${json_field} is present in ${expr} with the value ${json_value}
    Log    Check if ${json_field} is present in ${expr} with the value ${json_value}
    :FOR  ${item}  IN  @{expr}
    FOR  ${item}  IN  @{expr}
    \  ${are_equal}=    Should Be Equal As Strings    ${item["${json_field}"]}    ${json_value}
      ${are_equal}=    Should Be Equal As Strings    ${item["${json_field}"]}    ${json_value}
    \  Exit For Loop If    ${are_equal}
      Exit For Loop If    ${are_equal}
    END
    Log    Item found ${item}
    Log    Item found ${item}
    [return]    ${item}
    [return]    ${item}
    
    
@@ -63,4 +64,12 @@ Check HTTP Response Contain Header with value
    Check HTTP Response Header Contains    ${HEADER_TOCHECK}
    Check HTTP Response Header Contains    ${HEADER_TOCHECK}
    Should Be Equal As Strings    ${value}    ${response['headers']['Content-Type']}    
    Should Be Equal As Strings    ${value}    ${response['headers']['Content-Type']}    


Get value entry from JSON file 
    [Arguments]       ${filename}   ${key}
    ${file}=    Catenate    SEPARATOR=    jsons/    ${filename}    .json
    ${body}=    Get File    ${file}
    ${data}=   Evaluate    ${body}
    ${value_key}    Set Variable   ${data}[${key}]
    [return]   ${value_key}

        
        
 No newline at end of file
+67 −25
Original line number Original line Diff line number Diff line
@@ -8,14 +8,18 @@ Library REST ${MEO_SCHEMA}://${MEO_HOST}:${MEO_PORT} ssl_verify=false
Library     OperatingSystem
Library     OperatingSystem




Test Setup       Test Setup   ${GRANT_ID_PLACEHOLDER}   grantRequest      ${NO_ACTION}
Test Teardown    Test TearDown    ${GRANT_ID_PLACEHOLDER}   grantRequest      ${NO_ACTION}


*** Test Cases ***
*** Test Cases ***
TC_MEC_MEC010p2_MEO_GRANT_001_OK
TC_MEC_MEC010p2_MEO_GRANT_001_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_OK
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Create a GRANT request    grantRequest
    Create a GRANT request    grantRequest
    Check HTTP Response Status Code Is    201
    Check HTTP Response Status Code Is    201
@@ -25,8 +29,8 @@ TC_MEC_MEC010p2_MEO_GRANT_001_OK
TC_MEC_MEC010p2_MEO_GRANT_001_BR
TC_MEC_MEC010p2_MEO_GRANT_001_BR
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_BR
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_BR
    ...  Check that MEO responds with an error when it receives a malformed request when a new grant request is performed
    ...  Check that MEO responds with an error when it receives a malformed request when a new grant request is performed
    ...  ETSI GS MEC 010-2 2.2.1, clause 7.6.1.3.2
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.6.1.3.2
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Create a GRANT request    grantBadRequest
    Create a GRANT request    grantBadRequest
    Check HTTP Response Status Code Is    400
    Check HTTP Response Status Code Is    400
@@ -34,9 +38,9 @@ TC_MEC_MEC010p2_MEO_GRANT_001_BR
TC_MEC_MEC010p2_MEO_GRANT_002_OK
TC_MEC_MEC010p2_MEO_GRANT_002_OK
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_002_OK  
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_002_OK  
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.2.2-1        //GrantRequest
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1        //GrantRequest
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Create a GRANT request    grantRequest2
    Create a GRANT request    grantRequest2
    Check HTTP Response Status Code Is    201
    Check HTTP Response Status Code Is    201
@@ -44,28 +48,28 @@ TC_MEC_MEC010p2_MEO_GRANT_002_OK
    Check HTTP Response Body Json Schema Is   Grant
    Check HTTP Response Body Json Schema Is   Grant
    
    



TC_MEC_MEC010p2_MEO_GRANT_003_OK
TC_MEC_MEC010p2_MEO_GRANT_003_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_003_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_003_OK
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous  id
    Create a GRANT request    grantRequestAsynchronous
    Create a GRANT request    grantRequestAsynchronous
    Check HTTP Response Status Code Is    202
    Check HTTP Response Status Code Is    202
    Check HTTP Response Header Contains    Location
    Check HTTP Response Header Contains    Location





TC_MEC_MEC010p2_MEO_GRANT_004_OK
TC_MEC_MEC010p2_MEO_GRANT_004_OK
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_004_OK 
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_004_OK 
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous2  id
    Create a GRANT request    grantRequestAsynchronous2
    Create a GRANT request    grantRequestAsynchronous2
    Check HTTP Response Status Code Is    202
    Check HTTP Response Status Code Is    202
    Check HTTP Response Header Contains    Location
    Check HTTP Response Header Contains    Location
@@ -75,37 +79,75 @@ TC_MEC_MEC010p2_MEO_GRANT_005_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_005_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_005_OK
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1  
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1  
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Get an individual grant    ${GRANT_ID_ACCEPTED}
    [Setup]      Test Setup   ${None}   grantRequestAsynchronous    ${REGISTER_ACTION}
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous  id
    Get an individual grant    ${GRANT_ID_VALUE}
    Check HTTP Response Status Code Is    202
    Check HTTP Response Status Code Is    202
    Check HTTP Response Header Contains    Location
    Check HTTP Response Header Contains    Location
    Check HTTP Response Body Json Schema Is   Grant

    
    
    
TC_MEC_MEC010p2_MEO_GRANT_006_OK
TC_MEC_MEC010p2_MEO_GRANT_006_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_OK
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1  
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1  
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Get an individual grant    ${GRANT_ID}
    [Setup]      Test Setup   ${None}   grantRequest    ${REGISTER_ACTION}
    Get an individual grant     ${setup_response['body']['id']}
    Check HTTP Response Status Code Is    200
    Check HTTP Response Status Code Is    200
    Check HTTP Response Header Contains    Location
    Check HTTP Response Header Contains    Location
    Check HTTP Response Body Json Schema Is   Grant
    Check HTTP Response Body Json Schema Is   Grant


    

TC_MEC_MEC010p2_MEO_GRANT_006_NF
TC_MEC_MEC010p2_MEO_GRANT_006_NF
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_NF
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_NF
    ...  Check that MEO responds with an error when it receives 
    ...  Check that MEO responds with an error when it receives 
    ...  a request for returning a grant referred with a wrong ID
    ...  a request for returning a grant referred with a wrong ID
    ...  ETSI GS MEC 010-2 2.1.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 2.1.1, clause 7.5.2.3.2
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    ##No test setup can be applied because delete operation on grant is not supported (yet).
    Get an individual grant    ${NOT_EXISTING_GRANT_ID}
    Get an individual grant    ${NOT_EXISTING_GRANT_ID}
    Check HTTP Response Status Code Is    404
    Check HTTP Response Status Code Is    404
    
    
   
   


*** Keywords ***
*** Keywords ***

Test Setup 
    [Arguments]    ${grantId}    ${content}   ${action}
    Set Headers    {"Accept":"application/json"}
    Set Headers    {"Content-Type":"application/json"}
    Set Headers    {"Authorization":"${TOKEN}"}
     
    IF    '''${action}''' == '''${REGISTER_ACTION}'''
       ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
       ${body}=    Get File    ${file}
       Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}    allow_redirects=false
       ${output}=    Output    response
       Set Suite Variable    ${setup_response}    ${output}
    END
    
Test Teardown  
    [Arguments]     ${grantId}    ${content}   ${action}
    Set Headers    {"Accept":"application/json"}
    Set Headers    {"Content-Type":"application/json"}
    Set Headers    {"Authorization":"${TOKEN}"}
     
    IF    '''${action}''' == '''${REGISTER_ACTION}'''
       ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
       ${body}=    Get File    ${file}
        Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}    allow_redirects=false
    END
   
   

Create a GRANT request
Create a GRANT request
    [Arguments]    ${content}
    [Arguments]    ${content}
    Set Headers    {"Accept":"application/json"}
    Set Headers    {"Accept":"application/json"}
+7 −0
Original line number Original line Diff line number Diff line
@@ -10,8 +10,15 @@ ${apiRoot}
${apiName}        granting
${apiName}        granting
${apiVersion}     v1
${apiVersion}     v1



${REGISTER_ACTION}        REGISTER
${REMOVE_ACTION}          REMOVE 
${NO_ACTION}              NO_ACTION


# Specific variables
# Specific variables
${GRANT_ID}                        e0deee2b-6e50-4f33-ab09-8bf0585025d3
${GRANT_ID}                        e0deee2b-6e50-4f33-ab09-8bf0585025d3
${GRANT_ID_PLACEHOLDER}            grantIdPlaceHolder
${GRANT_ID_ACCEPTED}               abcdee2b-6e50-4f33-ab09-8bf05850abcd
${GRANT_ID_ACCEPTED}               abcdee2b-6e50-4f33-ab09-8bf05850abcd
${NOT_EXISTING_GRANT_ID}           NOT_EXISTING_GRANT_ID
${NOT_EXISTING_GRANT_ID}           NOT_EXISTING_GRANT_ID
${APP_INSTANCE_ID}                 456
${APP_INSTANCE_ID}                 456
+1 −2
Original line number Original line Diff line number Diff line
{
{
	"id": "123",
	"appInstanceId": "123",
	"appInstanceId": "456",
	"appLcmOpOccId": "789",
	"appLcmOpOccId": "789",
	"appDId":"appDId",
	"appDId":"appDId",
	"operation":"INSTANTIATE",
	"operation":"INSTANTIATE",
+2 −2
Original line number Original line Diff line number Diff line
{
{
	"id": "123",
	"appInstanceId": "123",
	"appInstanceId": "456",
	"appLcmOpOccId": "789",
	"appLcmOpOccId": "789",
	"operation": "OPERATE",
	"operation": "OPERATE",
	"appDId":"appDId",
	"addResources": [
	"addResources": [
    {
    {
      "resourceDefinitionId": "resourceDefinitionId",
      "resourceDefinitionId": "resourceDefinitionId",
Loading