Merge of TT027 branch into master

Pietro Piscionerequested to merge
TTF_T027 into master

Merge of TT027 branch into master

Merge request reports

MEC010p2/MEO/GRANT/environment/variables.txt

+7 −0
Changes for MEC010p2/MEO/GRANT/environment/variables.txt: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,8 +10,15 @@ ${apiRoot} 
${apiName}        granting

${apiVersion}     v1





${REGISTER_ACTION}        REGISTER

${REMOVE_ACTION}          REMOVE 

${NO_ACTION}              NO_ACTION





# Specific variables

${GRANT_ID}                        e0deee2b-6e50-4f33-ab09-8bf0585025d3

${GRANT_ID_PLACEHOLDER}            grantIdPlaceHolder

${GRANT_ID_ACCEPTED}               abcdee2b-6e50-4f33-ab09-8bf05850abcd

${NOT_EXISTING_GRANT_ID}           NOT_EXISTING_GRANT_ID

${APP_INSTANCE_ID}                 456

MEC010p2/MEO/GRANT/jsons/grantRequest.json

+1 −2
Changes for MEC010p2/MEO/GRANT/jsons/grantRequest.json: 1 added line, 2 removed lines.
Original line number Diff line number Diff line 
{

	"id": "123",

	"appInstanceId": "456",

	"appInstanceId": "123",

	"appLcmOpOccId": "789",

	"appDId":"appDId",

	"operation":"INSTANTIATE",

MEC010p2/MEO/GRANT/jsons/grantRequest2.json

+2 −2
Changes for MEC010p2/MEO/GRANT/jsons/grantRequest2.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
{

	"id": "123",

	"appInstanceId": "456",

	"appInstanceId": "123",

	"appLcmOpOccId": "789",

	"operation": "OPERATE",

	"appDId":"appDId",

	"addResources": [

    {

      "resourceDefinitionId": "resourceDefinitionId",

MEC010p2/MEO/GRANT/Grant.robot

+66 −24
Changes for MEC010p2/MEO/GRANT/Grant.robot: 66 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -8,14 +8,18 @@ Library REST ${MEO_SCHEMA}://${MEO_HOST}:${MEO_PORT} ssl_verify=false 
Library     OperatingSystem





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

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





*** Test Cases ***

TC_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

    ...  ETSI GS MEC 010-2 2.2.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 2.2.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, clause 7.5.1.3.1

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)

    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS

    Create a GRANT request    grantRequest

    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

    [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

    ...  ETSI GS MEC 010-2 2.2.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, clause 7.6.1.3.2

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)

    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS

    Create a GRANT request    grantBadRequest

    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

    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_002_OK  

    ...  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 2.2.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, clause 7.5.1.3.1

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1        //GrantRequest

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1

    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS

    Create a GRANT request    grantRequest2

    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

    





TC_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

    ...  ETSI GS MEC 010-2 2.2.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 2.2.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, clause 7.5.1.3.1

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)

    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS

    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous  id

    Create a GRANT request    grantRequestAsynchronous

    Check HTTP Response Status Code Is    202

    Check HTTP Response Header Contains    Location







TC_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

    ...  ETSI GS MEC 010-2 2.2.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 2.2.1, Table 6.2.4.4.2-1 (Grant)

    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)

    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS

    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous2  id

    Create a GRANT request    grantRequestAsynchronous2

    Check HTTP Response Status Code Is    202

    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

    ...  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 

    ...  ETSI GS MEC 010-2 2.2.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, clause 7.5.2.3.2

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1  

    [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 Header Contains    Location

    Check HTTP Response Body Json Schema Is   Grant



    

    

TC_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.

    ...  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 2.2.1, Table 6.2.4.4.2-1  

    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.2.3.2

    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1  

    [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 Header Contains    Location

    Check HTTP Response Body Json Schema Is   Grant



    



TC_MEC_MEC010p2_MEO_GRANT_006_NF

    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_NF

    ...  Check that MEO responds with an error when it receives 

    ...  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

    [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}

    Check HTTP Response Status Code Is    404

    

   



*** 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

    [Arguments]    ${content}

    Set Headers    {"Accept":"application/json"}

MEC010p2/MEO/PKGM/environment/variables.txt

+14 −10
Changes for MEC010p2/MEO/PKGM/environment/variables.txt: 14 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ ${apiRoot} 
${apiName}        app_pkgm

${apiVersion}     v1





${REGISTER_ACTION}        REGISTER

${REMOVE_ACTION}          REMOVE 

${NO_ACTION}              NO_ACTION

${APP_PKG_ID_PLACEHOLDER}    APP_PKG_ID_PLACEHOLDER



# Specific variables

${APP_PKG_NAME}                     appName

${APP_PKG_VERSION}                  APP_PKG_VERSION
@@ -34,19 +40,17 @@ ${WRONG_CONTENT_TYPE} application/json 
${SUBSCRIPTION_ID}                  e0deee2b-6e50-4f33-ab09-8bf0585025d3

${NOT_EXISTING_APP_PKG_ID}          NOT_EXISTING_APP_PKG_ID





${NOT_EXISTING_ON_BOARDED_APP_PKG_ID}   NOT_EXISTING_ON_BOARDED_APP_PKG_ID

${NON_EXISTING_ON_BOARDED_APPD_ID}      NON_EXISTING_ON_BOARDED_APPD_ID



${SUBSCRIPTION_TYPE}                AppPackageOnBoardingSubscription

${NON_EXISTENT_SUBSCRIPTION_ID}     NON_EXISTENT_SUBSCRIPTION_ID

${CALLBACK_URI}                     http://some.url/somepath





# Notifications variables

${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar



${callback_port}    9091

${callback_uri}    http://172.22.1.7:${callback_port}

${callback_endpoint}    /amsi/subscriptions

${callback_endpoint_error}    /subs_404

${total_polling_time}   2 min

${polling_interval}     10 sec
 
 No newline at end of file
 
##Notification Server variables

${NOTIFICATION_SERVER_IP}      127.0.0.1

${NOTIFICATION_SERVER_PORT}      8888

${NOTIFICATION_SERVER_HTTP_METHOD}      POST

${NOTIFICATION_SERVER_URI}      /callback_url

${NOTIFICATION_SERVER_TIMEOUT}      5
 
 No newline at end of file